From 29910f9f1ace0bef27e2427c16b8262c4e7f5d9c Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Sun, 20 Oct 2024 11:16:06 -0500
Subject: [PATCH 1/3] Clean up dependencies and versions

This commit does the following:

- Update various dependencies to latest patch versions
- Remove unused dependencies
- Remove unused version properties
- Remove Spring Boot references in all modules except autoconfigure
  and samples
---
 pom.xml                                       | 36 +++++++------
 samples/grpc-server/build.gradle              |  4 +-
 samples/grpc-server/pom.xml                   | 18 ++-----
 spring-grpc-core/pom.xml                      |  9 ++--
 spring-grpc-docs/pom.xml                      | 11 ++--
 spring-grpc-spring-boot-autoconfigure/pom.xml | 54 ++++++-------------
 spring-grpc-test/pom.xml                      | 14 +----
 7 files changed, 52 insertions(+), 94 deletions(-)

diff --git a/pom.xml b/pom.xml
index e81f4a03..3422ab58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,20 +74,15 @@
 		<maven.compiler.target>17</maven.compiler.target>
 
 		<!-- production dependencies -->
-		<spring-cloud-function-context.version>4.1.3</spring-cloud-function-context.version>
-		<spring-boot.version>3.3.3</spring-boot.version>
-		<spring-framework.version>6.1.4</spring-framework.version>
+		<spring-framework.version>6.1.14</spring-framework.version>
+		<netty.version>4.1.113.Final</netty.version>
+		<protobuf-java.version>3.25.5</protobuf-java.version>
+		<grpc.version>1.63.2</grpc.version>
 
-		<!-- Protobuf -->
-		<protobuf-java.version>3.25.2</protobuf-java.version>
-		<grpc.version>1.63.0</grpc.version>
-
-		<!-- testing dependencies -->
-		<httpclient5.version>5.3.1</httpclient5.version>
-
-		<!-- testing dependencies -->
-		<testcontainers.version>1.20.1</testcontainers.version>
-		<testcontainers.opensearch.version>2.0.1</testcontainers.opensearch.version>
+		<!-- internal dependencies -->
+		<spring-boot.version>3.3.4</spring-boot.version>
+		<jackson.version>2.17.2</jackson.version>
+		<junit.version>5.10.5</junit.version>
 
 		<!-- documentation dependencies -->
 		<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
