Merge pull request #46 from yidongnan/1.2.0

RELEASE 1.2.0

Author: yidongnan

README-zh.md

@@ -28,15 +28,15 @@ Java技术交流群：294712648 <a target="_blank" href="http://shang.qq.com/wpa
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-server-spring-boot-starter</artifactId>
-  <version>1.1.1.RELEASE</version>
+  <version>1.2.0.RELEASE</version>
 </dependency>
 ````
 
 添加依赖如果使用的是Gradle
 
 ````
 dependencies {
-  compile 'net.devh:grpc-server-spring-boot-starter:1.1.1.RELEASE'
+  compile 'net.devh:grpc-server-spring-boot-starter:1.2.0.RELEASE'
 }
 ````
 
@@ -70,15 +70,15 @@ grpc.server.host=
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-client-spring-boot-starter</artifactId>
-  <version>1.1.1.RELEASE</version>
+  <version>1.2.0.RELEASE</version>
 </dependency>
 ````
 
 添加依赖如果使用的是Gradle
 
 ````
 dependencies {
-  compile 'net.devh:grpc-client-spring-boot-starter:1.1.1.RELEASE'
+  compile 'net.devh:grpc-client-spring-boot-starter:1.2.0.RELEASE'
 }
 ````
 
@@ -109,6 +109,7 @@ grpc.client.(gRPC server name).port[0]=
 
 | Project Version  | gRPC-java Version  |
 | ---------------- | ------------------ |
+| 1.2.0.RELEASE    | 1.3.0              |
 | 1.1.1.RELEASE    | 1.2.0              |
 | 1.0.1.RELEASE    | 1.1.2              |
 | 1.0.0.RELEASE    | 1.0.3              |

README.md

@@ -28,15 +28,15 @@ To add a dependency using Maven, use the following:
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-server-spring-boot-starter</artifactId>
-  <version>1.1.1.RELEASE</version>
+  <version>1.2.0.RELEASE</version>
 </dependency>
 ````
 
 To add a dependency using Gradle:
 
 ````
 dependencies {
-  compile 'net.devh:grpc-server-spring-boot-starter:1.1.1.RELEASE'
+  compile 'net.devh:grpc-server-spring-boot-starter:1.2.0.RELEASE'
 }
 ````
 
@@ -61,15 +61,15 @@ To add a dependency using Maven, use the following:
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-client-spring-boot-starter</artifactId>
-  <version>1.1.1.RELEASE</version>
+  <version>1.2.0.RELEASE</version>
 </dependency>
 ````
 
 To add a dependency using Gradle:
 
 ````
 dependencies {
-  compile 'net.devh:grpc-client-spring-boot-starter:1.1.1.RELEASE'
+  compile 'net.devh:grpc-client-spring-boot-starter:1.2.0.RELEASE'
 }
 ````
 
@@ -107,6 +107,7 @@ grpc.client.(gRPC server name).port[0]=
 
 | Project Version  | gRPC-java Version  |
 | ---------------- | ------------------ |
+| 1.2.0.RELEASE    | 1.3.0              |
 | 1.1.1.RELEASE    | 1.2.0              |
 | 1.0.1.RELEASE    | 1.1.2              |
 | 1.0.0.RELEASE    | 1.0.3              |

build.gradle

@@ -7,20 +7,21 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     ext {
-        projectVersion = '1.1.1.RELEASE'
+        projectVersion = '1.2.0.RELEASE'
 
-        grpcVersion = '1.2.0'
+        grpcVersion = '1.3.0'
         protobufVersion = '3.2.0'
         protobufGradlePluginVersion = '0.8.0'
 
-        springBootVersion = '1.4.5.RELEASE'
-        springSleuthVersion = '1.1.3.RELEASE'
-        springCloudVersion = 'Camden.SR6'
-        springCloudConsulVersion = '1.1.3.RELEASE'
-        springCloudEurekaVersion = '1.2.6.RELEASE'
+        springBootVersion = '1.5.2.RELEASE'
+        springSleuthVersion = '1.2.0.RELEASE'
+        springCloudVersion = 'Dalston.RELEASE'
+        springCloudConsulVersion = '1.2.0.RELEASE'
+        springCloudEurekaVersion = '1.3.0.RELEASE'
     }
     dependencies {
         classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
     }
 }
 
