ci: version to 4.0.0 Micronaut 4.0.0-SNAPSHOT githubCoreBranch=4.0.x …

…remove deprecations (#570)
micronaut-projects · Sep 6, 2022 · c7e8760 · c7e8760
1 parent 5fe129d
commit c7e8760
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 46 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,3 +3,8 @@ plugins {
     id "io.micronaut.build.internal.dependency-updates"
     id "io.micronaut.build.internal.quality-reporting"
 }
+
+repositories {
+    mavenCentral()
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+}
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-base.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-base.gradle
@@ -0,0 +1,4 @@
+repositories {
+    mavenCentral()
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+}
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-module.gradle
@@ -1,3 +1,9 @@
 plugins {
+    id "io.micronaut.build.internal.grpc-base"
     id "io.micronaut.build.internal.module"
 }
+
+repositories {
+    mavenCentral()
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+}
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-tests.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-tests.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id "io.micronaut.build.internal.grpc-base"
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
-projectVersion=3.4.0-SNAPSHOT
+projectVersion=4.0.0-SNAPSHOT
 projectGroup=io.micronaut.grpc
 micronautDocsVersion=2.0.0
-micronautVersion=3.5.4
+micronautVersion=4.0.0-SNAPSHOT
 micronautTestVersion=3.4.0
 
 micronautGradlePluginVersion=3.5.1
@@ -17,7 +17,7 @@ githubSlug=micronaut-projects/micronaut-grpc
 developers=Graeme Rocher
 
 githubBranch=master
-githubCoreBranch=3.5.x
+githubCoreBranch=4.0.x
 bomProperty=micronautGrpcVersion
 bomProperties=protobufJavaVersion,grpcVersion
 # For sonarqube

diff --git a/grpc-server-runtime/config/accepted-api-changes.json b/grpc-server-runtime/config/accepted-api-changes.json
@@ -323,5 +323,25 @@
     "type": "io.micronaut.grpc.server.tracing.GrpcServerTracingInterceptorFactory",
     "member": "Constructor io.micronaut.grpc.server.tracing.GrpcServerTracingInterceptorFactory()",
     "reason": "Not really a breaking change, just moving to the new module, where the server module has dependency on"
+  },
+  {
+    "type": "io.micronaut.grpc.server.GrpcServerBuilder",
+    "member": "Class io.micronaut.grpc.server.GrpcServerBuilder",
+    "reason": "removed deprecated constructor for Micronaut 4.0.x"
+  },
+  {
+    "type": "io.micronaut.grpc.server.GrpcServerBuilder",
+    "member": "Constructor io.micronaut.grpc.server.GrpcServerBuilder()",
+    "reason": "removed deprecated constructor for Micronaut 4.0.x"
+  },
+  {
+    "type": "io.micronaut.grpc.server.GrpcServerConfiguration",
+    "member": "Class io.micronaut.grpc.server.GrpcServerConfiguration",
+    "reason": "removed deprecated field for Micronaut 4.0.x"
+  },
+  {
+    "type": "io.micronaut.grpc.server.GrpcServerConfiguration",
+    "member": "Field HEALTH_ENABLED",
+    "reason": "removed deprecated field for Micronaut 4.0.x"
   }
 ]
diff --git a/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerBuilder.java b/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerBuilder.java
@@ -46,16 +46,6 @@ public class GrpcServerBuilder {
     @Nullable
     private final HealthStatusManagerContainer healthStatusManagerContainer;
 
-    /**
-     * Constructs the {@link ServerBuilder} instance.
-     *
-     * @deprecated Use {@link #GrpcServerBuilder(HealthStatusManagerContainer)} instead.
-     */
-    @Deprecated
-    public GrpcServerBuilder() {
-        this(null);
-    }
-
     /**
      * Constructs the {@link ServerBuilder} instance.
      *

diff --git a/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerConfiguration.java b/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerConfiguration.java
@@ -54,8 +54,6 @@ public class GrpcServerConfiguration {
     public static final String PORT = PREFIX + ".port";
     public static final String HOST = PREFIX + ".host";
     public static final String ENABLED = PREFIX + ".enabled";
-    @Deprecated
-    public static final String HEALTH_ENABLED = PREFIX + ".health.enabled";
     public static final int DEFAULT_PORT = 50051;
     public static final Duration DEFAULT_AWAIT_TERMINATION = Duration.ofSeconds(30);
 

diff --git a/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerInstance.java b/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerInstance.java
@@ -42,25 +42,6 @@ class GrpcServerInstance implements EmbeddedServerInstance {
     private final ConvertibleValues<String> metadata;
     private final EmbeddedServer embeddedServer;
 
-    /**
-     * Constructor.
-     *
-     * @param embeddedServer       The embedded server
-     * @param id                   The ID
-     * @param uri                  The URI
-     * @param metadata             The metadata
-     * @param metadataContributors The metadata contributors
-     */
-    @Deprecated
-    GrpcServerInstance(
-            EmbeddedServer embeddedServer,
-            String id,
-            URI uri,
-            @Nullable Map<String, String> metadata,
-            @Nullable List<ServiceInstanceMetadataContributor> metadataContributors) {
-        this(embeddedServer, id, uri, metadata, metadataContributors, null);
-    }
-
     /**
      * Default constructor.
      *

diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle
@@ -2,10 +2,7 @@ plugins {
     id 'groovy'
     id 'com.google.protobuf'
     id "io.micronaut.minimal.application" version "3.5.1"
-}
-
-repositories {
-    mavenCentral()
+    id "io.micronaut.build.internal.grpc-tests"
 }
 
 mainClassName = "helloworld.Application"

diff --git a/test-suite-java/build.gradle b/test-suite-java/build.gradle
@@ -4,10 +4,7 @@ plugins {
     id 'com.google.protobuf'
     // end::plugin[]
     id 'io.micronaut.application'
-}
-
-repositories {
-    mavenCentral()
+    id "io.micronaut.build.internal.grpc-tests"
 }
 
 mainClassName = "helloworld.Application"

diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle
@@ -4,6 +4,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.allopen" version "$kotlinVersion"
     id "io.micronaut.application"
     id "com.google.protobuf"
+    id "io.micronaut.build.internal.grpc-tests"
 }
 
 // tag::variables[]
@@ -12,10 +13,6 @@ ext {
 }
 // end::variables[]
 
-repositories {
-    mavenCentral()
-}
-
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8