Bump io.grpc:grpc-bom from 1.73.0 to 1.74.0 in /protobuf-maven-plugin/src/it/setup (#754)

Author: dependabot[bot]

protobuf-maven-plugin/src/it/gh-277-plugin-ordering/pom.xml

@@ -87,8 +87,6 @@
               <groupId>io.grpc</groupId>
               <artifactId>protoc-gen-grpc-java</artifactId>
               <version>${grpc.version}</version>
-              <!-- See https://github.com/grpc/grpc-java/issues/9179 -->
-              <options>@generated=omit</options>
               <order>100</order>
             </binaryMavenPlugin>
           </binaryMavenPlugins>

protobuf-maven-plugin/src/it/grpc-plugin/pom.xml

@@ -85,8 +85,6 @@
               <groupId>io.grpc</groupId>
               <artifactId>protoc-gen-grpc-java</artifactId>
               <version>${grpc.version}</version>
-              <!-- See https://github.com/grpc/grpc-java/issues/9179 -->
-              <options>@generated=omit</options>
             </binaryMavenPlugin>
           </binaryMavenPlugins>
         </configuration>

protobuf-maven-plugin/src/it/http-url-grpc-plugin/pom.xml

@@ -90,7 +90,8 @@
             <binaryUrlPlugin>
               <url>https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${grpc.version}/protoc-gen-grpc-java-${grpc.version}-linux-x86_64.exe</url>
               <digest>sha256:a9f9a7987be4a37c69a85e5e8885394356fd2f1a47f843c6461da4fc99f407b3</digest>
-              <!-- See https://github.com/grpc/grpc-java/issues/9179 -->
+              <!-- Needed until we use gRPC 1.74.0 or newer, as this avoids the dependency on
+                   javax.annotation-api. -->
               <options>@generated=omit</options>
             </binaryUrlPlugin>
           </binaryUrlPlugins>

protobuf-maven-plugin/src/it/per-plugin-output-paths/pom.xml

@@ -91,8 +91,6 @@
               <groupId>io.grpc</groupId>
               <artifactId>protoc-gen-grpc-java</artifactId>
               <version>${grpc.version}</version>
-              <!-- See https://github.com/grpc/grpc-java/issues/9179 -->
-              <options>@generated=omit</options>
               <outputDirectory>${project.basedir}/target/generated-sources/grpc</outputDirectory>
             </binaryMavenPlugin>
 

protobuf-maven-plugin/src/it/reactor-grpc-binary-plugin/pom.xml

@@ -91,8 +91,6 @@
               <groupId>io.grpc</groupId>
               <artifactId>protoc-gen-grpc-java</artifactId>
               <version>${grpc.version}</version>
-              <!-- See https://github.com/grpc/grpc-java/issues/9179 -->
-              <options>@generated=omit</options>
             </binaryMavenPlugin>
 
             <binaryMavenPlugin>

protobuf-maven-plugin/src/it/setup/pom.xml

@@ -33,7 +33,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <grpc.version>1.73.0</grpc.version>
+    <grpc.version>1.74.0</grpc.version>
     <kotlin.version>2.2.0</kotlin.version>
     <proto-google-common-protos.version>2.59.2</proto-google-common-protos.version>
     <scala.version>3.7.2</scala.version>

protobuf-maven-plugin/src/site/markdown/examples.md

@@ -21,14 +21,19 @@ For generating gRPC stubs for Java, you can use the official gRPC Java plugin:
         <groupId>io.grpc</groupId>
         <artifactId>protoc-gen-grpc-java</artifactId>
         <version>${grpc.version}</version>
-        <!-- Avoid dependency on javax.annotation-api -->
-        <options>@generated=omit</options>
       </binaryMavenPlugin>
     </binaryMavenPlugins>
   </configuration>
 </plugin>
 ```
 
+Note that for gRPC versions prior to 1.74.0, you should also pass the following options
+to avoid dependencies on `javax.annotation-api`.
+
+```xml
+<options>@generated=omit</options>
+```
+
 ## JavaScript and gRPC-Web
 
 While JavaScript generation is not natively supported by this plugin (as it's not part of core protoc), you can easily integrate JavaScript and gRPC-Web code generation using binary URL plugins.

protobuf-maven-plugin/src/site/markdown/using-protoc-plugins.md

@@ -48,8 +48,6 @@ that plugin directly via the group ID, artifact ID, and version (like any other
         <groupId>io.grpc</groupId>
         <artifactId>protoc-gen-grpc-java</artifactId>
         <version>${grpc.version}</version>
-        <!-- Avoid dependency on javax.annotation-api -->
-        <options>@generated=omit</options>
       </binaryMavenPlugin>
     </binaryMavenPlugins>
   </configuration>
@@ -58,6 +56,13 @@ that plugin directly via the group ID, artifact ID, and version (like any other
 </plugin>
 ```
 
+Note that for gRPC versions prior to 1.74.0, you should also pass the following options
+to avoid dependencies on `javax.annotation-api`.
+
+```xml
+<options>@generated=omit</options>
+```
+
 ### Binary plugins from the system path
 
 If you instead wish to read the executable from the system `$PATH`, then you can specify an
@@ -74,8 +79,6 @@ executable name instead:
     <binaryPathPlugins>
       <binaryPathPlugin>
         <name>protoc-gen-grpc-java</name>
-        <!-- Avoid dependency on javax.annotation-api -->
-        <options>@generated=omit</options>
       </binaryPathPlugin>
     </binaryPathPlugins>
   </configuration>
@@ -84,6 +87,13 @@ executable name instead:
 </plugin>
 ```
 
+Note that for gRPC versions prior to 1.74.0, you should also pass the following options
+to avoid dependencies on `javax.annotation-api`.
+
+```xml
+<options>@generated=omit</options>
+```
+
 You can also mark these plugins as being optional by setting `<optional>true</optional>` on the
 individual plugin objects. This will prevent the Maven plugin from failing the build if the `protoc` plugin
 cannot be resolved on the system path. This is useful for specific cases where resources may only be available 
@@ -115,8 +125,6 @@ specific file system path:
     <binaryUrlPlugins>
       <binaryUrlPlugin>
         <url>file:///opt/protoc/protoc-gen-grpc-java</url>
-        <!-- Avoid dependency on javax.annotation-api -->
-        <options>@generated=omit</options>
       </binaryUrlPlugin>
       <binaryUrlPlugin>
         <url>ftp://company-server.internal/some-other-plugin.exe</url>
@@ -274,8 +282,6 @@ then you can provide the following:
         <groupId>io.grpc</groupId>
         <artifactId>protoc-gen-grpc-java</artifactId>
         <version>${grpc.version}</version>
-        <!-- Avoid dependency on javax.annotation-api -->
-        <options>@generated=omit</options>
       </binaryMavenPlugin>
     </binaryMavenPlugins>
     <jvmMavenPlugins>