Drop old 'jakarta_omit' option

breun · dsyer · commit 08ffc324365b · 2025-07-06T21:31:51.000+01:00
The 'jakarta_option' was only supported by a single grpc-java release and quickly replaced by '@generated=omit' Signed-off-by: Nils Breunese <nils@breun.nl>
diff --git a/samples/grpc-client/build.gradle b/samples/grpc-client/build.gradle
@@ -51,7 +51,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml
@@ -113,7 +113,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-oauth2/build.gradle b/samples/grpc-oauth2/build.gradle
@@ -61,7 +61,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml
@@ -124,7 +124,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-reactive/build.gradle b/samples/grpc-reactive/build.gradle
@@ -62,7 +62,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
             reactor {}
diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml
@@ -139,7 +139,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 					<jvmMavenPlugins>
diff --git a/samples/grpc-secure/build.gradle b/samples/grpc-secure/build.gradle
@@ -54,7 +54,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml
@@ -117,7 +117,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-server-kotlin/build.gradle b/samples/grpc-server-kotlin/build.gradle
@@ -68,7 +68,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
             grpckt {
diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml
@@ -151,7 +151,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 					<jvmMavenPlugins>
@@ -162,7 +162,7 @@
 							<classifier>jdk8</classifier>
 							<type>jar</type>
 							<mainClass>io.grpc.kotlin.generator.GeneratorRunner</mainClass>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</jvmMavenPlugin>
 					</jvmMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle
@@ -59,7 +59,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml
@@ -114,7 +114,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle
@@ -55,7 +55,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
@@ -120,7 +120,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-tomcat-secure/build.gradle b/samples/grpc-tomcat-secure/build.gradle
@@ -55,7 +55,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml
@@ -112,7 +112,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-tomcat/build.gradle b/samples/grpc-tomcat/build.gradle
@@ -55,7 +55,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml
@@ -117,7 +117,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>
diff --git a/samples/grpc-webflux/build.gradle b/samples/grpc-webflux/build.gradle
@@ -54,7 +54,6 @@ protobuf {
     generateProtoTasks {
         all()*.plugins {
             grpc {
-                option 'jakarta_omit'
                 option '@generated=omit'
             }
         }
diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml
@@ -112,7 +112,7 @@
 							<groupId>io.grpc</groupId>
 							<artifactId>protoc-gen-grpc-java</artifactId>
 							<version>${grpc.version}</version>
-							<options>jakarta_omit,@generated=omit</options>
+							<options>@generated=omit</options>
 						</binaryMavenPlugin>
 					</binaryMavenPlugins>
 				</configuration>

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ protobuf {`
`51`	`51`	`generateProtoTasks {`
`52`	`52`	`all()*.plugins {`
`53`	`53`	`grpc {`
`54`		`- option 'jakarta_omit'`
`55`	`54`	`option '@generated=omit'`
`56`	`55`	`}`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ protobuf {`
`61`	`61`	`generateProtoTasks {`
`62`	`62`	`all()*.plugins {`
`63`	`63`	`grpc {`
`64`		`- option 'jakarta_omit'`
`65`	`64`	`option '@generated=omit'`
`66`	`65`	`}`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ protobuf {`
`62`	`62`	`generateProtoTasks {`
`63`	`63`	`all()*.plugins {`
`64`	`64`	`grpc {`
`65`		`- option 'jakarta_omit'`
`66`	`65`	`option '@generated=omit'`
`67`	`66`	`}`
`68`	`67`	`reactor {}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ protobuf {`
`54`	`54`	`generateProtoTasks {`
`55`	`55`	`all()*.plugins {`
`56`	`56`	`grpc {`
`57`		`- option 'jakarta_omit'`
`58`	`57`	`option '@generated=omit'`
`59`	`58`	`}`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ protobuf {`
`68`	`68`	`generateProtoTasks {`
`69`	`69`	`all()*.plugins {`
`70`	`70`	`grpc {`
`71`		`- option 'jakarta_omit'`
`72`	`71`	`option '@generated=omit'`
`73`	`72`	`}`
`74`	`73`	`grpckt {`