Dependency upgrades (#249)

* Update dependencies * Update to Micronaut 2.1.4 / fix tests * Disable dependency udpates Co-authored-by: graemerocher <[email protected]>
micronaut-projects · Nov 19, 2020 · 26de8fa · 26de8fa
1 parent 836433f
commit 26de8fa
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,10 @@ subprojects { Project subproject ->
     tasks.withType(Test) {
         useJUnitPlatform()
     }        
+
+    dependencyUpdates.enabled = false
 }
 
 apply plugin: "io.micronaut.build.docs"
 apply plugin: "io.micronaut.build.dependency-updates"
+dependencyUpdates.enabled = false
diff --git a/examples/hello-world-groovy/build.gradle b/examples/hello-world-groovy/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compileOnly "io.micronaut:micronaut-inject-groovy"
     runtime "ch.qos.logback:logback-classic:1.2.3"
     testCompile "io.micronaut:micronaut-inject-groovy"
-    testCompile 'io.micronaut.test:micronaut-test-spock:2.1.1'
+    testCompile 'io.micronaut.test:micronaut-test-spock:2.2.1'
     testCompile("org.spockframework:spock-core") {
         exclude group: "org.codehaus.groovy", module: "groovy-all"
     }

diff --git a/examples/hello-world-java/build.gradle b/examples/hello-world-java/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "net.ltgt.apt-eclipse" version "0.18"
     id "net.ltgt.apt-idea" version "0.18"
 //   tag::plugin[]
-    id 'com.google.protobuf' version '0.8.13'
+    id 'com.google.protobuf' version '0.8.14'
 //   end::plugin[]
     id "application"
     id "java"

diff --git a/examples/hello-world-kotlin/build.gradle b/examples/hello-world-kotlin/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.kapt" version "1.3.72"
     id "org.jetbrains.kotlin.plugin.allopen" version "1.3.72"
     id "application"
-    id 'com.google.protobuf' version '0.8.13'
+    id 'com.google.protobuf' version '0.8.14'
 }
 
 version "0.2"

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 projectVersion=2.1.1.BUILD-SNAPSHOT
 micronautDocsVersion=1.0.24
 micronautBuildVersion=1.1.5
-micronautVersion=2.0.0
-micronautTestVersion=1.2.0
+micronautVersion=2.1.4
+micronautTestVersion=2.2.1
 groovyVersion=3.0.4
 spockVersion=2.0-M3-groovy-3.0
-protobufJavaVersion=3.13.0
-grpcVersion=1.32.2
-protocVersion=3.13.0
+protobufJavaVersion=3.14.0
+grpcVersion=1.33.1
+protocVersion=3.14.0
 
 title=Micronaut gRPC
 projectDesc=Integration between Micronaut and gRPC

