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

Update versions of Gradle, JRuby and frameworks for integration tests. #1085

Merged
merged 2 commits into from
Apr 3, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
6 changes: 3 additions & 3 deletions asciidoctorj-springboot-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion asciidoctorj-wildfly-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jar.enabled = false
ext {
arquillianWildflyVersion = '3.0.1.Final'

wildflyVersion = '23.0.0.Final'
wildflyVersion = '26.0.1.Final'
}

repositories {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<configuration>
<property name="jbossHome">${jboss.home}</property>
<!--<property name="javaVmArguments">-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</property> -->
<property name="javaVmArguments">--add-modules java.se</property>
<property name="javaVmArguments">--add-modules java.se --add-opens java.base/java.util=ALL-UNNAMED</property>
<property name="serverConfig">${jboss.server.config.file.name:standalone.xml}</property>
<property name="jbossArguments">${jboss.args:}</property>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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