From b57f50a38a9efad7258a475b6a737d966eb84ca7 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Wed, 28 May 2025 12:17:34 +0100
Subject: [PATCH] Revert "Recent plugins do not require extra config"

---
 samples/grpc-client/pom.xml              | 1 +
 samples/grpc-oauth2/pom.xml              | 1 +
 samples/grpc-reactive/pom.xml            | 1 +
 samples/grpc-secure/pom.xml              | 1 +
 samples/grpc-server-kotlin/pom.xml       | 2 ++
 samples/grpc-server-netty-shaded/pom.xml | 1 +
 samples/grpc-server/pom.xml              | 1 +
 samples/grpc-tomcat-secure/pom.xml       | 1 +
 samples/grpc-tomcat/pom.xml              | 1 +
 samples/grpc-webflux/pom.xml             | 1 +
 10 files changed, 11 insertions(+)

diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml
index 1b87e2c..bc7786e 100644
--- a/samples/grpc-client/pom.xml
+++ b/samples/grpc-client/pom.xml
@@ -113,6 +113,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml
index 5c8e094..8872c22 100644
--- a/samples/grpc-oauth2/pom.xml
+++ b/samples/grpc-oauth2/pom.xml
@@ -124,6 +124,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml
index 9eebfcd..1d2a4a8 100644
--- a/samples/grpc-reactive/pom.xml
+++ b/samples/grpc-reactive/pom.xml
@@ -139,6 +139,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 					<jvmMavenPlugins>
diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml
index b0e230e..94b7261 100644
--- a/samples/grpc-secure/pom.xml
+++ b/samples/grpc-secure/pom.xml
@@ -117,6 +117,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml
index 559e66b..633063a 100644
--- a/samples/grpc-server-kotlin/pom.xml
+++ b/samples/grpc-server-kotlin/pom.xml
@@ -151,6 +151,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 					<jvmMavenPlugins>
@@ -161,6 +162,7 @@
 							<classifier>jdk8</classifier>
 							<type>jar</type>
 							<mainClass>io.grpc.kotlin.generator.GeneratorRunner</mainClass>
+							<options>jakarta_omit,@generated=omit</options>
 						</jvmMavenPlugin>
 					</jvmMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml
index f09e28c..1985bca 100644
--- a/samples/grpc-server-netty-shaded/pom.xml
+++ b/samples/grpc-server-netty-shaded/pom.xml
@@ -114,6 +114,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 4046f1c..30e6b22 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -120,6 +120,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml
index 12a4cac..cf56dc2 100644
--- a/samples/grpc-tomcat-secure/pom.xml
+++ b/samples/grpc-tomcat-secure/pom.xml
@@ -112,6 +112,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml
index 245c105..be708de 100644
--- a/samples/grpc-tomcat/pom.xml
+++ b/samples/grpc-tomcat/pom.xml
@@ -117,6 +117,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml
index e3653cc..d253f7f 100644
--- a/samples/grpc-webflux/pom.xml
+++ b/samples/grpc-webflux/pom.xml
@@ -112,6 +112,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
+							<options>jakarta_omit,@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>