Upgrade dependencies; prepare for release

spring-projects · Jul 20, 2022 · 821f099 · 821f099
1 parent 50769d0
commit 821f099
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.7.0'
+    ext.kotlinVersion = '1.7.10'
     ext.isCI = System.getenv('GITHUB_ACTION') || System.getenv('bamboo_buildKey')
     repositories {
         mavenCentral()
@@ -16,9 +16,9 @@ plugins {
     id 'org.sonarqube' version '2.8'
     id 'io.spring.nohttp' version '0.0.10' apply false
     id 'org.ajoberstar.grgit' version '4.1.1'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-    id 'com.jfrog.artifactory' version '4.28.0' apply false
-    id 'org.jetbrains.dokka' version '1.6.10'
+    id 'io.spring.dependency-management' version '1.0.12.RELEASE'
+    id 'com.jfrog.artifactory' version '4.28.4' apply false
+    id 'org.jetbrains.dokka' version '1.7.10'
     id 'org.asciidoctor.jvm.pdf' version '3.3.2'
     id 'org.asciidoctor.jvm.gems' version '3.3.2'
     id 'org.asciidoctor.jvm.convert' version '3.3.2'
@@ -48,9 +48,9 @@ ext {
             files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
     apacheSshdVersion = '2.8.0'
-    artemisVersion = '2.22.0'
+    artemisVersion = '2.23.1'
     aspectjVersion = '1.9.9.1'
-    assertjVersion = '3.22.0'
+    assertjVersion = '3.23.1'
     assertkVersion = '0.25'
     avroVersion = '1.11.0'
     awaitilityVersion = '4.2.0'
@@ -62,15 +62,15 @@ ext {
     findbugsVersion = '3.0.1'
     ftpServerVersion = '1.2.0'
     greenmailVersion = '2.0.0-alpha-2'
-    groovyVersion = '3.0.10'
+    groovyVersion = '3.0.11'
     hamcrestVersion = '2.2'
-    hazelcastVersion = '5.1.1'
+    hazelcastVersion = '5.1.2'
     hibernateVersion = '6.1.1.Final'
     hsqldbVersion = '2.6.1'
     h2Version = '2.1.212'
     jacksonVersion = '2.13.3'
     jaxbVersion = '3.0.2'
-    jcifsVersion = '2.1.29'
+    jcifsVersion = '2.1.31'
     jeroMqVersion = '0.5.2'
     jmsApiVersion = '3.0.0'
     jpaApiVersion = '3.0.2'
@@ -81,32 +81,32 @@ ext {
     junitJupiterVersion = '5.8.2'
     jythonVersion = '2.7.2'
     kryoVersion = '5.3.0'
-    lettuceVersion = '6.1.8.RELEASE'
-    log4jVersion = '2.17.2'
+    lettuceVersion = '6.2.0.RELEASE'
+    log4jVersion = '2.18.0'
     mailVersion = '2.0.1'
-	micrometerVersion = '1.10.0-SNAPSHOT'
-    micrometerTracingVersion = '1.0.0-SNAPSHOT'
-    mockitoVersion = '4.5.1'
-    mongoDriverVersion = '4.7.0-beta0'
-    mysqlVersion = '8.0.28'
+	micrometerVersion = '1.10.0-M3'
+    micrometerTracingVersion = '1.0.0-M6'
+    mockitoVersion = '4.6.1'
+    mongoDriverVersion = '4.7.0'
+    mysqlVersion = '8.0.29'
     pahoMqttClientVersion = '1.2.5'
     postgresVersion = '42.3.3'
-    r2dbch2Version = '0.9.1.RELEASE'
-    reactorVersion = '2022.0.0-M2'
+    r2dbch2Version = '1.0.0.RC1'
+    reactorVersion = '2022.0.0-M4'
     resilience4jVersion = '1.7.1'
     romeToolsVersion = '1.18.0'
     rsocketVersion = '1.1.2'
     saajVersion = '2.0.1'
     servletApiVersion = '5.0.0'
     smackVersion = '4.4.5'
-    springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
-    springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
-    springGraphqlVersion = '1.0.0'
-    springKafkaVersion = '3.0.0-SNAPSHOT'
+    springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3'
+    springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M5'
+    springGraphqlVersion = '1.0.1'
+    springKafkaVersion = '3.0.0-M5'
     springRetryVersion = '1.3.3'
-    springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
-    springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
-    springWsVersion = '4.0.0-SNAPSHOT'
+    springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M6'
+    springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M5'
+    springWsVersion = '4.0.0-M2'
     testcontainersVersion = '1.17.3'
     tomcatVersion = '10.0.21'
     xmlUnitVersion = '2.9.0'

diff --git a/...st/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java b/...st/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java
@@ -77,7 +77,7 @@ public void testPtP() throws Exception {
 		amqpChannel.setBeanFactory(mock(BeanFactory.class));
 		amqpChannel.afterPropertiesSet();
 
-		MessageListener listener = container.getMessageListener();
+		MessageListener listener = (MessageListener) container.getMessageListener();
 
 		assertThatExceptionOfType(MessageDeliveryException.class)
 				.isThrownBy(() -> listener.onMessage(new Message("Hello world!".getBytes())))
@@ -101,7 +101,7 @@ public void testPubSub() {
 		amqpChannel.afterPropertiesSet();
 
 		List<String> logList = insertMockLoggerInListener(amqpChannel);
-		MessageListener listener = container.getMessageListener();
+		MessageListener listener = (MessageListener) container.getMessageListener();
 		listener.onMessage(new Message("Hello world!".getBytes()));
 		verifyLogReceived(logList);
 	}

diff --git a/...tion-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java b/...tion-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public static void startUp() throws Exception {
 						.setJMXManagementEnabled(false)
 						.setJournalDatasync(false)
 						.addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()))
-						.addAddressesSetting("#",
+						.addAddressSetting("#",
 								new AddressSettings()
 										.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
 										.setExpiryAddress(SimpleString.toSimpleString("expiry")));

diff --git a/...c/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java b/...c/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java
@@ -81,7 +81,7 @@ public static void setup() throws Exception {
 						.setJMXManagementEnabled(false)
 						.setJournalDatasync(false)
 						.addAcceptorConfiguration("stomp", "tcp://127.0.0.1:" + TransportConstants.DEFAULT_STOMP_PORT)
-						.addAddressesSetting("#",
+						.addAddressSetting("#",
 								new AddressSettings()
 										.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
 										.setExpiryAddress(SimpleString.toSimpleString("expiry")));