grpcVersion = '1.21.0' + test fixes

Author: Alexander Furer

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         springBoot_1_X_Version = '1.5.13.RELEASE'
         springBoot_2_X_Version = '2.1.3.RELEASE'
-        grpcVersion = '1.20.0'
+        grpcVersion = '1.21.0'
     }
     repositories {
         mavenCentral()

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/CalculatorGrpc.java

@@ -10,7 +10,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.20.0)",
+    value = "by gRPC proto compiler (version 1.21.0)",
     comments = "Source: calculator.proto")
 public final class CalculatorGrpc {
 

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java

@@ -13,7 +13,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.20.0)",
+    value = "by gRPC proto compiler (version 1.21.0)",
     comments = "Source: greeter.proto")
 public final class GreeterGrpc {
 

grpc-spring-boot-starter/build.gradle

@@ -97,8 +97,7 @@ dependencies {
 
     compileOnly("org.springframework.boot:spring-boot-configuration-processor:${springBoot_1_X_Version}")
 
-    compileOnly group: 'org.springframework.cloud', name: 'spring-cloud-consul-discovery', version: '2.1.1.RELEASE'
-    compileOnly group: 'org.springframework.cloud', name: 'spring-cloud-starter-consul', version: '2.1.1.RELEASE'
+    compileOnly group: 'org.springframework.cloud', name: 'spring-cloud-starter-consul-discovery', version: '2.1.1.RELEASE'
 
 
 }

grpc-spring-boot2-starter-demo/build.gradle

@@ -13,19 +13,19 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 
-//project.sourceSets.test{
-//    java{
-//        srcDir "${project(':grpc-spring-boot-starter-demo').getProjectDir()}/src/test/java"
-//    }
-//}
+project.sourceSets.test{
+    java{
+        srcDir "${project(':grpc-spring-boot-starter-demo').getProjectDir()}/src/test/java"
+    }
+}
 ext {
 	set('springCloudVersion', "Greenwich.SR1")
 }
 dependencies {
 
     testCompile project(':grpc-spring-boot-starter-demo')
 
-	testCompile project(':grpc-spring-boot-starter-demo').sourceSets.test.output
+	//testCompile project(':grpc-spring-boot-starter-demo').sourceSets.test.output
 
 
 	testCompile('org.springframework.boot:spring-boot-starter-test')

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConsulRegistrationTest.java

@@ -26,7 +26,9 @@
 
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = DemoApp.class, properties = {"spring.cloud.config.enabled:false"})
+@SpringBootTest(classes = DemoApp.class, properties = {"spring.cloud.config.enabled:false",
+        "spring.cloud.consul.discovery.enabled=true",
+        "spring.cloud.service-registry.auto-registration.enabled=true"})
 
 public class ConsulRegistrationTest {
     @ClassRule

grpc-spring-boot2-starter-demo/src/test/resources/application.properties

@@ -2,3 +2,5 @@ management.endpoints.web.base-path=/
 management.endpoints.web.exposure.include=*
 spring.main.allow-bean-definition-overriding=true
 spring.jmx.enabled=false
+spring.cloud.consul.discovery.enabled=false
+spring.cloud.service-registry.auto-registration.enabled=false