Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move to SNAPSHOTs; upgrade Tomcat to 10.1.1

Browse Source 
* Use `spring-amqp-bom`, `spring-kafka-bom`
This commit is contained in:
artembilan
2022-11-09 11:48:48 -05:00
parent 4d5548c9ed
commit 4c8172d594
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
build.gradle
View File

@@ -108,16 +108,16 @@ ext {
rsocketVersion = '1.1.3'
servletApiVersion = '6.0.0'
smackVersion = '4.4.6'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC2'
springGraphqlVersion = '1.1.0-RC1'
springKafkaVersion = '3.0.0-RC2'
springRetryVersion = '2.0.0-RC2'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC3'
springWsVersion = '4.0.0-RC1'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
springGraphqlVersion = '1.1.0-SNAPSHOT'
springKafkaVersion = '3.0.0-SNAPSHOT'
springRetryVersion = '2.0.0-SNAPSHOT'
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'
testcontainersVersion = '1.17.5'
tomcatVersion = '10.0.23'
tomcatVersion = '10.1.1'
xmlUnitVersion = '2.9.0'
xstreamVersion = '1.4.19'
@@ -165,9 +165,11 @@ allprojects {
mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
mavenBom "org.junit:junit-bom:$junitJupiterVersion"
mavenBom "org.springframework:spring-framework-bom:$springVersion"
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
mavenBom "org.springframework.amqp:spring-amqp-bom:$springAmqpVersion"
mavenBom "org.springframework.kafka:spring-kafka-bom:$springKafkaVersion"
mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion"
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
mavenBom "org.mockito:mockito-bom:$mockitoVersion"
mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion"
@@ -479,14 +481,14 @@ project('spring-integration-amqp') {
description = 'Spring Integration AMQP Support'
dependencies {
api project(':spring-integration-core')
api("org.springframework.amqp:spring-rabbit:$springAmqpVersion") {
api('org.springframework.amqp:spring-rabbit') {
exclude group: 'org.springframework'
}
optionalApi("org.springframework.amqp:spring-rabbit-stream:$springAmqpVersion") {
optionalApi('org.springframework.amqp:spring-rabbit-stream') {
exclude group: 'org.springframework'
}
testImplementation("org.springframework.amqp:spring-rabbit-junit:$springAmqpVersion") {
testImplementation('org.springframework.amqp:spring-rabbit-junit') {
exclude group: 'org.springframework'
}
testImplementation project(':spring-integration-stream')
@@ -777,11 +779,11 @@ project('spring-integration-kafka') {
description = 'Spring Integration for Apache Kafka'
dependencies {
api project(':spring-integration-core')
api("org.springframework.kafka:spring-kafka:$springKafkaVersion") {
api('org.springframework.kafka:spring-kafka') {
exclude group: 'org.springframework'
}
testImplementation "org.springframework.kafka:spring-kafka-test:$springKafkaVersion"
testImplementation 'org.springframework.kafka:spring-kafka-test'
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
}
}
@@ -1028,7 +1030,6 @@ project('spring-integration-ws') {
api 'org.springframework:spring-webmvc'
api("org.springframework.ws:spring-ws-core:$springWsVersion") {
exclude group: 'org.springframework'
exclude group: 'com.sun.activation'
}
providedImplementation "com.sun.xml.bind:jaxb-impl:$jaxbVersion"