diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index dba97a65b..1f5b34c8f 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -16,13 +16,16 @@ 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) +* Upgrade to JRuby 9.3.4.0 (#1085) +* Upgrade to Rouge 3.28.0 (#1085) Bug Fixes:: Build Improvement:: -* Upgrade to gradle 7.3.3 (#1079) +* Upgrade to gradle 7.4.1 (#1085) +* Upgrade to Wildfly 26.0.1 for integration test (#1085) +* Upgrade to Spring Boot 2.6.5 for integration test (#1085) Documentation:: diff --git a/asciidoctorj-springboot-integration-test/build.gradle b/asciidoctorj-springboot-integration-test/build.gradle index 9b4c37009..4c23b843c 100644 --- a/asciidoctorj-springboot-integration-test/build.gradle +++ b/asciidoctorj-springboot-integration-test/build.gradle @@ -5,9 +5,9 @@ dependencies { 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" + testImplementation "org.awaitility:awaitility:4.2.0" + testImplementation "com.squareup.okhttp3:okhttp:4.9.3" + testImplementation "com.google.code.gson:gson:2.9.0" } test.dependsOn(':asciidoctorj-springboot-integration-test:springboot-app:assemble') diff --git a/asciidoctorj-springboot-integration-test/springboot-app/build.gradle b/asciidoctorj-springboot-integration-test/springboot-app/build.gradle index f5a56735a..7644db849 100644 --- a/asciidoctorj-springboot-integration-test/springboot-app/build.gradle +++ b/asciidoctorj-springboot-integration-test/springboot-app/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.5.2' + id 'org.springframework.boot' version '2.6.5' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } diff --git a/asciidoctorj-wildfly-integration-test/build.gradle b/asciidoctorj-wildfly-integration-test/build.gradle index 03fd240ab..c2a9a7ce9 100644 --- a/asciidoctorj-wildfly-integration-test/build.gradle +++ b/asciidoctorj-wildfly-integration-test/build.gradle @@ -3,7 +3,7 @@ jar.enabled = false ext { arquillianWildflyVersion = '3.0.1.Final' - wildflyVersion = '23.0.0.Final' + wildflyVersion = '26.0.1.Final' } repositories { diff --git a/asciidoctorj-wildfly-integration-test/src/test/resources/arquillian.xml b/asciidoctorj-wildfly-integration-test/src/test/resources/arquillian.xml index bbd54791e..11086f9b0 100644 --- a/asciidoctorj-wildfly-integration-test/src/test/resources/arquillian.xml +++ b/asciidoctorj-wildfly-integration-test/src/test/resources/arquillian.xml @@ -23,7 +23,7 @@ ${jboss.home} - --add-modules java.se + --add-modules java.se --add-opens java.base/java.util=ALL-UNNAMED ${jboss.server.config.file.name:standalone.xml} ${jboss.args:} diff --git a/build.gradle b/build.gradle index 2bf981e18..18d80adf8 100644 --- a/build.gradle +++ b/build.gradle @@ -69,7 +69,7 @@ ext { guavaVersion = '18.0' hamcrestVersion = '1.3' jcommanderVersion = '1.82' - jrubyVersion = '9.3.3.0' + jrubyVersion = '9.3.4.0' jsoupVersion = '1.14.3' junitVersion = '4.13.2' assertjVersion = '3.19.0' @@ -82,7 +82,7 @@ ext { asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.17' asciimathGemVersion = '2.0.3' coderayGemVersion = '1.1.3' - rougeGemVersion = '3.27.0' + rougeGemVersion = '3.28.0' codenarcVersion = '2.1.0' groovyVersion = '2.4.21' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..00e33edef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists