Fixing deps (#251)

2016-04-28 11:44:24 +02:00
parent 4e421b9935
commit 0a7f484655
13 changed files with 44 additions and 22 deletions
--- 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'
 }
--- 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'
 }
--- 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}"
 }
--- 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 {
--- 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
+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
--- 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}"
--- 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'
--- 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')
 	}
--- 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}"
--- 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}"
--- 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')
--- 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')
 	}
--- 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')