diff --git a/grpc-client-runtime/build.gradle b/grpc-client-runtime/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "net.ltgt.apt" version "0.21"
-    id 'com.google.protobuf' version '0.8.13'
+    id 'com.google.protobuf' version '0.8.14'
 }
 dependencies {
 	annotationProcessor "io.micronaut:micronaut-inject-java:$micronautVersion"
@@ -12,18 +12,18 @@ dependencies {
     api "io.grpc:grpc-protobuf:$grpcVersion"
     api "io.grpc:grpc-stub:$grpcVersion"
     implementation "io.grpc:grpc-netty:$grpcVersion"
-    compileOnly "io.micronaut:micronaut-discovery-client:$micronautVersion"
+    compileOnly "io.micronaut.discovery:micronaut-discovery-client:2.2.0"
     compileOnly "io.micronaut:micronaut-tracing:$micronautVersion"
     compileOnly 'io.opentracing.contrib:opentracing-grpc:0.2.3'
 
-    testImplementation "io.micronaut:micronaut-discovery-client:$micronautVersion"
+    testImplementation "io.micronaut.discovery:micronaut-discovery-client:2.2.0"
     testImplementation 'io.opentracing:opentracing-mock:0.33.0'
     testImplementation "io.micronaut:micronaut-tracing:$micronautVersion"
     testImplementation 'io.opentracing.contrib:opentracing-grpc:0.2.3'
-    testImplementation 'io.jaegertracing:jaeger-core:1.4.0'
+    testImplementation 'io.jaegertracing:jaeger-core:1.5.0'
     testImplementation "io.micronaut:micronaut-inject-groovy:$micronautVersion"
     testImplementation "io.micronaut:micronaut-inject-java:$micronautVersion"
-    testImplementation 'io.micronaut.test:micronaut-test-spock:2.1.1'
+    testImplementation 'io.micronaut.test:micronaut-test-spock:2.2.1'
     testImplementation project(":grpc-server-runtime")
 }
 
@@ -52,7 +52,7 @@ sourceSets {
 protobuf {
     protoc { artifact = "com.google.protobuf:protoc:$protocVersion" }
     plugins {
-        grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.32.2" }
+        grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.33.1" }
     }
     generateProtoTasks {
         all()*.plugins { grpc {} }

diff --git a/...ent-runtime/src/main/java/io/micronaut/grpc/channels/GrpcManagedChannelConfiguration.java b/...ent-runtime/src/main/java/io/micronaut/grpc/channels/GrpcManagedChannelConfiguration.java
@@ -22,6 +22,7 @@
 import io.micronaut.core.naming.Named;
 
 import javax.annotation.Nullable;
+import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.Optional;
@@ -55,7 +56,13 @@ public GrpcManagedChannelConfiguration(String name, Environment env, ExecutorSer
         final Optional<SocketAddress> socketAddress = env.getProperty(PREFIX + '.' + name + SETTING_URL, SocketAddress.class);
         if (socketAddress.isPresent()) {
             resolveName = false;
-            this.channelBuilder = NettyChannelBuilder.forAddress(socketAddress.get());
+            SocketAddress serverAddress = socketAddress.get();
+            if (serverAddress instanceof InetSocketAddress) {
+                InetSocketAddress isa = (InetSocketAddress) serverAddress;
+                this.channelBuilder = NettyChannelBuilder.forAddress(isa.getHostName(), isa.getPort());
+            } else {
+                this.channelBuilder = NettyChannelBuilder.forAddress(serverAddress);
+            }
         } else {
             final Optional<String> target = env.getProperty(PREFIX + '.' + name + SETTING_TARGET, String.class);
             if (target.isPresent()) {

diff --git a/grpc-server-runtime/build.gradle b/grpc-server-runtime/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "net.ltgt.apt" version "0.21"
-    id 'com.google.protobuf' version '0.8.13'
+    id 'com.google.protobuf' version '0.8.14'
 }
 dependencies {
     annotationProcessor "io.micronaut:micronaut-inject-java:$micronautVersion"
@@ -12,19 +12,19 @@ dependencies {
     api "io.grpc:grpc-protobuf:$grpcVersion"
     api "io.grpc:grpc-stub:$grpcVersion"
 
-    compileOnly "io.micronaut:micronaut-discovery-client:$micronautVersion"
+    compileOnly "io.micronaut.discovery:micronaut-discovery-client:2.2.0"
     compileOnly "io.micronaut:micronaut-tracing:$micronautVersion"
     compileOnly "io.micronaut:micronaut-management"
     compileOnly 'io.opentracing.contrib:opentracing-grpc:0.2.3'
 
-    testImplementation "io.micronaut:micronaut-discovery-client:$micronautVersion"
+    testImplementation "io.micronaut.discovery:micronaut-discovery-client:2.2.0"
     testImplementation 'io.opentracing:opentracing-mock:0.33.0'
     testImplementation "io.micronaut:micronaut-tracing:$micronautVersion"
     testImplementation 'io.opentracing.contrib:opentracing-grpc:0.2.3'
-    testImplementation 'io.jaegertracing:jaeger-core:1.4.0'
+    testImplementation 'io.jaegertracing:jaeger-core:1.5.0'
     testImplementation "io.micronaut:micronaut-inject-groovy:$micronautVersion"
     testImplementation "io.micronaut:micronaut-inject-java:$micronautVersion"
-    testImplementation 'io.micronaut.test:micronaut-test-spock:2.1.1'
+    testImplementation 'io.micronaut.test:micronaut-test-spock:2.2.1'
     testImplementation "io.micronaut:micronaut-management"
     testImplementation project(":grpc-client-runtime")
 
@@ -57,7 +57,7 @@ sourceSets {
 protobuf {
     protoc { artifact = "com.google.protobuf:protoc:$protocVersion" }
     plugins {
-        grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.32.2" }
+        grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.33.1" }
     }
     generateProtoTasks {
         all()*.plugins { grpc {} }

diff --git a/protobuff-support/build.gradle b/protobuff-support/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "net.ltgt.apt-eclipse" version "0.21"
     id "net.ltgt.apt-idea" version "0.21"
-    id "com.google.protobuf" version "0.8.13"
+    id "com.google.protobuf" version "0.8.14"
 }
 
 dependencies {
@@ -20,7 +20,7 @@ dependencies {
     testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
     testImplementation "io.micronaut:micronaut-inject-groovy:$micronautVersion"
     testImplementation "io.micronaut:micronaut-inject-java:$micronautVersion"
-    testImplementation "io.micronaut.test:micronaut-test-spock:2.1.1"
+    testImplementation "io.micronaut.test:micronaut-test-spock:2.2.1"
     testImplementation "com.hubspot.jackson:jackson-datatype-protobuf:0.9.12"
 }