Skip to content

Commit 9741f7f

Browse files
committed
Upgrade dependencies including Gradle
* Fix warnings about doc tasks
1 parent bb9dd89 commit 9741f7f

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.5.31'
2+
ext.kotlinVersion = '1.5.32'
33
repositories {
44
mavenCentral()
55
maven { url 'https://plugins.gradle.org/m2' }
@@ -63,11 +63,11 @@ ext {
6363
greenmailVersion = '1.6.5'
6464
groovyVersion = '3.0.9'
6565
hamcrestVersion = '2.2'
66-
hazelcastVersion = '4.2.2'
67-
hibernateVersion = '5.5.8.Final'
66+
hazelcastVersion = '4.2.3'
67+
hibernateVersion = '5.5.9.Final'
6868
hsqldbVersion = '2.6.0'
6969
h2Version = '1.4.200'
70-
jacksonVersion = '2.12.5'
70+
jacksonVersion = '2.12.6'
7171
javaxActivationVersion = '1.2.0'
7272
jaxbVersion = '2.3.4'
7373
jeroMqVersion = '0.5.2'
@@ -81,9 +81,9 @@ ext {
8181
jythonVersion = '2.7.2'
8282
kryoShadedVersion = '4.0.2'
8383
lettuceVersion = '6.1.5.RELEASE'
84-
log4jVersion = '2.16.0'
84+
log4jVersion = '2.17.0'
8585
mailVersion = '1.6.7'
86-
micrometerVersion = '1.7.6'
86+
micrometerVersion = '1.7.7'
8787
mockitoVersion = '3.12.4'
8888
mongoDriverVersion = '4.3.2'
8989
mysqlVersion = '8.0.27'
@@ -98,15 +98,15 @@ ext {
9898
servletApiVersion = '4.0.1'
9999
smackVersion = '4.3.5'
100100
soapVersion = '1.4.0'
101-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.12'
101+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.13'
102102
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2021.0.7'
103103
springKafkaVersion = '2.7.9'
104104
springRetryVersion = '1.3.1'
105-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.3'
106-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.13'
107-
springWsVersion = '3.1.1'
105+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.4'
106+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.14'
107+
springWsVersion = '3.1.2'
108108
testcontainersVersion = '1.16.2'
109-
tomcatVersion = '9.0.52'
109+
tomcatVersion = '9.0.56'
110110
xmlUnitVersion = '2.8.2'
111111
xstreamVersion = '1.4.17'
112112

@@ -349,7 +349,7 @@ configure(javaProjects) { subproject ->
349349

350350
checkstyle {
351351
configDirectory.set(rootProject.file('src/checkstyle'))
352-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '9.1'
352+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '9.2'
353353
}
354354

355355
jar {

gradle/docs.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ task prepareAsciidocBuild(type: Sync) {
1818
from {
1919
configurations.docs.collect { zipTree(it) }
2020
}
21-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
21+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
2222
from 'src/reference/asciidoc/'
2323
into "$buildDir/asciidoc"
2424
}
@@ -85,12 +85,13 @@ asciidoctorPdf {
8585
}
8686

8787
asciidoctorj {
88-
version = '2.4.2'
88+
version = '2.5.2'
8989
options doctype: 'book', eruby: 'erubis'
9090
attributes 'docinfo': 'shared',
9191
stylesdir: 'css/',
9292
stylesheet: 'stylesheet.css',
9393
'linkcss': true,
94+
'copycss': false,
9495
'icons': 'font',
9596
'sectanchors': '',
9697
'source-highlighter': 'highlight.js',
@@ -124,4 +125,4 @@ task reference(dependsOn: asciidoctor) {
124125
description = 'Generate the reference documentation'
125126
}
126127

127-
reference.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasProperty('ignoreEnvToStopReference') }
128+
reference.onlyIf { 'true' != System.env['NO_REFERENCE_TASK'] || project.hasProperty('ignoreEnvToStopReference') }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
6+
distributionSha256Sum=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392

0 commit comments

Comments
 (0)