Upgrade dependencies
* Exclude transitive `org.springframework` group non-core Spring projects to avoid CLASSPATH conflicts
This commit is contained in:
Artem Bilan
committed by
Gary Russell
Gary Russell
parent
d9bad5b248
commit
f6a7fe6f32
38
build.gradle
38
build.gradle
@@ -1,5 +1,5 @@
|
||||
buildscript {
|
||||
ext.kotlinVersion = '1.3.31'
|
||||
ext.kotlinVersion = '1.3.40'
|
||||
repositories {
|
||||
maven { url 'https://repo.spring.io/plugins-release' }
|
||||
}
|
||||
@@ -7,7 +7,6 @@ buildscript {
|
||||
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
|
||||
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
|
||||
classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +14,7 @@ plugins {
|
||||
id "org.sonarqube" version '2.7.1'
|
||||
id 'org.asciidoctor.convert' version '1.6.1'
|
||||
id 'org.ajoberstar.grgit' version '3.1.1'
|
||||
id "io.spring.nohttp" version "0.0.3.RELEASE"
|
||||
}
|
||||
|
||||
description = 'Spring AMQP'
|
||||
@@ -22,7 +22,6 @@ description = 'Spring AMQP'
|
||||
apply plugin: 'base'
|
||||
apply plugin: 'project-report'
|
||||
apply plugin: 'idea'
|
||||
apply plugin: 'io.spring.nohttp'
|
||||
|
||||
ext {
|
||||
isTravisBuild = System.getenv().get("TRAVIS") == 'true'
|
||||
@@ -81,25 +80,23 @@ subprojects { subproject ->
|
||||
|
||||
ext {
|
||||
assertjVersion = '3.12.2'
|
||||
assertkVersion = '0.17'
|
||||
commonsHttpClientVersion = '4.5.8'
|
||||
assertkVersion = '0.19'
|
||||
commonsHttpClientVersion = '4.5.9'
|
||||
googleJsr305Version = '3.0.2'
|
||||
hamcrestVersion = '1.3'
|
||||
jackson2Version = '2.9.9'
|
||||
jaywayJsonPathVersion = '2.4.0'
|
||||
junit4Version = '4.12'
|
||||
junitJupiterVersion = '5.5.0'
|
||||
junitPlatformVersion = '1.5.0'
|
||||
log4jVersion = '2.11.2'
|
||||
junitJupiterVersion = '5.5.1'
|
||||
junitPlatformVersion = '1.5.1'
|
||||
log4jVersion = '2.12.0'
|
||||
logbackVersion = '1.2.3'
|
||||
mockitoVersion = '2.28.2'
|
||||
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.7.1'
|
||||
mockitoVersion = '3.0.0'
|
||||
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.7.2'
|
||||
rabbitmqHttpClientVersion = '3.2.0.RELEASE'
|
||||
reactorVersion = '3.3.0.M2'
|
||||
springDataCommonsVersion = '2.2.0.RC1'
|
||||
|
||||
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.M3'
|
||||
|
||||
reactorVersion = '3.3.0.BUILD-SNAPSHOT'
|
||||
springDataCommonsVersion = '2.2.0.BUILD-SNAPSHOT'
|
||||
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
|
||||
springRetryVersion = '1.2.4.RELEASE'
|
||||
}
|
||||
|
||||
@@ -110,7 +107,7 @@ subprojects { subproject ->
|
||||
}
|
||||
|
||||
jacoco {
|
||||
toolVersion = '0.8.3'
|
||||
toolVersion = '0.8.4'
|
||||
}
|
||||
|
||||
// dependencies that are common across all java projects
|
||||
@@ -287,14 +284,19 @@ project('spring-amqp') {
|
||||
compile ("org.springframework:spring-messaging:$springVersion", optional)
|
||||
compile ("org.springframework:spring-oxm:$springVersion", optional)
|
||||
compile ("org.springframework:spring-context:$springVersion", optional)
|
||||
compile "org.springframework.retry:spring-retry:$springRetryVersion"
|
||||
compile ("org.springframework.retry:spring-retry:$springRetryVersion") {
|
||||
exclude group: 'org.springframework'
|
||||
}
|
||||
|
||||
compile ("com.fasterxml.jackson.core:jackson-core:$jackson2Version", optional)
|
||||
compile ("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional)
|
||||
compile ("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson2Version", optional)
|
||||
|
||||
// Spring Data projection message binding support
|
||||
compile ("org.springframework.data:spring-data-commons:$springDataCommonsVersion", optional)
|
||||
compile ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") {
|
||||
optional(it)
|
||||
exclude group: 'org.springframework'
|
||||
}
|
||||
compile ("com.jayway.jsonpath:json-path:$jaywayJsonPathVersion", optional)
|
||||
|
||||
testCompile "org.assertj:assertj-core:$assertjVersion"
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
2
gradlew
vendored
2
gradlew
vendored
@@ -7,7 +7,7 @@
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
||||
2
gradlew.bat
vendored
2
gradlew.bat
vendored
@@ -5,7 +5,7 @@
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem http://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
||||
Reference in New Issue
Block a user