diff --git a/build.gradle b/build.gradle index 8c6ceda2c0..47b8ef52b9 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ ext { apacheSshdVersion = '2.4.0' avroVersion = '1.9.2' aspectjVersion = '1.9.5' - assertjVersion = '3.15.0' + assertjVersion = '3.16.1' assertkVersion = '0.22' awaitilityVersion = '4.0.2' commonsDbcp2Version = '2.7.0' @@ -80,25 +80,25 @@ ext { kryoShadedVersion = '4.0.2' lettuceVersion = '5.3.0.RELEASE' log4jVersion = '2.13.2' - micrometerVersion = '1.5.0' + micrometerVersion = '1.5.1' mockitoVersion = '3.3.3' - mongoDriverVersion = '4.0.2' + mongoDriverVersion = '4.0.3' mysqlVersion = '8.0.20' pahoMqttClientVersion = '1.2.2' postgresVersion = '42.2.12' reactorVersion = 'Dysprosium-SR7' resilience4jVersion = '1.4.0' romeToolsVersion = '1.12.2' - rsocketVersion = '1.0.0-RC7' + rsocketVersion = '1.0.0' servletApiVersion = '4.0.1' smackVersion = '4.3.4' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.6.RELEASE' - springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : 'Neumann-RC2' - springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.3.1.RELEASE' + springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : 'Neumann-RELEASE' + springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.3.2.RELEASE' springRetryVersion = '1.2.5.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.6.RELEASE' springWsVersion = '3.0.9.RELEASE' - tomcatVersion = "9.0.34" + tomcatVersion = "9.0.35" xstreamVersion = '1.4.12' javaProjects = subprojects - project(':spring-integration-bom') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda8577..62d4c05355 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b4429748..4c5803d13c 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-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d95..fbd7c51583 100755 --- a/gradlew +++ b/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 diff --git a/gradlew.bat b/gradlew.bat index 9109989e3c..a9f778a7a9 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* 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%