From 5c6a42b946bee3133fab16608bb183f0da81c670 Mon Sep 17 00:00:00 2001 From: Dean Wette Date: Fri, 29 Jul 2022 14:16:18 -0500 Subject: [PATCH 1/5] Remove deprecated code and prepare for Micronaut 4 --- gradle.properties | 6 +++--- .../grpc/server/GrpcServerBuilder.java | 10 ---------- .../grpc/server/GrpcServerConfiguration.java | 2 -- .../grpc/server/GrpcServerInstance.java | 19 ------------------- 4 files changed, 3 insertions(+), 34 deletions(-) diff --git a/gradle.properties b/gradle.properties index 479e891a4..0175b80cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -projectVersion=3.3.2-SNAPSHOT +projectVersion=4.0.0-SNAPSHOT projectGroup=io.micronaut.grpc micronautDocsVersion=2.0.0 -micronautVersion=3.4.4 +micronautVersion=4.0.0-SNAPSHOT micronautTestVersion=3.2.0 micronautGradlePluginVersion=3.4.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/src/main/java/io/micronaut/grpc/server/GrpcServerBuilder.java b/grpc-server-runtime/src/main/java/io/micronaut/grpc/server/GrpcServerBuilder.java index 001f41c03..1e7e0666c 100644 --- 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 index 51ca4c1b5..62b4f26c3 100644 --- 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 index 7ed3374dd..7e370f493 100644 --- 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 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 metadata, - @Nullable List metadataContributors) { - this(embeddedServer, id, uri, metadata, metadataContributors, null); - } - /** * Default constructor. * From 9c5c58351b0fb547f3016a7086859d74bef6b823 Mon Sep 17 00:00:00 2001 From: Dean Wette Date: Mon, 1 Aug 2022 16:40:49 -0500 Subject: [PATCH 2/5] Remove deprecated code and prepare for Micronaut 4 --- config/accepted-api-changes.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 config/accepted-api-changes.json diff --git a/config/accepted-api-changes.json b/config/accepted-api-changes.json new file mode 100644 index 000000000..1d45a470a --- /dev/null +++ b/config/accepted-api-changes.json @@ -0,0 +1,22 @@ +[ + { + "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" + } +] \ No newline at end of file From 25d9092a0220afca919ed290d566f54dab0a8734 Mon Sep 17 00:00:00 2001 From: Dean Wette Date: Tue, 2 Aug 2022 17:38:34 -0500 Subject: [PATCH 3/5] Remove deprecated code and prepare for Micronaut 4 --- config/accepted-api-changes.json | 22 ------------------- grpc-annotation/build.gradle | 5 +++++ grpc-client-runtime/build.gradle | 5 +++++ grpc-health/build.gradle | 5 +++++ grpc-opentracing/build.gradle | 5 +++++ grpc-runtime/build.gradle | 5 +++++ grpc-server-runtime/build.gradle | 5 +++++ .../config/accepted-api-changes.json | 20 +++++++++++++++++ protobuff-support/build.gradle | 5 +++++ test-suite-groovy/build.gradle | 2 ++ test-suite-java/build.gradle | 2 ++ test-suite-kotlin/build.gradle | 2 ++ 12 files changed, 61 insertions(+), 22 deletions(-) delete mode 100644 config/accepted-api-changes.json diff --git a/config/accepted-api-changes.json b/config/accepted-api-changes.json deleted file mode 100644 index 1d45a470a..000000000 --- a/config/accepted-api-changes.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "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" - } -] \ No newline at end of file diff --git a/grpc-annotation/build.gradle b/grpc-annotation/build.gradle index 20e6a40c9..cc6fe2b93 100644 --- a/grpc-annotation/build.gradle +++ b/grpc-annotation/build.gradle @@ -1,3 +1,8 @@ plugins { id 'io.micronaut.build.internal.grpc-module' } + +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} diff --git a/grpc-client-runtime/build.gradle b/grpc-client-runtime/build.gradle index 40b6ff285..c924f01c5 100644 --- a/grpc-client-runtime/build.gradle +++ b/grpc-client-runtime/build.gradle @@ -3,6 +3,11 @@ plugins { id 'com.google.protobuf' } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + dependencies { api project(":grpc-annotation") api project(":grpc-opentracing") diff --git a/grpc-health/build.gradle b/grpc-health/build.gradle index eeaaec5fd..da7ebf79b 100644 --- a/grpc-health/build.gradle +++ b/grpc-health/build.gradle @@ -3,6 +3,11 @@ plugins { id 'com.google.protobuf' } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + dependencies { api project(":grpc-annotation") api libs.micronaut.runtime diff --git a/grpc-opentracing/build.gradle b/grpc-opentracing/build.gradle index 45a6af792..4f448351f 100644 --- a/grpc-opentracing/build.gradle +++ b/grpc-opentracing/build.gradle @@ -3,6 +3,11 @@ plugins { id 'com.google.protobuf' } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + dependencies { api project(":grpc-annotation") api libs.micronaut.runtime diff --git a/grpc-runtime/build.gradle b/grpc-runtime/build.gradle index f21118a61..66b57d9c6 100644 --- a/grpc-runtime/build.gradle +++ b/grpc-runtime/build.gradle @@ -2,6 +2,11 @@ plugins { id 'io.micronaut.build.internal.grpc-module' } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + dependencies { api project(":grpc-client-runtime") api project(":grpc-server-runtime") diff --git a/grpc-server-runtime/build.gradle b/grpc-server-runtime/build.gradle index 88d06d8c3..ac89c9270 100644 --- a/grpc-server-runtime/build.gradle +++ b/grpc-server-runtime/build.gradle @@ -3,6 +3,11 @@ plugins { id 'com.google.protobuf' } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + dependencies { api project(":grpc-annotation") api project(":grpc-health") diff --git a/grpc-server-runtime/config/accepted-api-changes.json b/grpc-server-runtime/config/accepted-api-changes.json index d6ba2ca39..c4a6ab9cd 100644 --- 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" } ] \ No newline at end of file diff --git a/protobuff-support/build.gradle b/protobuff-support/build.gradle index 866b8e71e..e8a37518d 100644 --- a/protobuff-support/build.gradle +++ b/protobuff-support/build.gradle @@ -3,6 +3,11 @@ plugins { id 'com.google.protobuf' } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + dependencies { annotationProcessor libs.micronaut.validation diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle index 524a1f91d..9f9ed7120 100644 --- a/test-suite-groovy/build.gradle +++ b/test-suite-groovy/build.gradle @@ -6,8 +6,10 @@ plugins { repositories { mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } } + mainClassName = "helloworld.Application" micronaut { version micronautVersion diff --git a/test-suite-java/build.gradle b/test-suite-java/build.gradle index f33d197b0..42d7ceb27 100644 --- a/test-suite-java/build.gradle +++ b/test-suite-java/build.gradle @@ -8,8 +8,10 @@ plugins { repositories { mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } } + mainClassName = "helloworld.Application" micronaut { version micronautVersion diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle index 78bc6a806..3c417c924 100644 --- a/test-suite-kotlin/build.gradle +++ b/test-suite-kotlin/build.gradle @@ -14,8 +14,10 @@ ext { repositories { mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } } + java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 From 972debe3d313be4a5dbbf43194b54542584cbb2f Mon Sep 17 00:00:00 2001 From: Dean Wette Date: Mon, 22 Aug 2022 10:26:03 -0500 Subject: [PATCH 4/5] Remove deprecated code and prepare for Micronaut 4 --- build.gradle | 5 +++++ .../groovy/io.micronaut.build.internal.grpc-module.gradle | 5 +++++ grpc-annotation/build.gradle | 5 ----- grpc-client-runtime/build.gradle | 5 ----- grpc-health/build.gradle | 5 ----- grpc-opentracing/build.gradle | 5 ----- grpc-runtime/build.gradle | 5 ----- grpc-server-runtime/build.gradle | 5 ----- protobuff-support/build.gradle | 5 ----- 9 files changed, 10 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index cf34f01f0..f7a131989 100644 --- 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-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-module.gradle index 81243dea1..beae5c479 100644 --- 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,8 @@ plugins { id "io.micronaut.build.internal.module" } + +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} diff --git a/grpc-annotation/build.gradle b/grpc-annotation/build.gradle index cc6fe2b93..20e6a40c9 100644 --- a/grpc-annotation/build.gradle +++ b/grpc-annotation/build.gradle @@ -1,8 +1,3 @@ plugins { id 'io.micronaut.build.internal.grpc-module' } - -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} diff --git a/grpc-client-runtime/build.gradle b/grpc-client-runtime/build.gradle index c924f01c5..40b6ff285 100644 --- a/grpc-client-runtime/build.gradle +++ b/grpc-client-runtime/build.gradle @@ -3,11 +3,6 @@ plugins { id 'com.google.protobuf' } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - dependencies { api project(":grpc-annotation") api project(":grpc-opentracing") diff --git a/grpc-health/build.gradle b/grpc-health/build.gradle index da7ebf79b..eeaaec5fd 100644 --- a/grpc-health/build.gradle +++ b/grpc-health/build.gradle @@ -3,11 +3,6 @@ plugins { id 'com.google.protobuf' } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - dependencies { api project(":grpc-annotation") api libs.micronaut.runtime diff --git a/grpc-opentracing/build.gradle b/grpc-opentracing/build.gradle index 4f448351f..45a6af792 100644 --- a/grpc-opentracing/build.gradle +++ b/grpc-opentracing/build.gradle @@ -3,11 +3,6 @@ plugins { id 'com.google.protobuf' } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - dependencies { api project(":grpc-annotation") api libs.micronaut.runtime diff --git a/grpc-runtime/build.gradle b/grpc-runtime/build.gradle index 66b57d9c6..f21118a61 100644 --- a/grpc-runtime/build.gradle +++ b/grpc-runtime/build.gradle @@ -2,11 +2,6 @@ plugins { id 'io.micronaut.build.internal.grpc-module' } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - dependencies { api project(":grpc-client-runtime") api project(":grpc-server-runtime") diff --git a/grpc-server-runtime/build.gradle b/grpc-server-runtime/build.gradle index ac89c9270..88d06d8c3 100644 --- a/grpc-server-runtime/build.gradle +++ b/grpc-server-runtime/build.gradle @@ -3,11 +3,6 @@ plugins { id 'com.google.protobuf' } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - dependencies { api project(":grpc-annotation") api project(":grpc-health") diff --git a/protobuff-support/build.gradle b/protobuff-support/build.gradle index e8a37518d..866b8e71e 100644 --- a/protobuff-support/build.gradle +++ b/protobuff-support/build.gradle @@ -3,11 +3,6 @@ plugins { id 'com.google.protobuf' } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - dependencies { annotationProcessor libs.micronaut.validation From 71ebf0d030ec9bc455facd7f070100cfb33de816 Mon Sep 17 00:00:00 2001 From: Dean Wette Date: Thu, 1 Sep 2022 16:23:24 -0500 Subject: [PATCH 5/5] use buildSrc scripts to expose snapshot repos to avoid unnecessary duplication --- .../groovy/io.micronaut.build.internal.grpc-base.gradle | 4 ++++ .../groovy/io.micronaut.build.internal.grpc-module.gradle | 1 + .../groovy/io.micronaut.build.internal.grpc-tests.gradle | 3 +++ test-suite-groovy/build.gradle | 7 +------ test-suite-java/build.gradle | 7 +------ test-suite-kotlin/build.gradle | 7 +------ 6 files changed, 11 insertions(+), 18 deletions(-) create mode 100644 buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-base.gradle create mode 100644 buildSrc/src/main/groovy/io.micronaut.build.internal.grpc-tests.gradle 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 new file mode 100644 index 000000000..29ad2bbf4 --- /dev/null +++ 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 index beae5c479..0af1614d6 100644 --- 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,4 +1,5 @@ plugins { + id "io.micronaut.build.internal.grpc-base" id "io.micronaut.build.internal.module" } 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 new file mode 100644 index 000000000..7313453ad --- /dev/null +++ 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/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle index 9f9ed7120..7dc71efec 100644 --- a/test-suite-groovy/build.gradle +++ b/test-suite-groovy/build.gradle @@ -2,14 +2,9 @@ plugins { id 'groovy' id 'com.google.protobuf' id "io.micronaut.minimal.application" version "3.5.1" + id "io.micronaut.build.internal.grpc-tests" } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - - mainClassName = "helloworld.Application" micronaut { version micronautVersion diff --git a/test-suite-java/build.gradle b/test-suite-java/build.gradle index 42d7ceb27..4e82ed75c 100644 --- a/test-suite-java/build.gradle +++ b/test-suite-java/build.gradle @@ -4,14 +4,9 @@ plugins { id 'com.google.protobuf' // end::plugin[] id 'io.micronaut.application' + id "io.micronaut.build.internal.grpc-tests" } -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - - mainClassName = "helloworld.Application" micronaut { version micronautVersion diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle index 3c417c924..ccdd0bf48 100644 --- 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,12 +13,6 @@ ext { } // end::variables[] -repositories { - mavenCentral() - maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -} - - java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8