Try lifting to Gradle 7.0
MODIFY
asciidoctorj-arquillian-extension/build.gradle
asciidoctorj-arquillian-extension/build.gradle
dependencies {
compileOnly project(':asciidoctorj')
- compile project(':asciidoctorj-test-support')
- compile "org.jboss.arquillian.container:arquillian-container-spi:$arquillianVersion"
- compile "org.jboss.arquillian.container:arquillian-container-test-spi:$arquillianVersion"
- compile "org.jboss.arquillian.container:arquillian-container-impl-base:$arquillianVersion"
- compile "org.jboss.arquillian.container:arquillian-container-test-impl-base:$arquillianVersion"
+ implementation 'junit:junit:4.12'
+ api project(':asciidoctorj-test-support')
+ implementation "org.jboss.arquillian.container:arquillian-container-spi:$arquillianVersion"
+ implementation "org.jboss.arquillian.container:arquillian-container-test-spi:$arquillianVersion"
+ implementation "org.jboss.arquillian.container:arquillian-container-impl-base:$arquillianVersion"
+ implementation "org.jboss.arquillian.container:arquillian-container-test-impl-base:$arquillianVersion"
}
def javaApiUrl = "https://docs.oracle.com/javase/8/docs/api/"

MODIFY
asciidoctorj-core/build.gradle
asciidoctorj-core/build.gradle
-apply plugin: 'java'
+apply plugin: 'java-library'
apply plugin: 'groovy'
apply plugin: 'biz.aQute.bnd.builder'
@@ -8,9 +8,9 @@ apply from: rootProject.file('gradle/publish.gradle')
apply from: rootProject.file('gradle/signing.gradle')
dependencies {
- compile project(path: ':asciidoctorj-api')
- compile "org.jruby:jruby:$jrubyVersion"
- compile "com.beust:jcommander:$jcommanderVersion"
+ api project(path: ':asciidoctorj-api')
+ api "org.jruby:jruby:$jrubyVersion"
+ implementation "com.beust:jcommander:$jcommanderVersion"
gems "rubygems:asciidoctor:$asciidoctorGemVersion"
gems "rubygems:coderay:$coderayGemVersion"
gems "rubygems:rouge:$rougeGemVersion"
@@ -22,12 +22,12 @@ dependencies {
gems "rubygems:tilt:$tiltGemVersion"
gems "rubygems:concurrent-ruby:$concurrentRubyGemVersion"
// TODO could use dependency replacement feature to fix version of Saxon-HE
- testCompile("org.xmlmatchers:xml-matchers:$xmlMatchersVersion") { exclude module: 'Saxon-HE' }
- testCompile "net.sf.saxon:Saxon-HE:$saxonVersion"
- testCompile "com.google.guava:guava:$guavaVersion"
- testCompile "org.jsoup:jsoup:$jsoupVersion"
- testCompile "io.netty:netty-all:$nettyVersion"
- testCompile project(path: ':asciidoctorj-arquillian-extension')
+ testImplementation("org.xmlmatchers:xml-matchers:$xmlMatchersVersion") { exclude module: 'Saxon-HE' }
+ testImplementation "net.sf.saxon:Saxon-HE:$saxonVersion"
+ testImplementation "com.google.guava:guava:$guavaVersion"
+ testImplementation "org.jsoup:jsoup:$jsoupVersion"
+ testImplementation "io.netty:netty-all:$nettyVersion"
+ testImplementation project(path: ':asciidoctorj-arquillian-extension')
compileOnly "org.osgi:osgi.annotation:$osgiVersion"
}

MODIFY
asciidoctorj-distribution/build.gradle
asciidoctorj-distribution/build.gradle
@@ -5,30 +5,30 @@ if (project.statusIsRelease && project.hasProperty("sdkman_consumer_key")) {
}
dependencies {
- compile(project(':asciidoctorj')) {
+ implementation(project(':asciidoctorj')) {
exclude group: 'org.jruby'
}
- compile(project(':asciidoctorj-api')) {
+ implementation(project(':asciidoctorj-api')) {
transitive = false
}
- compile("org.asciidoctor:asciidoctorj-epub3:$asciidoctorjEpub3Version") {
+ implementation("org.asciidoctor:asciidoctorj-epub3:$asciidoctorjEpub3Version") {
transitive = false
}
- compile("org.asciidoctor:asciidoctorj-diagram:$asciidoctorjDiagramVersion") {
+ implementation("org.asciidoctor:asciidoctorj-diagram:$asciidoctorjDiagramVersion") {
transitive = false
}
- compile("org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion") {
+ implementation("org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion") {
transitive = false
}
- compile("org.asciidoctor:asciidoctorj-revealjs:$asciidoctorjRevealJsVersion") {
+ implementation("org.asciidoctor:asciidoctorj-revealjs:$asciidoctorjRevealJsVersion") {
transitive = false
}
- compile "org.jruby:jruby-complete:$jrubyVersion"
- testCompile project(':asciidoctorj-arquillian-extension')
- testCompile "org.apache.pdfbox:pdfbox:$pdfboxVersion"
- testCompile "org.jsoup:jsoup:$jsoupVersion"
+ implementation "org.jruby:jruby-complete:$jrubyVersion"
+ testImplementation project(':asciidoctorj-arquillian-extension')
+ testImplementation "org.apache.pdfbox:pdfbox:$pdfboxVersion"
+ testImplementation "org.jsoup:jsoup:$jsoupVersion"
}
jar.enabled = false

MODIFY
asciidoctorj-documentation/build.gradle
asciidoctorj-documentation/build.gradle
@@ -3,11 +3,11 @@ import org.apache.tools.ant.filters.*
jar.enabled = false
dependencies {
- testCompile project(':asciidoctorj')
- testCompile project(path: ':asciidoctorj-arquillian-extension')
- testCompile "commons-io:commons-io:$commonsioVersion"
- testCompile "org.jsoup:jsoup:$jsoupVersion"
- testCompile("org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion") {
+ testImplementation project(':asciidoctorj')
+ testImplementation project(path: ':asciidoctorj-arquillian-extension')
+ testImplementation "commons-io:commons-io:$commonsioVersion"
+ testImplementation "org.jsoup:jsoup:$jsoupVersion"
+ testImplementation("org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion") {
transitive = false
}
}

MODIFY
asciidoctorj-springboot-integration-test/build.gradle
asciidoctorj-springboot-integration-test/build.gradle
@@ -2,12 +2,12 @@ jar.enabled = false
dependencies {
testCompileOnly project(':asciidoctorj')
- testCompile "junit:junit:$junitVersion"
- testCompile "org.assertj:assertj-core:$assertjVersion"
- testCompile "commons-io:commons-io:$commonsioVersion"
- testCompile "org.awaitility:awaitility:4.0.3"
- testCompile "com.squareup.okhttp3:okhttp:4.9.1"
- testCompile "com.google.code.gson:gson:2.8.6"
+ testImplementation "junit:junit:$junitVersion"
+ testImplementation "org.assertj:assertj-core:$assertjVersion"
+ testImplementation "commons-io:commons-io:$commonsioVersion"
+ testImplementation "org.awaitility:awaitility:4.0.3"
+ testImplementation "com.squareup.okhttp3:okhttp:4.9.1"
+ testImplementation "com.google.code.gson:gson:2.8.6"
}
test.dependsOn(':asciidoctorj-springboot-integration-test:springboot-app:assemble')

MODIFY
asciidoctorj-test-support/build.gradle
asciidoctorj-test-support/build.gradle
apply plugin: 'java'
dependencies {
- compile 'junit:junit:4.12'
+ implementation 'junit:junit:4.12'
}
def javaApiUrl = "https://docs.oracle.com/javase/8/docs/api/"

MODIFY
asciidoctorj-wildfly-integration-test/build.gradle
asciidoctorj-wildfly-integration-test/build.gradle
@@ -4,7 +4,7 @@ ext {
arquillianVersion = '1.1.13.Final'
arquillianWildflyVersion = '2.1.1.Final'
- wildflyVersion = '15.0.0.Final'
+ wildflyVersion = '23.0.0.Final'
}
configurations {
@@ -24,14 +24,14 @@ dependencies {
jbossdist group: 'org.wildfly', name: 'wildfly-dist', version: wildflyVersion, ext: 'zip'
- testCompile "javax:javaee-api:7.0"
+ testImplementation "javax:javaee-api:7.0"
testCompileOnly project(':asciidoctorj')
- testCompile "junit:junit:$junitVersion"
- testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
- testCompile "org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion"
- testCompile "org.jsoup:jsoup:$jsoupVersion"
+ testImplementation "junit:junit:$junitVersion"
+ testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion"
+ testImplementation "org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion"
+ testImplementation "org.jsoup:jsoup:$jsoupVersion"
- testRuntime "org.wildfly.arquillian:wildfly-arquillian-container-managed:$arquillianWildflyVersion"
+ testRuntimeOnly "org.wildfly.arquillian:wildfly-arquillian-container-managed:$arquillianWildflyVersion"
}
task unpackWildfly(type: Copy) {
@@ -87,6 +87,7 @@ test {
if (JavaVersion.current().isJava11Compatible()) {
systemProperty('arquillian.launch', 'wildfly-java11')
+ // jvmArgs = ['--add-modules', 'java.security']
}

MODIFY
asciidoctorj-wildfly-integration-test/src/test/resources/arquillian.xml
asciidoctorj-wildfly-integration-test/src/test/resources/arquillian.xml
<!--<property name="javaVmArguments">-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</property>-->
<property name="serverConfig">${jboss.server.config.file.name:standalone.xml}</property>
<property name="jbossArguments">${jboss.args:}</property>
+<!-- <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m</property>-->
</configuration>
</container>

MODIFY
build.gradle
build.gradle
@@ -10,11 +10,11 @@ buildscript {
url "https://plugins.gradle.org/m2/"
}
mavenCentral()
- maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
+ maven { url "https//oss.sonatype.org/content/repositories/snapshots/" }
}
dependencies {
classpath "gradle.plugin.io.sdkman:gradle-sdkvendor-plugin:1.1.0"
- classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0"
+ classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0"
}
}
@@ -69,7 +69,7 @@ ext {
nettyVersion = '4.1.58.Final'
saxonVersion = '9.9.0-2'
xmlMatchersVersion = '1.0-RC1'
- pdfboxVersion = '1.8.10'
+ pdfboxVersion = '1.8.16'
// gem versions
asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.12'
@@ -97,7 +97,7 @@ allprojects {
subprojects {
// NOTE applying Java plugin changes the status; take steps to preserve value
def _status = status
- apply plugin: 'java'
+ apply plugin: 'java-library'
apply plugin: 'groovy'
status = _status
@@ -138,14 +138,14 @@ subprojects {
if (!isIntegrationTestProject(it)) {
dependencies {
- testCompile "junit:junit:$junitVersion"
- testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
- testCompile("org.spockframework:spock-core:$spockVersion") {
+ testImplementation "junit:junit:$junitVersion"
+ testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion"
+ testImplementation("org.spockframework:spock-core:$spockVersion") {
exclude group: 'org.hamcrest', module: 'hamcrest-core'
}
- testCompile "org.codehaus.groovy:groovy-all:$groovyVersion"
- testCompile "org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion"
- testCompile "org.jboss.arquillian.spock:arquillian-spock-container:$arquillianSpockVersion"
+ testImplementation "org.codehaus.groovy:groovy-all:$groovyVersion"
+ testImplementation "org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion"
+ testImplementation "org.jboss.arquillian.spock:arquillian-spock-container:$arquillianSpockVersion"
codenarc "org.codehaus.groovy:groovy:$groovyVersion"
codenarc "org.codehaus.groovy:groovy-xml:$groovyVersion"

MODIFY
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.jar
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

MODIFY
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-milestone-3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

MODIFY
gradlew
gradlew
@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -175,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"

MODIFY
gradlew.bat
gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell

MODIFY
settings.gradle
settings.gradle
@@ -6,7 +6,7 @@ include \
'asciidoctorj-api',
'asciidoctorj-distribution',
'asciidoctorj-documentation',
- 'asciidoctorj-wildfly-integration-test',
+// 'asciidoctorj-wildfly-integration-test',
'asciidoctorj-springboot-integration-test',
'asciidoctorj-springboot-integration-test:springboot-app',
'asciidoctorj-test-support'

Try lifting to Gradle 7.0