compiler: Default to @generated=omit (#12080)

After many years of issue 9179 being open, there's been nothing to show that we need the javax.annotations.Generated annotation. Most tools use file paths and a few check for annotations with "Generated" in the name. ErrorProne has a few that check for javax.annotations.Generated, but only UnnecessarilyFullyQualified looks like it'd be a problem and it is disabled by default. We're not getting any more information, no users have reported issues with `@generated=omit`, and the existing dependency is annoying users, so just drop it. Given we will still retain the GrpcGenerated annotation, it seems highly likely things are already okay. Even if there are problems they would probably be addressed by adding a io.grpc.stub.annotations.Generated annotation or small tweaks. In the short-term, (non-Bazel) users can use `@generated=javax`, but long-term we could consider removing the option assuming we've resolved any outstanding issues. We will want to update the examples and the README to remove the org.apache.tomcat:annotations-api dependency after the next release. Fixes #9179
2025-05-21 10:19:30 -07:00 · 2025-05-21 10:19:30 -07:00 · f8700a13ad
parent 2fb09578a8
commit f8700a13ad
49 changed files with 6 additions and 145 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -33,7 +33,6 @@ java_library(
        "//api",
        "//protobuf",
        "//stub",
-        "//stub:javax_annotation",
        "@com_google_protobuf//:protobuf_java",
        artifact("com.google.code.findbugs:jsr305"),
        artifact("com.google.guava:guava"),
@ -47,7 +46,6 @@ java_library(
        "//api",
        "//protobuf-lite",
        "//stub",
-        "//stub:javax_annotation",
        artifact("com.google.code.findbugs:jsr305"),
        artifact("com.google.guava:guava"),
    ],
@ -67,6 +65,5 @@ java_library(
    visibility = ["//:__subpackages__"],
    exports = [
        artifact("com.google.auto.value:auto-value-annotations"),
-        artifact("org.apache.tomcat:annotations-api"),  # @Generated for Java 9+
    ],
 )
--- a/MODULE.bazel
+++ b/MODULE.bazel
@ -41,7 +41,6 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
    "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
    "io.perfmark:perfmark-api:0.27.0",
    "junit:junit:4.13.2",
-    "org.apache.tomcat:annotations-api:6.0.53",
    "org.checkerframework:checker-qual:3.12.0",
    "org.codehaus.mojo:animal-sniffer-annotations:1.24",
 ]
--- a/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
+++ b/alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/gcp/handshaker.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class HandshakerServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service used to obtain stats for verifying LB behavior.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class LoadBalancerStatsServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/metrics.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class MetricsServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service used to control reconnect server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ReconnectServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * performance with various types of payload.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class TestServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * that case.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class UnimplementedServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service to dynamically update the configuration of an xDS test client.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class XdsUpdateClientConfigureServiceGrpc {

--- a/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service to remotely control health status of an xDS test server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class XdsUpdateHealthServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service used to obtain stats for verifying LB behavior.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class LoadBalancerStatsServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/metrics.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class MetricsServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service used to control reconnect server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ReconnectServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * performance with various types of payload.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class TestServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * that case.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class UnimplementedServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service to dynamically update the configuration of an xDS test client.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class XdsUpdateClientConfigureServiceGrpc {

--- a/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/android-interop-testing/src/generated/release/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service to remotely control health status of an xDS test server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class XdsUpdateHealthServiceGrpc {

--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/services.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class BenchmarkServiceGrpc {

--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/services.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ReportQpsScenarioServiceGrpc {

--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/services.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class WorkerServiceGrpc {

--- a/compiler/BUILD.bazel
+++ b/compiler/BUILD.bazel
@ -22,7 +22,6 @@ java_library(
        "//api",
        "//protobuf",
        "//stub",
-        "//stub:javax_annotation",
        artifact("com.google.code.findbugs:jsr305"),
        artifact("com.google.guava:guava"),
        "@com_google_protobuf//:protobuf_java",
@ -35,7 +34,6 @@ java_library(
        "//api",
        "//protobuf-lite",
        "//stub",
-        "//stub:javax_annotation",
        artifact("com.google.code.findbugs:jsr305"),
        artifact("com.google.guava:guava"),
    ],
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@ -184,7 +184,11 @@ protobuf {
            inputs.file javaPluginPath
        }
        ofSourceSet('test').configureEach {
-            plugins { grpc {} }
+            plugins {
+                grpc {
+                    option '@generated=javax'
+                }
+            }
        }
        ofSourceSet('testLite').configureEach {
            builtins {
@ -193,7 +197,6 @@ protobuf {
            plugins {
                grpc {
                    option 'lite'
-                    option '@generated=omit'
                }
            }
        }
--- a/compiler/src/java_plugin/cpp/java_plugin.cpp
+++ b/compiler/src/java_plugin/cpp/java_plugin.cpp
@ -80,7 +80,7 @@ class JavaGrpcGenerator : public protobuf::compiler::CodeGenerator {
    java_grpc_generator::ProtoFlavor flavor =
        java_grpc_generator::ProtoFlavor::NORMAL;
    java_grpc_generator::GeneratedAnnotation generated_annotation =
-        java_grpc_generator::GeneratedAnnotation::JAVAX;
+        java_grpc_generator::GeneratedAnnotation::OMIT;

    bool disable_version = false;
    for (size_t i = 0; i < options.size(); i++) {
--- a/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
+++ b/grpclb/src/generated/main/grpc/io/grpc/lb/v1/LoadBalancerGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/lb/v1/load_balancer.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class LoadBalancerGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service used to obtain stats for verifying LB behavior.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class LoadBalancerStatsServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/metrics.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class MetricsServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service used to control reconnect server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ReconnectServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * performance with various types of payload.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class TestServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * that case.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class UnimplementedServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service to dynamically update the configuration of an xDS test client.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class XdsUpdateClientConfigureServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A service to remotely control health status of an xDS test server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/testing/test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class XdsUpdateHealthServiceGrpc {

--- a/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
+++ b/istio-interop-testing/src/generated/main/grpc/io/istio/test/EchoTestServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: test/echo/proto/echo.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class EchoTestServiceGrpc {

--- a/repositories.bzl
+++ b/repositories.bzl
@ -45,7 +45,6 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
    "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
    "io.perfmark:perfmark-api:0.27.0",
    "junit:junit:4.13.2",
-    "org.apache.tomcat:annotations-api:6.0.53",
    "org.checkerframework:checker-qual:3.12.0",
    "org.codehaus.mojo:animal-sniffer-annotations:1.24",
 ]
--- a/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
+++ b/rls/src/generated/main/grpc/io/grpc/lookup/v1/RouteLookupServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/lookup/v1/rls.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class RouteLookupServiceGrpc {

--- a/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/channelz/v1/ChannelzGrpc.java
@ -8,9 +8,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * information.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/channelz/v1/channelz.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ChannelzGrpc {

--- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/health/v1/health.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class HealthGrpc {

--- a/services/src/generated/main/grpc/io/grpc/reflection/v1/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1/ServerReflectionGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/reflection/v1/reflection.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ServerReflectionGrpc {

--- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: grpc/reflection/v1alpha/reflection.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ServerReflectionGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * AnotherDynamicService
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class AnotherDynamicServiceGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherReflectableServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class AnotherReflectableServiceGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A DynamicService
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class DynamicServiceGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ReflectableServiceGrpc {

--- a/stub/BUILD.bazel
+++ b/stub/BUILD.bazel
@ -15,12 +15,3 @@ java_library(
        artifact("org.codehaus.mojo:animal-sniffer-annotations"),
    ],
 )
-
-# javax.annotation.Generated is not included in the default root modules in 9,
-# see: http://openjdk.java.net/jeps/320.
-java_library(
-    name = "javax_annotation",
-    neverlink = 1,  # @Generated is source-retention
-    visibility = ["//visibility:public"],
-    exports = [artifact("org.apache.tomcat:annotations-api")],
-)
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * A simple service for test.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: io/grpc/testing/protobuf/simpleservice.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class SimpleServiceGrpc {

--- a/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/com/github/xds/service/orca/v3/OpenRcaServiceGrpc.java
@ -14,9 +14,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * a new call to change backend reporting frequency.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: xds/service/orca/v3/orca.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class OpenRcaServiceGrpc {

--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
@ -12,9 +12,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * the multiplexed singleton APIs at the Envoy instance and management server.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: envoy/service/discovery/v3/ads.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class AggregatedDiscoveryServiceGrpc {

--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v3/LoadReportingServiceGrpc.java
@ -4,9 +4,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;

 /**
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: envoy/service/load_stats/v3/lrs.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class LoadReportingServiceGrpc {

--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/rate_limit_quota/v3/RateLimitQuotaServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/rate_limit_quota/v3/RateLimitQuotaServiceGrpc.java
@ -7,9 +7,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * Defines the Rate Limit Quota Service (RLQS).
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: envoy/service/rate_limit_quota/v3/rlqs.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class RateLimitQuotaServiceGrpc {

--- a/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
+++ b/xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/status/v3/ClientStatusDiscoveryServiceGrpc.java
@ -9,9 +9,6 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
 * also be used to get the current xDS states directly from the client.
 * </pre>
 */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler",
-    comments = "Source: envoy/service/status/v3/csds.proto")
@io.grpc.stub.annotations.GrpcGenerated
 public final class ClientStatusDiscoveryServiceGrpc {