diff --git a/pom.xml b/pom.xml
index 528d86a852..0a9a82cd97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,18 +475,6 @@
         <!-- JDK 21 does not support Java 7 as release, must use at least Java 8 -->
         <maven.compiler.release>8</maven.compiler.release>
       </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <!-- Don't fail on warning because javac reports lint warnings for generated code of 'proto' module -->
-              <failOnWarning>false</failOnWarning>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
 
     <!-- Profile defining additional plugins to be executed for release -->
diff --git a/proto/pom.xml b/proto/pom.xml
index 75fffa9eed..9d1cec2697 100644
--- a/proto/pom.xml
+++ b/proto/pom.xml
@@ -31,6 +31,8 @@
     <!-- Make the build reproducible, see root `pom.xml` -->
     <!-- This is duplicated here because that is recommended by `artifact:check-buildplan` -->
     <project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>
+
+    <protobufVersion>3.25.1</protobufVersion>
   </properties>
 
   <licenses>
@@ -50,7 +52,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>4.0.0-rc-2</version>
+      <version>${protobufVersion}</version>
     </dependency>
 
     <dependency>
@@ -89,7 +91,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.17.3:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}</protocArtifact>
         </configuration>
         <executions>
           <execution>