Skip to content

Commit 4c8172d

Browse files
committed
Move to SNAPSHOTs; upgrade Tomcat to 10.1.1
* Use `spring-amqp-bom`, `spring-kafka-bom`
1 parent 4d5548c commit 4c8172d

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

build.gradle

+17-16
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ ext {
108108
rsocketVersion = '1.1.3'
109109
servletApiVersion = '6.0.0'
110110
smackVersion = '4.4.6'
111-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1'
112-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC2'
113-
springGraphqlVersion = '1.1.0-RC1'
114-
springKafkaVersion = '3.0.0-RC2'
115-
springRetryVersion = '2.0.0-RC2'
116-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1'
117-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC3'
118-
springWsVersion = '4.0.0-RC1'
111+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
112+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
113+
springGraphqlVersion = '1.1.0-SNAPSHOT'
114+
springKafkaVersion = '3.0.0-SNAPSHOT'
115+
springRetryVersion = '2.0.0-SNAPSHOT'
116+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
117+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
118+
springWsVersion = '4.0.0-SNAPSHOT'
119119
testcontainersVersion = '1.17.5'
120-
tomcatVersion = '10.0.23'
120+
tomcatVersion = '10.1.1'
121121
xmlUnitVersion = '2.9.0'
122122
xstreamVersion = '1.4.19'
123123

@@ -165,9 +165,11 @@ allprojects {
165165
mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
166166
mavenBom "org.junit:junit-bom:$junitJupiterVersion"
167167
mavenBom "org.springframework:spring-framework-bom:$springVersion"
168+
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
169+
mavenBom "org.springframework.amqp:spring-amqp-bom:$springAmqpVersion"
170+
mavenBom "org.springframework.kafka:spring-kafka-bom:$springKafkaVersion"
168171
mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
169172
mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion"
170-
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
171173
mavenBom "org.mockito:mockito-bom:$mockitoVersion"
172174
mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
173175
mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion"
@@ -479,14 +481,14 @@ project('spring-integration-amqp') {
479481
description = 'Spring Integration AMQP Support'
480482
dependencies {
481483
api project(':spring-integration-core')
482-
api("org.springframework.amqp:spring-rabbit:$springAmqpVersion") {
484+
api('org.springframework.amqp:spring-rabbit') {
483485
exclude group: 'org.springframework'
484486
}
485-
optionalApi("org.springframework.amqp:spring-rabbit-stream:$springAmqpVersion") {
487+
optionalApi('org.springframework.amqp:spring-rabbit-stream') {
486488
exclude group: 'org.springframework'
487489
}
488490

489-
testImplementation("org.springframework.amqp:spring-rabbit-junit:$springAmqpVersion") {
491+
testImplementation('org.springframework.amqp:spring-rabbit-junit') {
490492
exclude group: 'org.springframework'
491493
}
492494
testImplementation project(':spring-integration-stream')
@@ -777,11 +779,11 @@ project('spring-integration-kafka') {
777779
description = 'Spring Integration for Apache Kafka'
778780
dependencies {
779781
api project(':spring-integration-core')
780-
api("org.springframework.kafka:spring-kafka:$springKafkaVersion") {
782+
api('org.springframework.kafka:spring-kafka') {
781783
exclude group: 'org.springframework'
782784
}
783785

784-
testImplementation "org.springframework.kafka:spring-kafka-test:$springKafkaVersion"
786+
testImplementation 'org.springframework.kafka:spring-kafka-test'
785787
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
786788
}
787789
}
@@ -1028,7 +1030,6 @@ project('spring-integration-ws') {
10281030
api 'org.springframework:spring-webmvc'
10291031
api("org.springframework.ws:spring-ws-core:$springWsVersion") {
10301032
exclude group: 'org.springframework'
1031-
exclude group: 'com.sun.activation'
10321033
}
10331034

10341035
providedImplementation "com.sun.xml.bind:jaxb-impl:$jaxbVersion"

0 commit comments

Comments
 (0)