Skip to content

Commit 821f099

Browse files
committed
Upgrade dependencies; prepare for release
1 parent 50769d0 commit 821f099

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

build.gradle

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.7.0'
2+
ext.kotlinVersion = '1.7.10'
33
ext.isCI = System.getenv('GITHUB_ACTION') || System.getenv('bamboo_buildKey')
44
repositories {
55
mavenCentral()
@@ -16,9 +16,9 @@ plugins {
1616
id 'org.sonarqube' version '2.8'
1717
id 'io.spring.nohttp' version '0.0.10' apply false
1818
id 'org.ajoberstar.grgit' version '4.1.1'
19-
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
20-
id 'com.jfrog.artifactory' version '4.28.0' apply false
21-
id 'org.jetbrains.dokka' version '1.6.10'
19+
id 'io.spring.dependency-management' version '1.0.12.RELEASE'
20+
id 'com.jfrog.artifactory' version '4.28.4' apply false
21+
id 'org.jetbrains.dokka' version '1.7.10'
2222
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
2323
id 'org.asciidoctor.jvm.gems' version '3.3.2'
2424
id 'org.asciidoctor.jvm.convert' version '3.3.2'
@@ -48,9 +48,9 @@ ext {
4848
files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
4949

5050
apacheSshdVersion = '2.8.0'
51-
artemisVersion = '2.22.0'
51+
artemisVersion = '2.23.1'
5252
aspectjVersion = '1.9.9.1'
53-
assertjVersion = '3.22.0'
53+
assertjVersion = '3.23.1'
5454
assertkVersion = '0.25'
5555
avroVersion = '1.11.0'
5656
awaitilityVersion = '4.2.0'
@@ -62,15 +62,15 @@ ext {
6262
findbugsVersion = '3.0.1'
6363
ftpServerVersion = '1.2.0'
6464
greenmailVersion = '2.0.0-alpha-2'
65-
groovyVersion = '3.0.10'
65+
groovyVersion = '3.0.11'
6666
hamcrestVersion = '2.2'
67-
hazelcastVersion = '5.1.1'
67+
hazelcastVersion = '5.1.2'
6868
hibernateVersion = '6.1.1.Final'
6969
hsqldbVersion = '2.6.1'
7070
h2Version = '2.1.212'
7171
jacksonVersion = '2.13.3'
7272
jaxbVersion = '3.0.2'
73-
jcifsVersion = '2.1.29'
73+
jcifsVersion = '2.1.31'
7474
jeroMqVersion = '0.5.2'
7575
jmsApiVersion = '3.0.0'
7676
jpaApiVersion = '3.0.2'
@@ -81,32 +81,32 @@ ext {
8181
junitJupiterVersion = '5.8.2'
8282
jythonVersion = '2.7.2'
8383
kryoVersion = '5.3.0'
84-
lettuceVersion = '6.1.8.RELEASE'
85-
log4jVersion = '2.17.2'
84+
lettuceVersion = '6.2.0.RELEASE'
85+
log4jVersion = '2.18.0'
8686
mailVersion = '2.0.1'
87-
micrometerVersion = '1.10.0-SNAPSHOT'
88-
micrometerTracingVersion = '1.0.0-SNAPSHOT'
89-
mockitoVersion = '4.5.1'
90-
mongoDriverVersion = '4.7.0-beta0'
91-
mysqlVersion = '8.0.28'
87+
micrometerVersion = '1.10.0-M3'
88+
micrometerTracingVersion = '1.0.0-M6'
89+
mockitoVersion = '4.6.1'
90+
mongoDriverVersion = '4.7.0'
91+
mysqlVersion = '8.0.29'
9292
pahoMqttClientVersion = '1.2.5'
9393
postgresVersion = '42.3.3'
94-
r2dbch2Version = '0.9.1.RELEASE'
95-
reactorVersion = '2022.0.0-M2'
94+
r2dbch2Version = '1.0.0.RC1'
95+
reactorVersion = '2022.0.0-M4'
9696
resilience4jVersion = '1.7.1'
9797
romeToolsVersion = '1.18.0'
9898
rsocketVersion = '1.1.2'
9999
saajVersion = '2.0.1'
100100
servletApiVersion = '5.0.0'
101101
smackVersion = '4.4.5'
102-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
103-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
104-
springGraphqlVersion = '1.0.0'
105-
springKafkaVersion = '3.0.0-SNAPSHOT'
102+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3'
103+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M5'
104+
springGraphqlVersion = '1.0.1'
105+
springKafkaVersion = '3.0.0-M5'
106106
springRetryVersion = '1.3.3'
107-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
108-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
109-
springWsVersion = '4.0.0-SNAPSHOT'
107+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M6'
108+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M5'
109+
springWsVersion = '4.0.0-M2'
110110
testcontainersVersion = '1.17.3'
111111
tomcatVersion = '10.0.21'
112112
xmlUnitVersion = '2.9.0'

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void testPtP() throws Exception {
7777
amqpChannel.setBeanFactory(mock(BeanFactory.class));
7878
amqpChannel.afterPropertiesSet();
7979

80-
MessageListener listener = container.getMessageListener();
80+
MessageListener listener = (MessageListener) container.getMessageListener();
8181

8282
assertThatExceptionOfType(MessageDeliveryException.class)
8383
.isThrownBy(() -> listener.onMessage(new Message("Hello world!".getBytes())))
@@ -101,7 +101,7 @@ public void testPubSub() {
101101
amqpChannel.afterPropertiesSet();
102102

103103
List<String> logList = insertMockLoggerInListener(amqpChannel);
104-
MessageListener listener = container.getMessageListener();
104+
MessageListener listener = (MessageListener) container.getMessageListener();
105105
listener.onMessage(new Message("Hello world!".getBytes()));
106106
verifyLogReceived(logList);
107107
}

spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public static void startUp() throws Exception {
6363
.setJMXManagementEnabled(false)
6464
.setJournalDatasync(false)
6565
.addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()))
66-
.addAddressesSetting("#",
66+
.addAddressSetting("#",
6767
new AddressSettings()
6868
.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
6969
.setExpiryAddress(SimpleString.toSimpleString("expiry")));

spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static void setup() throws Exception {
8181
.setJMXManagementEnabled(false)
8282
.setJournalDatasync(false)
8383
.addAcceptorConfiguration("stomp", "tcp://127.0.0.1:" + TransportConstants.DEFAULT_STOMP_PORT)
84-
.addAddressesSetting("#",
84+
.addAddressSetting("#",
8585
new AddressSettings()
8686
.setDeadLetterAddress(SimpleString.toSimpleString("dla"))
8787
.setExpiryAddress(SimpleString.toSimpleString("expiry")));

0 commit comments

Comments
 (0)