Merge pull request #166 from yidongnan/javadoc-links

Add links to other public javadoc pages
grpc-ecosystem · Jan 4, 2019 · cb1a04f · cb1a04f
2 parents 9233c1e + 1ad3378
commit cb1a04f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,11 +15,10 @@ buildscript {
         grpcVersion = '1.17.1'
         protobufVersion = '3.6.1'
         protobufGradlePluginVersion = '0.8.7'
-        nettyTCNativeVersion = '2.0.17.Final'
+        nettyTCNativeVersion = '2.0.17.Final' // Needs to be compatbile with the 'grpcVersion'
 
-        springBootVersion = '2.0.6.RELEASE'
-        springSecurityVersion = '5.0.9.RELEASE'
-        springCloudVersion = 'Finchley.SR2'
+        springBootVersion = '2.0.7.RELEASE'
+        springCloudVersion = 'Finchley.SR2' // Only used in examples
         springCloudSleuthVersion = '2.0.2.RELEASE'
         springCloudConsulVersion = '2.0.1.RELEASE'
         springCloudEurekaVersion = '2.0.2.RELEASE'
@@ -147,6 +146,33 @@ allprojects {
     }
 }
 
+allprojects { project ->
+    if (!project.parent || project.parent.name != "examples") {
+        buildscript {
+            dependencyManagement {
+                imports {
+                    mavenBom "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
+                }
+            }
+
+            ext {
+                springFrameworkVersion = dependencyManagement.importedProperties['spring.version']
+                springSecurityVersion = dependencyManagement.importedProperties['spring-security.version']
+            }
+        }
+
+        tasks.withType(Javadoc) {
+            def links = [
+                    'https://docs.oracle.com/javase/8/docs/api/',
+                    'https://grpc.io/grpc-java/javadoc/',
+                    'https://docs.spring.io/spring-framework/docs/' + springFrameworkVersion + '/javadoc-api/',
+                    'https://docs.spring.io/spring-security/site/docs/' + springSecurityVersion + '/api/'
+            ]
+            options.setLinks(links)
+        }
+    }
+}
+
 apply from: './deploy.gradle'
 
 group = "net.devh"

diff --git a/grpc-client-spring-boot-autoconfigure/build.gradle b/grpc-client-spring-boot-autoconfigure/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-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}")
+    compile("org.springframework.boot:spring-boot-starter")
+    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
     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}")

diff --git a/grpc-common-spring-boot/build.gradle b/grpc-common-spring-boot/build.gradle
@@ -6,10 +6,10 @@ 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("org.springframework.boot:spring-boot-starter")
+    compileOnly("org.springframework.boot:spring-boot-starter-actuator")
     compile("io.grpc:grpc-core:${grpcVersion}")
 
     compileOnly("org.springframework.cloud:spring-cloud-starter-sleuth:${springCloudSleuthVersion}")

diff --git a/grpc-server-spring-boot-autoconfigure/build.gradle b/grpc-server-spring-boot-autoconfigure/build.gradle
@@ -6,14 +6,14 @@ 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}")
+    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:${springCloudSleuthVersion}")
     compileOnly("org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}")
     compileOnly("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${springCloudEurekaVersion}")

diff --git a/tests/build.gradle b/tests/build.gradle
@@ -74,9 +74,9 @@ dependencies {
     }
     testImplementation(
         "io.grpc:grpc-testing:${grpcVersion}",
-        "org.springframework.boot:spring-boot-starter-test:${springBootVersion}",
-        "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}",
-        "org.springframework.security:spring-security-config:${springSecurityVersion}",
+        "org.springframework.boot:spring-boot-starter-test",
+        "org.springframework.boot:spring-boot-starter-actuator",
+        "org.springframework.security:spring-security-config",
         "io.netty:netty-tcnative-boringssl-static:${nettyTCNativeVersion}",
         "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}"
     )