Use dependency manager to simplify dependency versions #166

grpc-ecosystem · Jan 3, 2019 · 57e0866 · yidongnan · Jan 3, 2019 · 57e0866
1 parent 9233c1e
commit 57e0866
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,11 +18,7 @@ buildscript {
         nettyTCNativeVersion = '2.0.17.Final'
 
         springBootVersion = '2.0.6.RELEASE'
-        springSecurityVersion = '5.0.9.RELEASE'
         springCloudVersion = 'Finchley.SR2'
-        springCloudSleuthVersion = '2.0.2.RELEASE'
-        springCloudConsulVersion = '2.0.1.RELEASE'
-        springCloudEurekaVersion = '2.0.2.RELEASE'
         braveInstrumentationGrpc = '5.5.0'
         jUnitVersion = '5.3.1'
 
@@ -57,7 +53,7 @@ allprojects {
     apply plugin: 'eclipse'
     apply plugin: "io.spring.dependency-management"
     apply plugin: 'com.diffplug.gradle.spotless'
-
+    
     compileJava {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -144,6 +140,18 @@ allprojects {
             maven { url 'http://repo.spring.io/plugins-release' }
             maven { url "https://plugins.gradle.org/m2/" }
         }
+
+        dependencyManagement {
+            imports {
+                mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+                mavenBom "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
+            }
+        }
+
+        ext {
+            springSecurityVersion = dependencyManagement.importedProperties['spring-security.version']
+            springFrameworkVersion = dependencyManagement.importedProperties['spring-framework.version']
+        }
     }
 }
 

diff --git a/grpc-client-spring-boot-autoconfigure/build.gradle b/grpc-client-spring-boot-autoconfigure/build.gradle
@@ -6,15 +6,15 @@ version = "${projectVersion}"
 compileJava.dependsOn(processResources)
 
 dependencies {
-    annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}")
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}")
+    annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
     compile project(':grpc-common-spring-boot')
-    compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
-    compileOnly("org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}")
-    compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth:${springCloudSleuthVersion}")
-    compileOnly("org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}")
-    compileOnly("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${springCloudEurekaVersion}")
+    compile("org.springframework.boot:spring-boot-starter")
+    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-consul-discovery")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client")
     compileOnly("io.zipkin.brave:brave-instrumentation-grpc:${braveInstrumentationGrpc}")
     compileOnly("javax.inject:javax.inject:1")
     compile("io.grpc:grpc-netty:${grpcVersion}")

diff --git a/grpc-common-spring-boot/build.gradle b/grpc-common-spring-boot/build.gradle
@@ -6,12 +6,12 @@ version = "${projectVersion}"
 compileJava.dependsOn(processResources)
 
 dependencies {
-    annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}")
+    annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
 
-    compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
-    compileOnly("org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}")
-    compile("io.grpc:grpc-core:${grpcVersion}")
+    compile("org.springframework.boot:spring-boot-starter")
+    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth")
 
-    compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth:${springCloudSleuthVersion}")
+    compile("io.grpc:grpc-core:${grpcVersion}")
     compileOnly("io.zipkin.brave:brave-instrumentation-grpc:${braveInstrumentationGrpc}")
 }
diff --git a/grpc-server-spring-boot-autoconfigure/build.gradle b/grpc-server-spring-boot-autoconfigure/build.gradle
@@ -6,17 +6,17 @@ version = "${projectVersion}"
 compileJava.dependsOn(processResources)
 
 dependencies {
-    annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}")
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}")
+    annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
     compile project(':grpc-common-spring-boot')
-    compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
-    compileOnly("org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}")
-    compileOnly("org.springframework.security:spring-security-core:${springSecurityVersion}")
-    compileOnly("org.springframework.security:spring-security-web:${springSecurityVersion}")
-    compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth:${springCloudSleuthVersion}")
-    compileOnly("org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}")
-    compileOnly("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${springCloudEurekaVersion}")
+    compile("org.springframework.boot:spring-boot-starter")
+    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
+    compileOnly("org.springframework.security:spring-security-core")
+    compileOnly("org.springframework.security:spring-security-web")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-consul-discovery")
+    compileOnly("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client")
     compileOnly("com.google.inject:guice:4.2.2") // Only needed to avoid some warnings during compilation (for eureka)
     compileOnly("io.zipkin.brave:brave-instrumentation-grpc:${braveInstrumentationGrpc}")
     compile("io.grpc:grpc-netty:${grpcVersion}")