Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies including Gradle

Browse Source 
* Fix warnings about doc tasks
This commit is contained in:
Artem Bilan
2021-12-20 15:02:39 -05:00
parent bb9dd89286
commit 9741f7fc5f
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle
View File

@@ -1,5 +1,5 @@
buildscript {
ext.kotlinVersion = '1.5.31'
ext.kotlinVersion = '1.5.32'
repositories {
mavenCentral()
maven { url 'https://plugins.gradle.org/m2' }
@@ -63,11 +63,11 @@ ext {
greenmailVersion = '1.6.5'
groovyVersion = '3.0.9'
hamcrestVersion = '2.2'
hazelcastVersion = '4.2.2'
hibernateVersion = '5.5.8.Final'
hazelcastVersion = '4.2.3'
hibernateVersion = '5.5.9.Final'
hsqldbVersion = '2.6.0'
h2Version = '1.4.200'
jacksonVersion = '2.12.5'
jacksonVersion = '2.12.6'
javaxActivationVersion = '1.2.0'
jaxbVersion = '2.3.4'
jeroMqVersion = '0.5.2'
@@ -81,9 +81,9 @@ ext {
jythonVersion = '2.7.2'
kryoShadedVersion = '4.0.2'
lettuceVersion = '6.1.5.RELEASE'
log4jVersion = '2.16.0'
log4jVersion = '2.17.0'
mailVersion = '1.6.7'
micrometerVersion = '1.7.6'
micrometerVersion = '1.7.7'
mockitoVersion = '3.12.4'
mongoDriverVersion = '4.3.2'
mysqlVersion = '8.0.27'
@@ -98,15 +98,15 @@ ext {
servletApiVersion = '4.0.1'
smackVersion = '4.3.5'
soapVersion = '1.4.0'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.12'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.13'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2021.0.7'
springKafkaVersion = '2.7.9'
springRetryVersion = '1.3.1'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.3'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.13'
springWsVersion = '3.1.1'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.4'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.14'
springWsVersion = '3.1.2'
testcontainersVersion = '1.16.2'
tomcatVersion = '9.0.52'
tomcatVersion = '9.0.56'
xmlUnitVersion = '2.8.2'
xstreamVersion = '1.4.17'
@@ -349,7 +349,7 @@ configure(javaProjects) { subproject ->
checkstyle {
configDirectory.set(rootProject.file('src/checkstyle'))
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '9.1'
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '9.2'
}
jar {

7
gradle/docs.gradle
View File

@@ -18,7 +18,7 @@ task prepareAsciidocBuild(type: Sync) {
from {
configurations.docs.collect { zipTree(it) }
}
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
duplicatesStrategy = DuplicatesStrategy.INCLUDE
from 'src/reference/asciidoc/'
into "$buildDir/asciidoc"
}
@@ -85,12 +85,13 @@ asciidoctorPdf {
}
asciidoctorj {
version = '2.4.2'
version = '2.5.2'
options doctype: 'book', eruby: 'erubis'
attributes 'docinfo': 'shared',
stylesdir: 'css/',
stylesheet: 'stylesheet.css',
'linkcss': true,
'copycss': false,
'icons': 'font',
'sectanchors': '',
'source-highlighter': 'highlight.js',
@@ -124,4 +125,4 @@ task reference(dependsOn: asciidoctor) {
description = 'Generate the reference documentation'
}
reference.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasProperty('ignoreEnvToStopReference') }
reference.onlyIf { 'true' != System.env['NO_REFERENCE_TASK'] || project.hasProperty('ignoreEnvToStopReference') }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
distributionSha256Sum=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392