@@ -34,8 +35,8 @@ allprojects {
     apply plugin: "io.spring.dependency-management"
 
     compileJava {
-        sourceCompatibility = JavaVersion.VERSION_1_7
-        targetCompatibility = JavaVersion.VERSION_1_7
+        sourceCompatibility = JavaVersion.VERSION_1_6
+        targetCompatibility = JavaVersion.VERSION_1_6
         options.encoding = 'UTF-8'
     }
 

examples/README.md

@@ -23,14 +23,20 @@ visit http://localhost:8080/ can see result.
     ./gradlew :example:cloud-eureka-server:bootRun
     ````
 
-2. In a different terminal window run:
+2. Try the cloud-zipkin-server example first run:
 
     ````
-    ./gradlew :example:cloud-grpc-server:bootRun
+    ./gradlew :example:cloud-zipkin-server:bootRun
     ````
 
 3. In a different terminal window run:
 
+    ````
+    ./gradlew :example:cloud-grpc-server:bootRun
+    ````
+
+4. In a different terminal window run:
+
     ````
     ./gradlew :example:cloud-grpc-client:bootRun
     ````

examples/cloud-grpc-client/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'org.springframework.boot'
 dependencies {
     compile('org.springframework.cloud:spring-cloud-starter-eureka')
     compile('org.springframework.boot:spring-boot-starter-actuator')
+    compile('org.springframework.cloud:spring-cloud-starter-zipkin')
     compile project(':grpc-client-spring-boot-starter') // replace to compile("net.devh:grpc-client-spring-boot-starter:${springBootGrpcVersion}")
     compile project(':examples:grpc-lib')
 }

examples/cloud-grpc-client/src/main/resources/application.yml

@@ -3,6 +3,9 @@ server:
 spring:
   application:
     name: cloud-grpc-client
+  sleuth:
+    sampler:
+      percentage: 1
 eureka:
   client:
     register-with-eureka: true

examples/cloud-grpc-server/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'org.springframework.boot'
 dependencies {
     compile('org.springframework.cloud:spring-cloud-starter-eureka')
     compile('org.springframework.boot:spring-boot-starter-actuator')
+    compile('org.springframework.cloud:spring-cloud-starter-zipkin')
     compile project(':grpc-server-spring-boot-starter') // replace to compile("net.devh:grpc-server-spring-boot-starter:${springBootGrpcVersion}")
     compile project(':examples:grpc-lib')
 }

examples/cloud-grpc-server/src/main/resources/application.yml

@@ -1,6 +1,9 @@
 spring:
   application:
     name: cloud-grpc-server
+  sleuth:
+    sampler:
+      percentage: 1
 server:
   port: 0
 grpc:

examples/cloud-zipkin-server/build.gradle

@@ -0,0 +1,18 @@
+apply plugin: 'org.springframework.boot'
+
+dependencies {
+    compile('org.springframework.boot:spring-boot-starter')
+    compile('io.zipkin.java:zipkin-server')
+    compile('io.zipkin.java:zipkin-autoconfigure-ui')
+}
+
+buildscript {
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+    }
+    dependencyManagement {
+        imports {
+            mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+        }
+    }
+}

examples/cloud-zipkin-server/src/main/java/net/devh/examples/zipkin/ZipkinApplication.java

@@ -0,0 +1,20 @@
+package net.devh.examples.zipkin;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import zipkin.server.EnableZipkinServer;
+
+/**
+ * User: Michael
+ * Email: [email protected]
+ * Date: 17-5-14
+ */
+@SpringBootApplication
+@EnableZipkinServer
+public class ZipkinApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ZipkinApplication.class, args);
+    }
+}