From 0a7f484655917c34ebb30e2dcde71802a97d5663 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 28 Apr 2016 11:44:24 +0200 Subject: [PATCH] Fixing deps (#251) --- .../accurest-messaging-camel/build.gradle | 2 +- .../accurest-messaging-integration/build.gradle | 2 +- .../accurest-messaging-stream/build.gradle | 4 ++-- build.gradle | 14 ++++++++++++++ gradle.properties | 7 ++++++- samples/messaging-camel/build.gradle | 6 +++--- samples/messaging-spring/build.gradle | 2 +- samples/messaging-stream/build.gradle | 4 ++-- .../stub-runner-messaging-camel/build.gradle | 7 ++++--- .../stub-runner-messaging-integration/build.gradle | 2 +- .../stub-runner-messaging-stream/build.gradle | 6 ++++-- stub-runner/stub-runner-spring-cloud/build.gradle | 8 ++++---- stub-runner/stub-runner-spring/build.gradle | 2 +- 13 files changed, 44 insertions(+), 22 deletions(-) diff --git a/accurest-messaging/accurest-messaging-camel/build.gradle b/accurest-messaging/accurest-messaging-camel/build.gradle index 5d9f3d0e8a..f43e73d0b4 100644 --- a/accurest-messaging/accurest-messaging-camel/build.gradle +++ b/accurest-messaging/accurest-messaging-camel/build.gradle @@ -11,6 +11,6 @@ repositories { dependencies { compile project(':accurest-messaging-root:accurest-messaging-core') - compile 'org.apache.camel:camel-spring:2.9.0' + compile "org.apache.camel:camel-spring:${camelVersion}" compile 'org.slf4j:slf4j-api:1.6.0' } \ No newline at end of file diff --git a/accurest-messaging/accurest-messaging-integration/build.gradle b/accurest-messaging/accurest-messaging-integration/build.gradle index 11d8395096..f2ed07c88c 100644 --- a/accurest-messaging/accurest-messaging-integration/build.gradle +++ b/accurest-messaging/accurest-messaging-integration/build.gradle @@ -11,6 +11,6 @@ repositories { dependencies { compile project(':accurest-messaging-root:accurest-messaging-core') - compile 'org.springframework:spring-messaging:4.2.5.RELEASE' + compile "org.springframework:spring-messaging:${springVersion}" compile 'org.slf4j:slf4j-api:1.6.0' } \ No newline at end of file diff --git a/accurest-messaging/accurest-messaging-stream/build.gradle b/accurest-messaging/accurest-messaging-stream/build.gradle index 2b54f7ba96..4f8c9c7344 100644 --- a/accurest-messaging/accurest-messaging-stream/build.gradle +++ b/accurest-messaging/accurest-messaging-stream/build.gradle @@ -11,7 +11,7 @@ repositories { dependencies { compile project(':accurest-messaging-root:accurest-messaging-core') - compile 'org.springframework.cloud:spring-cloud-stream:1.0.0.RC2' + compile "org.springframework.cloud:spring-cloud-stream:${springStreamVersion}" // for MessageCollector - compile 'org.springframework.cloud:spring-cloud-stream-test-support:1.0.0.RC2' + compile "org.springframework.cloud:spring-cloud-stream-test-support:${springStreamVersion}" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index f1c73c4719..73d3214e83 100644 --- a/build.gradle +++ b/build.gradle @@ -185,6 +185,20 @@ project(':accurest-gradle-plugin') { uploadArchives.dependsOn { funcTest } } +configurations { + all { + resolutionStrategy { + eachDependency { DependencyResolveDetails details -> + // To prevent an accidental usage of groovy-all.jar and groovy.jar in different versions + // all modularized Groovy jars are replaced with groovy-all.jar by default. + if (details.requested.group == 'org.codehaus.groovy' && details.requested.name != "groovy-all") { + details.useTarget("org.codehaus.groovy:groovy-all:${details.requested.version}") + } + } + } + } +} + // REMOVE AFTER https://issues.gradle.org/browse/GRADLE-3433 IS FIXED buildscript { repositories { diff --git a/gradle.properties b/gradle.properties index 7181615caf..bcac24ddd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,9 @@ wiremockVersion = 2.0.10-beta jsonassertVersion = 0.2.2 BOM_VERSION=Brixton-1.0.0.RC1 -springBootVersion=1.3.3.RELEASE \ No newline at end of file +springBootVersion=1.3.3.RELEASE +springVersion=4.2.5.RELEASE +springIntegrationDslVersion=1.1.2.RELEASE +springStreamVersion=1.0.0.RC2 +springCloudVersion=1.1.0.RC2 +camelVersion=2.17.0 \ No newline at end of file diff --git a/samples/messaging-camel/build.gradle b/samples/messaging-camel/build.gradle index 3484906ce6..f358dbffd4 100644 --- a/samples/messaging-camel/build.gradle +++ b/samples/messaging-camel/build.gradle @@ -12,11 +12,11 @@ repositories { dependencies { compile project(':accurest-core') compile "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}" - compile 'org.apache.camel:camel-spring-boot-starter:2.17.0' - compile 'org.apache.camel:camel-jms:2.17.0' + compile "org.apache.camel:camel-spring-boot-starter:${camelVersion}" + compile "org.apache.camel:camel-jms:${camelVersion}" compile 'org.apache.activemq:activemq-camel:5.12.1' compile 'org.apache.activemq:activemq-pool:5.12.1' - compile 'org.apache.camel:camel-jackson:2.17.0' + compile "org.apache.camel:camel-jackson:${camelVersion}" testCompile project(':accurest-messaging-root:accurest-messaging-camel') testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" diff --git a/samples/messaging-spring/build.gradle b/samples/messaging-spring/build.gradle index e1bb4de06e..c38355e1cf 100644 --- a/samples/messaging-spring/build.gradle +++ b/samples/messaging-spring/build.gradle @@ -12,7 +12,7 @@ repositories { dependencies { compile project(':accurest-core') compile "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}" - compile 'org.springframework:spring-jms:4.2.3.RELEASE' + compile "org.springframework:spring-jms:${springVersion}" compile 'org.apache.activemq:activemq-broker:5.12.1' compile 'org.apache.activemq:activemq-pool:5.12.1' diff --git a/samples/messaging-stream/build.gradle b/samples/messaging-stream/build.gradle index 5f94330b61..54779d6866 100644 --- a/samples/messaging-stream/build.gradle +++ b/samples/messaging-stream/build.gradle @@ -12,10 +12,10 @@ repositories { dependencies { compile project(':accurest-core') compile "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}" - compile 'org.springframework.cloud:spring-cloud-stream-binder-rabbit:1.0.0.RC2' + compile "org.springframework.cloud:spring-cloud-stream-binder-rabbit:${springStreamVersion}" testCompile project(':accurest-messaging-root:accurest-messaging-stream') - testCompile 'org.springframework.cloud:spring-cloud-stream-test-support:1.0.0.RC2' + testCompile "org.springframework.cloud:spring-cloud-stream-test-support:${springStreamVersion}" testCompile('org.spockframework:spock-spring:1.0-groovy-2.4') { exclude(group: 'org.codehaus.groovy') } diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/build.gradle b/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/build.gradle index d2c9ee5d07..0c284fdd5b 100644 --- a/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/build.gradle +++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/build.gradle @@ -12,10 +12,11 @@ repositories { dependencies { compile project(':stub-runner-root:stub-runner-spring') compile project(':accurest-messaging-root:accurest-messaging-camel') - compile 'org.apache.camel:camel-spring-boot-starter:2.17.0' - compile 'org.apache.camel:camel-jackson:2.17.0' + compile "org.apache.camel:camel-spring-boot-starter:${camelVersion}" + compile "org.apache.camel:camel-jackson:${camelVersion}" - testCompile 'org.apache.camel:camel-jms:2.17.0' + testCompile "org.springframework:spring-beans:${springVersion}" + testCompile "org.apache.camel:camel-jms:${camelVersion}" testCompile 'org.apache.activemq:activemq-camel:5.12.1' testCompile 'org.apache.activemq:activemq-pool:5.12.1' testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/build.gradle b/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/build.gradle index 63718ffa16..f8b8a8277d 100644 --- a/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/build.gradle +++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/build.gradle @@ -12,7 +12,7 @@ repositories { dependencies { compile project(':stub-runner-root:stub-runner-spring') compile project(':accurest-messaging-root:accurest-messaging-integration') - compile 'org.springframework.integration:spring-integration-java-dsl:1.1.2.RELEASE' + compile "org.springframework.integration:spring-integration-java-dsl:${springIntegrationDslVersion}" compile 'com.fasterxml.jackson.core:jackson-databind:2.7.0' testCompile "org.springframework.boot:spring-boot-starter-integration:${springBootVersion}" diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/build.gradle b/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/build.gradle index bedc78b2dc..6886c2201d 100644 --- a/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/build.gradle +++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/build.gradle @@ -13,9 +13,11 @@ dependencies { compile project(':stub-runner-root:stub-runner-spring') compile project(':stub-runner-root:stub-runner-messaging-root:stub-runner-messaging-integration') compile project(':accurest-messaging-root:accurest-messaging-stream') - compile 'org.springframework.integration:spring-integration-java-dsl:1.1.2.RELEASE' + compile "org.springframework.integration:spring-integration-java-dsl:${springIntegrationDslVersion}" - testCompile 'org.springframework.cloud:spring-cloud-stream-test-support:1.0.0.RC2' + testCompile "org.springframework:spring-context:${springVersion}" + testCompile "org.springframework:spring-beans:${springVersion}" + testCompile "org.springframework.cloud:spring-cloud-stream-test-support:${springStreamVersion}" testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" testCompile('org.spockframework:spock-spring:1.0-groovy-2.4') { exclude(group: 'org.codehaus.groovy') diff --git a/stub-runner/stub-runner-spring-cloud/build.gradle b/stub-runner/stub-runner-spring-cloud/build.gradle index 08e64bfd9c..7e3bc4a9a2 100644 --- a/stub-runner/stub-runner-spring-cloud/build.gradle +++ b/stub-runner/stub-runner-spring-cloud/build.gradle @@ -3,19 +3,19 @@ dependencies { compile localGroovy() // TODO: should be compile only - compile 'org.springframework.cloud:spring-cloud-starter:1.1.0.RC2' - compile 'org.springframework.cloud:spring-cloud-starter-ribbon:1.1.0.RC1' + compile "org.springframework.cloud:spring-cloud-starter:${springCloudVersion}" + compile "org.springframework.cloud:spring-cloud-starter-ribbon:${springCloudVersion}" testCompile('org.spockframework:spock-core:1.0-groovy-2.4') { exclude(group: 'org.codehaus.groovy') } testCompile 'cglib:cglib-nodep:2.2' testCompile 'org.objenesis:objenesis:2.1' - testCompile 'org.springframework.cloud:spring-cloud-starter-zookeeper-discovery:1.0.0.RC1' + testCompile 'org.springframework.cloud:spring-cloud-starter-zookeeper-discovery:1.0.0.RC2' testCompile 'org.apache.curator:curator-test:2.9.1' testCompile 'io.reactivex:rxjava:1.1.1' testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" - testCompile "org.springframework:spring-web:4.2.5.RELEASE" + testCompile "org.springframework:spring-web:${springVersion}" testCompile('org.spockframework:spock-spring:1.0-groovy-2.4') { exclude(group: 'org.codehaus.groovy') } diff --git a/stub-runner/stub-runner-spring/build.gradle b/stub-runner/stub-runner-spring/build.gradle index 9bb990e658..acb0432826 100644 --- a/stub-runner/stub-runner-spring/build.gradle +++ b/stub-runner/stub-runner-spring/build.gradle @@ -4,7 +4,7 @@ dependencies { compile project(':stub-runner-root:stub-runner') compile localGroovy() - compile 'org.springframework:spring-context:3.0.0.RELEASE' + compile "org.springframework:spring-context:${springVersion}" testCompile('org.spockframework:spock-core:1.0-groovy-2.4') { exclude(group: 'org.codehaus.groovy')