@@ -382,9 +377,16 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring-boot.version}</version>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-framework-bom</artifactId>
+				<version>${spring-framework.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-bom</artifactId>
+				<version>${netty.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -463,4 +465,4 @@
 		</plugins>
 	</reporting>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle
index 14eed8d5..50870584 100644
--- a/samples/grpc-server/build.gradle
+++ b/samples/grpc-server/build.gradle
@@ -29,7 +29,7 @@ dependencyManagement {
 }
 
 dependencies {
-	implementation 'org.springframework.grpc:spring-grpc-spring-boot-autoconfigure:0.1.0-SNAPSHOT'
+	implementation 'org.springframework.grpc:spring-grpc-spring-boot-autoconfigure'
 	implementation 'io.grpc:grpc-services'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.grpc:spring-grpc-test'
@@ -55,4 +55,4 @@ protobuf {
             grpc {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 539b2939..38ab5ed6 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.3</version>
+		<version>3.3.4</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
@@ -30,22 +30,15 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>3.25.2</protobuf-java.version>
-		<grpc.version>1.63.0</grpc.version>
+		<protobuf-java.version>3.25.5</protobuf-java.version>
+		<grpc.version>1.63.2</grpc.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-bom</artifactId>
-				<version>0.1.0-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.grpc</groupId>
-				<artifactId>spring-grpc</artifactId>
-				<version>0.1.0-SNAPSHOT</version>
+				<version>${project.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -60,7 +53,6 @@
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-services</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -185,4 +177,4 @@
 	</pluginRepositories>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml
index d68cd271..53debb17 100644
--- a/spring-grpc-core/pom.xml
+++ b/spring-grpc-core/pom.xml
@@ -21,7 +21,6 @@
 	</scm>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -54,14 +53,14 @@
 			<version>1.3.2</version>
 		</dependency>
 
-		<!-- test dependencies -->
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-grpc-docs/pom.xml b/spring-grpc-docs/pom.xml
index 1e2171f4..7cc9f34f 100644
--- a/spring-grpc-docs/pom.xml
+++ b/spring-grpc-docs/pom.xml
@@ -20,17 +20,14 @@
 	<!-- Dependencies used to build the config props doc generator -->
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
+			<groupId>org.springframework.grpc</groupId>
+			<artifactId>spring-grpc-spring-boot-autoconfigure</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.grpc</groupId>
-			<artifactId>spring-grpc-spring-boot-autoconfigure</artifactId>
-			<version>${project.version}</version>
+			<version>${jackson.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/spring-grpc-spring-boot-autoconfigure/pom.xml b/spring-grpc-spring-boot-autoconfigure/pom.xml
index b224b897..0f5ca762 100644
--- a/spring-grpc-spring-boot-autoconfigure/pom.xml
+++ b/spring-grpc-spring-boot-autoconfigure/pom.xml
@@ -20,79 +20,59 @@
 		<developerConnection>git@github.com:spring-projects-experimental/spring-grpc.git</developerConnection>
 	</scm>
 
-	<dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring-boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
+	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.protobuf</groupId>
-			<artifactId>protobuf-java</artifactId>
-			<version>${protobuf-java.version}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- production dependencies -->
-
 		<dependency>
 			<groupId>org.springframework.grpc</groupId>
 			<artifactId>spring-grpc-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-netty-shaded</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.google.protobuf</groupId>
+			<artifactId>protobuf-java</artifactId>
+			<optional>true</optional>
+		</dependency>
 
 		<!-- test dependencies -->
-
 		<dependency>
 			<groupId>org.springframework.grpc</groupId>
 			<artifactId>spring-grpc-test</artifactId>
 			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-testcontainers</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.awaitility</groupId>
-			<artifactId>awaitility</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-observation-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/spring-grpc-test/pom.xml b/spring-grpc-test/pom.xml
index c914b89d..2dc642b8 100644
--- a/spring-grpc-test/pom.xml
+++ b/spring-grpc-test/pom.xml
@@ -26,7 +26,6 @@
 	</properties>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.springframework.grpc</groupId>
 			<artifactId>spring-grpc-core</artifactId>
@@ -36,16 +35,5 @@
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-testing</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.vaadin.external.google</groupId>
-					<artifactId>android-json</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

From b6b2fc37f97335e8cf00dc547056817253897d80 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Sun, 20 Oct 2024 11:57:37 -0500
Subject: [PATCH 2/3] Remove dependency on javax.annotation

This commit removes the directy dependency that was required
by the protoc compiler for our samples. The Maven and Gradle
now support an option to use an internal annotation which then
allows us to remove the deprecated javax.annotation dependency.

Background here: https://github.com/grpc/grpc-java/pull/10927
---
 samples/grpc-server/build.gradle |  6 ++++--
 samples/grpc-server/pom.xml      | 19 ++++++++++++-------
 spring-grpc-core/pom.xml         |  5 -----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle
index 50870584..91d4fcea 100644
--- a/samples/grpc-server/build.gradle
+++ b/samples/grpc-server/build.gradle
@@ -52,7 +52,9 @@ protobuf {
     }
     generateProtoTasks {
         all()*.plugins {
-            grpc {}
-        }
+            grpc {
+				option 'jakarta_omit'
+			}
+		}
     }
 }
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 38ab5ed6..1f51aadf 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -120,21 +120,26 @@
 				<groupId>org.xolstice.maven.plugins</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
 				<version>0.6.1</version>
+				<configuration>
+					<protocArtifact>
+						com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
+					<pluginId>grpc-java</pluginId>
+					<pluginArtifact>
+						io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+				</configuration>
 				<executions>
 					<execution>
+						<configuration>
+							<pluginParameter>
+								jakarta_omit
+							</pluginParameter>
+						</configuration>
 						<goals>
 							<goal>compile</goal>
 							<goal>compile-custom</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<protocArtifact>
-						com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
-					<pluginId>grpc-java</pluginId>
-					<pluginArtifact>
-						io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml
index 53debb17..6b6f6641 100644
--- a/spring-grpc-core/pom.xml
+++ b/spring-grpc-core/pom.xml
@@ -47,11 +47,6 @@
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-stub</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.3.2</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

From 195c610bdc5fd37f6ed24c2bddb37ea49c30b36a Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Sun, 20 Oct 2024 12:17:56 -0500
Subject: [PATCH 3/3] Exclude older protofuf lib from grpc lib

This commit excludes the older protobuf libs
`protobuf-java` and `proto-google-common-protos` from the
`grpc-protobuf` lib and then explicitly adds back in the
dependencies at the desired version in the root pom.xml
---
 pom.xml                                       |  8 +++++++-
 spring-grpc-core/pom.xml                      | 19 +++++++++++++++++++
 spring-grpc-spring-boot-autoconfigure/pom.xml |  5 -----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3422ab58..32623aea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,9 @@
 		<!-- production dependencies -->
 		<spring-framework.version>6.1.14</spring-framework.version>
 		<netty.version>4.1.113.Final</netty.version>
-		<protobuf-java.version>3.25.5</protobuf-java.version>
 		<grpc.version>1.63.2</grpc.version>
+		<protobuf-java.version>3.25.5</protobuf-java.version>
+		<google-common-protos.version>2.46.0</google-common-protos.version>
 
 		<!-- internal dependencies -->
 		<spring-boot.version>3.3.4</spring-boot.version>
@@ -404,6 +405,11 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.google.api.grpc</groupId>
+				<artifactId>proto-google-common-protos</artifactId>
+				<version>${google-common-protos.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml
index 6b6f6641..9cf5a9f0 100644
--- a/spring-grpc-core/pom.xml
+++ b/spring-grpc-core/pom.xml
@@ -42,7 +42,26 @@
 		<dependency>
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-protobuf</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.protobuf</groupId>
+					<artifactId>protobuf-java</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.api.grpc</groupId>
+					<artifactId>proto-google-common-protos</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.google.protobuf</groupId>
+			<artifactId>protobuf-java</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.api.grpc</groupId>
+			<artifactId>proto-google-common-protos</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-stub</artifactId>
diff --git a/spring-grpc-spring-boot-autoconfigure/pom.xml b/spring-grpc-spring-boot-autoconfigure/pom.xml
index 0f5ca762..4bf1c0f2 100644
--- a/spring-grpc-spring-boot-autoconfigure/pom.xml
+++ b/spring-grpc-spring-boot-autoconfigure/pom.xml
@@ -54,11 +54,6 @@
 			<artifactId>grpc-netty-shaded</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.google.protobuf</groupId>
-			<artifactId>protobuf-java</artifactId>
-			<optional>true</optional>
-		</dependency>
 
 		<!-- test dependencies -->
 		<dependency>