The Protobuf compiler version is now managed via a property. The protoc-jar-maven-plugin configuration was updated to use the protoc artifact and its execution phase was moved to the parent pom. The unused protobuf/bridge/message_set.proto file has been removed.

PiperOrigin-RevId: 843685877
Change-Id: I80bd1f594d8cfdadb618183ebc58c07e468450fa

Author: ludoch

pom.xml

@@ -77,6 +77,7 @@
     <jetty12.version>12.0.31</jetty12.version>
     <jetty121.version>12.1.5</jetty121.version>
     <slf4j.version>2.0.17</slf4j.version>
+    <protoc.version>3.21.12</protoc.version>
     <distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>
     <distributionManagement.snapshot.id>sonatype-nexus-snapshots</distributionManagement.snapshot.id>
     <distributionManagement.release.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distributionManagement.release.url>
@@ -521,12 +522,7 @@
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
-        <version>3.21.12</version> <!-- keep -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java-util</artifactId>
-        <version>3.21.12</version> <!-- keep -->
+        <version>${protoc.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.activation</groupId>
@@ -835,12 +831,16 @@
           <groupId>com.github.os72</groupId>
           <artifactId>protoc-jar-maven-plugin</artifactId>
           <version>3.11.4</version>
+          <executions>
+              <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                      <goal>run</goal>
+                  </goals>
+              </execution>
+          </executions>
           <configuration>
-            <!-- Try to keep this protoc compiler version up to date with:
-                 https://github.com/protocolbuffers/protobuf/blob/master/java/pom.xml#L7
-                 Read https://github.com/os72/protoc-jar-maven-plugin/issues/107 for context.
-             -->
-             <protocVersion>3.21.12</protocVersion>
+              <protocArtifact>com.google.protobuf:protoc:${protoc.version}</protocArtifact>
           </configuration>
         </plugin>
         <plugin>

protobuf/bridge/message_set.proto

@@ -43,21 +43,12 @@
       <plugin>
         <groupId>com.github.os72</groupId>
         <artifactId>protoc-jar-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
             <inputDirectories>
                 <dir>.</dir>
             </inputDirectories>
             <includeDirectories>
                 <dir>./api</dir>
-                <dir>./bridge</dir>
             </includeDirectories>
         </configuration>
       </plugin>

protobuf/pom.xml

@@ -16,7 +16,6 @@
         "org.mortbay.jasper:apache-jsp",
         "org.apache.lucene:lucene-core",
         "com.google.protobuf:protobuf-java",
-        "com.google.protobuf:protobuf-java-util",
         "com.google.api.grpc:proto-google-common-protos",
         "com.google.api.grpc:proto-google-cloud-datastore-v1",
         "com.google.cloud.datastore:datastore-v1-proto-client",

renovate.json

@@ -99,12 +99,6 @@
             <artifactId>protobuf-java</artifactId>
             <optional>true</optional>
        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

runtime/impl/pom.xml

@@ -111,11 +111,6 @@
             <artifactId>protobuf-java</artifactId>
             <optional>true</optional>
        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
@@ -477,7 +472,6 @@
                                     <include>com.google.guava:listenablefuture</include>
                                     <include>com.google.j2objc:j2objc-annotations</include>
                                     <include>com.google.protobuf:protobuf-java</include>
-                                    <include>com.google.protobuf:protobuf-java-util</include>
                                     <include>commons-codec:commons-codec</include>
                                     <include>io.perfmark:perfmark-api</include>
                                     <include>javax.annotation:javax.annotation-api</include>

runtime/runtime_impl_jetty12/pom.xml

@@ -111,11 +111,6 @@
             <artifactId>protobuf-java</artifactId>
             <optional>true</optional>
        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
@@ -500,7 +495,6 @@
                                     <include>com.google.guava:listenablefuture</include>
                                     <include>com.google.j2objc:j2objc-annotations</include>
                                     <include>com.google.protobuf:protobuf-java</include>
-                                    <include>com.google.protobuf:protobuf-java-util</include>
                                     <include>commons-codec:commons-codec</include>
                                     <include>io.perfmark:perfmark-api</include>
                                     <include>javax.annotation:javax.annotation-api</include>

runtime/runtime_impl_jetty121/pom.xml

@@ -106,11 +106,6 @@
             <artifactId>protobuf-java</artifactId>
             <optional>true</optional>
        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
@@ -372,7 +367,6 @@
                                     <include>com.google.guava:listenablefuture</include>
                                     <include>com.google.j2objc:j2objc-annotations</include>
                                     <include>com.google.protobuf:protobuf-java</include>
-                                    <include>com.google.protobuf:protobuf-java-util</include>
                                     <include>commons-codec:commons-codec</include>
                                     <include>io.perfmark:perfmark-api</include>
                                     <include>javax.annotation:javax.annotation-api</include>