From e70d0ef5e2a58d9d5c683297fe93c77870a08769 Mon Sep 17 00:00:00 2001
From: abilan <abilan@vmware.com>
Date: Tue, 16 May 2023 13:17:22 -0400
Subject: [PATCH] Upgrade dependencies; prepare for release

* `--add-opens` for `java.lang` and `java.util`
in Groovy and Scripting modules to let `java.util.Date` scoped prototype bean
to work back with new CGLIB classpath limitations
---
 build.gradle | 61 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2ec22c2b9f..91b2274f2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,30 +48,30 @@ ext {
     modifiedFiles =
             files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
-    apacheSshdVersion = '2.9.2'
+    apacheSshdVersion = '2.10.0'
     artemisVersion = '2.28.0'
     aspectjVersion = '1.9.19'
     assertjVersion = '3.24.2'
-    assertkVersion = '0.25'
+    assertkVersion = '0.26'
     avroVersion = '1.11.1'
     awaitilityVersion = '4.2.0'
-    camelVersion = '3.20.3'
+    camelVersion = '3.20.4'
     commonsDbcp2Version = '2.9.0'
     commonsIoVersion = '2.11.0'
     commonsNetVersion = '3.9.0'
-    curatorVersion = '5.4.0'
+    curatorVersion = '5.5.0'
     derbyVersion = '10.16.1.1'
     findbugsVersion = '3.0.1'
     ftpServerVersion = '1.2.0'
-    graalvmVersion = '22.3.1'
+    graalvmVersion = '22.3.2'
     greenmailVersion = '2.0.0'
-    groovyVersion = '4.0.11'
+    groovyVersion = '4.0.12'
     hamcrestVersion = '2.2'
     hazelcastVersion = '5.2.3'
-    hibernateVersion = '6.2.1.Final'
+    hibernateVersion = '6.2.2.Final'
     hsqldbVersion = '2.7.1'
     h2Version = '2.1.214'
-    jacksonVersion = '2.15.0-rc3'
+    jacksonVersion = '2.15.0'
     jaxbVersion = '4.0.2'
     jcifsVersion = '2.1.34'
     jeroMqVersion = '0.5.3'
@@ -80,38 +80,38 @@ ext {
     jrubyVersion = '9.4.1.0'
     jsonpathVersion = '2.8.0'
     junit4Version = '4.13.2'
-    junitJupiterVersion = '5.9.2'
+    junitJupiterVersion = '5.9.3'
     jythonVersion = '2.7.3'
     kotlinCoroutinesVersion = '1.6.4'
-    kryoVersion = '5.4.0'
+    kryoVersion = '5.5.0'
     lettuceVersion = '6.2.4.RELEASE'
     log4jVersion = '2.20.0'
     mailVersion = '1.0.0'
-    micrometerTracingVersion = '1.1.0-RC1'
-    micrometerVersion = '1.11.0-RC1'
-    mockitoVersion = '5.3.0'
+    micrometerTracingVersion = '1.1.1'
+    micrometerVersion = '1.11.0'
+    mockitoVersion = '5.3.1'
     mongoDriverVersion = '4.9.1'
-    mysqlVersion = '8.0.32'
+    mysqlVersion = '8.0.33'
     pahoMqttClientVersion = '1.2.5'
     postgresVersion = '42.6.0'
-    protobufVersion = '3.22.3'
+    protobufVersion = '3.23.0'
     r2dbch2Version = '1.0.0.RELEASE'
-    reactorVersion = '2022.0.6'
+    reactorVersion = '2022.0.7'
     resilience4jVersion = '2.0.2'
     romeToolsVersion = '2.1.0'
     rsocketVersion = '1.1.3'
     servletApiVersion = '6.0.0'
     smackVersion = '4.4.6'
     springAmqpVersion = '3.0.4'
-    springDataVersion = '2023.0.0-RC1'
-    springGraphqlVersion = '1.2.0-M1'
-    springKafkaVersion = '3.0.6'
+    springDataVersion = '2023.0.0'
+    springGraphqlVersion = '1.2.0'
+    springKafkaVersion = '3.0.7'
     springRetryVersion = '2.0.1'
-    springSecurityVersion = '6.1.0-RC1'
-    springVersion = '6.0.8'
-    springWsVersion = '4.0.3'
-    testcontainersVersion = '1.18.0'
-    tomcatVersion = '11.0.0-M4'
+    springSecurityVersion = '6.1.0'
+    springVersion = '6.0.9'
+    springWsVersion = '4.0.4'
+    testcontainersVersion = '1.18.1'
+    tomcatVersion = '10.1.8'
     xmlUnitVersion = '2.9.1'
     xstreamVersion = '1.4.20'
     ztZipVersion = '1.15'
@@ -244,7 +244,7 @@ configure(javaProjects) { subproject ->
     }
 
     jacoco {
-        toolVersion = '0.8.8'
+        toolVersion = '0.8.10'
     }
 
     // dependencies that are common across all java projects
@@ -364,7 +364,7 @@ configure(javaProjects) { subproject ->
 
     checkstyle {
         configDirectory.set(rootProject.file('src/checkstyle'))
-        toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.9.3'
+        toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.11.0'
     }
 
     jar {
@@ -642,6 +642,11 @@ project('spring-integration-groovy') {
 
         testRuntimeOnly 'org.apache.groovy:groovy-dateutil'
     }
+
+    tasks.withType(JavaForkOptions) {
+        jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+                '--add-opens', 'java.base/java.util=ALL-UNNAMED'
+    }
 }
 
 project('spring-integration-hazelcast') {
@@ -880,7 +885,9 @@ project('spring-integration-scripting') {
 
     tasks.withType(JavaForkOptions) {
         jvmArgs '--add-opens', 'java.base/sun.nio.ch=ALL-UNNAMED',
-                '--add-opens', 'java.base/java.io=ALL-UNNAMED'
+                '--add-opens', 'java.base/java.io=ALL-UNNAMED',
+                '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+                '--add-opens', 'java.base/java.util=ALL-UNNAMED'
     }
 }