From 07d3db96a81e51e47f1b943d11af1dd54fefc2a4 Mon Sep 17 00:00:00 2001
From: Ron Sigal <rsigal@localhost.localdomain>
Date: Sat, 8 Feb 2025 07:39:34 -0500
Subject: [PATCH] Organized versions in POMs; upgraded version.io.grpc; fixed
 some @AfterClass methods

---
 grpc-bom/pom.xml                                      |  7 +------
 grpc-bridge-runtime/pom.xml                           |  4 ++--
 grpc-test-bom/pom.xml                                 |  4 +---
 pom.xml                                               |  5 ++---
 testsuite/grpc-tests/pom.xml                          | 11 +++++++----
 .../resteasy/test/grpc/GrpcListsAndSetsTest.java      |  4 +++-
 .../test/grpc/GrpcToJakartaRESTOneWaySslTest.java     |  4 +++-
 .../resteasy/test/grpc/GrpcToJakartaRESTTest.java     |  4 +++-
 .../test/grpc/GrpcToJakartaRESTTwoWaySslTest.java     |  4 +++-
 9 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/grpc-bom/pom.xml b/grpc-bom/pom.xml
index 7e00eb19..c569cfa7 100644
--- a/grpc-bom/pom.xml
+++ b/grpc-bom/pom.xml
@@ -30,10 +30,6 @@
 
     <artifactId>resteasy-grpc-bom</artifactId>
     <packaging>pom</packaging>
-    
-    <properties>
-		<protoc-gen-grpc-java.version>1.51.1</protoc-gen-grpc-java.version>
-	</properties>
 
     <dependencyManagement>
         <dependencies>
@@ -89,7 +85,7 @@
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>protoc-gen-grpc-java</artifactId>
-                <version>${protoc-gen-grpc-java.version}</version>
+                <version>${version.io.grpc}</version>
                 <type>pom</type>
             </dependency>
 
@@ -142,5 +138,4 @@
         </dependencies>
     </dependencyManagement>
 
-
 </project>
\ No newline at end of file
diff --git a/grpc-bridge-runtime/pom.xml b/grpc-bridge-runtime/pom.xml
index c9054429..97bbd62b 100644
--- a/grpc-bridge-runtime/pom.xml
+++ b/grpc-bridge-runtime/pom.xml
@@ -95,9 +95,9 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.6.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.21.7:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${version.com.google.protobuf}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.1:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${version.io.grpc}:exe:${os.detected.classifier}</pluginArtifact>
                     <protoSourceRoot>src/main/proto</protoSourceRoot>
                     <clearOutputDirectory>true</clearOutputDirectory>
                 </configuration>
diff --git a/grpc-test-bom/pom.xml b/grpc-test-bom/pom.xml
index 1780703b..5b57efe3 100644
--- a/grpc-test-bom/pom.xml
+++ b/grpc-test-bom/pom.xml
@@ -32,8 +32,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <version.io.grpc>1.54.1</version.io.grpc>
-        <protoc-gen-grpc-java.version>1.51.1</protoc-gen-grpc-java.version>
         <version.org.jboss.arquillian>1.7.2.Final</version.org.jboss.arquillian>
         <version.org.wildfly.arquillian.wildfly-arquillian>5.0.1.Final</version.org.wildfly.arquillian.wildfly-arquillian>
     </properties>
@@ -72,7 +70,7 @@
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>protoc-gen-grpc-java</artifactId>
-                <version>${protoc-gen-grpc-java.version}</version>
+                <version>${version.io.grpc}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
diff --git a/pom.xml b/pom.xml
index 029a519d..6a872f02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,9 +72,8 @@
         <version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
 
         <version.com.github.javaparser>3.18.0</version.com.github.javaparser>
-        <version.com.google.protobuf>3.22.3</version.com.google.protobuf>
-        
-        <protoc-gen-grpc-java.version>1.51.1</protoc-gen-grpc-java.version>
+        <version.com.google.protobuf>3.21.7</version.com.google.protobuf>
+        <version.io.grpc>1.70.0</version.io.grpc>
 
         <version.io.undertow>2.3.10.Final</version.io.undertow>
 
diff --git a/testsuite/grpc-tests/pom.xml b/testsuite/grpc-tests/pom.xml
index 37a0fbc5..6a6632e8 100644
--- a/testsuite/grpc-tests/pom.xml
+++ b/testsuite/grpc-tests/pom.xml
@@ -9,6 +9,10 @@
         <version>1.0.0.Alpha6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    
+    <artifactId>grpc-tests</artifactId>
+    <name>RESTEasy Main testsuite: gRPC tests</name>
+    
     <properties>
         <maven.compiler.parameters>true</maven.compiler.parameters>
         <maven.compiler.source>11</maven.compiler.source>
@@ -36,8 +40,7 @@
         <root.package>dev.resteasy.grpc.example</root.package>
         <servlet.name>GrpcServlet</servlet.name>
     </properties>
-    <artifactId>grpc-tests</artifactId>
-    <name>RESTEasy Main testsuite: gRPC tests</name>
+
     <profiles>
         <!--
         Name:  download
@@ -459,9 +462,9 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.6.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.21.7:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${version.com.google.protobuf}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.1:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${version.io.grpc}:exe:${os.detected.classifier}</pluginArtifact>
                     <protoSourceRoot>src/main/proto</protoSourceRoot>
                     <clearOutputDirectory>true</clearOutputDirectory>
                     <!--includes>${project.basedir}/src/main/proto/**/*</includes-->
diff --git a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcListsAndSetsTest.java b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcListsAndSetsTest.java
index 66604184..95ded00b 100644
--- a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcListsAndSetsTest.java
+++ b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcListsAndSetsTest.java
@@ -182,7 +182,9 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void afterClass() throws InterruptedException {
-        channelPlaintext.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        if (channelPlaintext != null) {
+            channelPlaintext.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        }
     }
 
     static void accessServletContexts() {
diff --git a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTOneWaySslTest.java b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTOneWaySslTest.java
index 1204ff36..4419d3e5 100644
--- a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTOneWaySslTest.java
+++ b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTOneWaySslTest.java
@@ -157,7 +157,9 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void afterClass() throws InterruptedException {
-        channelSslOneway.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        if (channelSslOneway != null) {
+            channelSslOneway.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        }
     }
 
     @Test
diff --git a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTest.java b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTest.java
index 10783e64..0b7194a0 100644
--- a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTest.java
+++ b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTest.java
@@ -66,7 +66,9 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void afterClass() throws InterruptedException {
-        channelPlaintext.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        if (channelPlaintext != null) {
+            channelPlaintext.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        }
     }
 
     @Test
diff --git a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTwoWaySslTest.java b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTwoWaySslTest.java
index 4dbe23e5..17fd8221 100644
--- a/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTwoWaySslTest.java
+++ b/testsuite/grpc-tests/src/test/java/org/jboss/resteasy/test/grpc/GrpcToJakartaRESTTwoWaySslTest.java
@@ -166,7 +166,9 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void afterClass() throws InterruptedException {
-        channelSslTwoway.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        if (channelSslTwoway != null) {
+            channelSslTwoway.shutdownNow().awaitTermination(5, TimeUnit.SECONDS);
+        }
     }
 
     @Test