Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to jcommander 1.81 and gradle 7.3.3 #1079

Merged
merged 2 commits into from Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.adoc
Expand Up @@ -15,10 +15,15 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co

Improvement::

* Upgrade to jcommander 1.81 (#1079)
* Upgrade to JRuby 9.3.3.0 (#1079)

Bug Fixes::

Build Improvement::

* Upgrade to gradle 7.3.3 (#1079)

Documentation::

== 2.5.3 (2022-01-12)
Expand Down
4 changes: 2 additions & 2 deletions asciidoctorj-distribution/build.gradle
Expand Up @@ -45,7 +45,7 @@ configurations.archives.with {
}

tasks.withType(AbstractArchiveTask) {
baseName rootProject.name
archiveBaseName.set(rootProject.name)
classifier 'bin' // use classifier for identification in repository list
eachFile { it.path = it.path.replaceFirst('-bin(?=/)', '') }
//destinationDir = ...
Expand All @@ -55,7 +55,7 @@ startScripts {
unixStartScriptGenerator.template = resources.text.fromFile('src/main/resources/customUnixStartScript.txt')

applicationName = rootProject.name
mainClassName = 'org.asciidoctor.jruby.cli.AsciidoctorInvoker'
mainClass.set('org.asciidoctor.jruby.cli.AsciidoctorInvoker')
defaultJvmOpts = [
'-client', '-Xmn128m', '-Xms256m', '-Xmx256m', '-Djava.awt.headless=true',
'-Xverify:none', '-XX:+TieredCompilation', '-XX:TieredStopAtLevel=1', '-XX:+DisableExplicitGC', '-Djruby.compile.mode=OFF'
Expand Down
8 changes: 8 additions & 0 deletions asciidoctorj-wildfly-integration-test/build.gradle
Expand Up @@ -49,6 +49,14 @@ compileTestJava {
dependsOn unpackWildfly
}

javadocJar {
dependsOn unpackWildfly
}

sourcesJar {
dependsOn unpackWildfly
}

tasks.create("createModule").doLast {
copy {
from "src/test/resources/module.xml"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -68,8 +68,8 @@ ext {
commonsioVersion = '2.11.0'
guavaVersion = '18.0'
hamcrestVersion = '1.3'
jcommanderVersion = '1.81'
jrubyVersion = '9.2.20.1'
jcommanderVersion = '1.82'
jrubyVersion = '9.3.3.0'
jsoupVersion = '1.14.3'
junitVersion = '4.13.2'
assertjVersion = '3.19.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle/versioncheck.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.github.zafarkhaja:java-semver:0.9.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists