From 0669ac7bd3dc32dbc34574d45c7a8acea82b311f Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Tue, 11 Nov 2025 09:37:03 +0100
Subject: [PATCH 1/3] RATIS-2354. Bump Apache parent POM to 35

---
 pom.xml | 53 +----------------------------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index 72cd5a646e..bcab191555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>25</version>
+    <version>35</version>
     <relativePath /> <!-- resolve from repository -->
   </parent>
 
@@ -168,17 +168,10 @@
 
     <!-- Maven plugin versions -->
     <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
-    <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
-    <maven-clover2-plugin.version>4.0.6</maven-clover2-plugin.version>
-    <maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
-    <maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
-    <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
-    <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
     <wagon-ssh.version>3.5.3</wagon-ssh.version>
     <hadoop-maven-plugins.version>3.4.0</hadoop-maven-plugins.version>
     <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
 
-
     <!-- org.codehaus.mojo -->
     <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
     <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
@@ -457,10 +450,6 @@
           <version>${license-maven-plugin.version}</version>
         </plugin>
 
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -473,11 +462,6 @@
             </additionalJOptions>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>${maven-shade-plugin.version}</version>
-        </plugin>
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
@@ -499,16 +483,10 @@
           <artifactId>exec-maven-plugin</artifactId>
           <version>${exec-maven-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pdf-plugin</artifactId>
-          <version>${maven-pdf-plugin.version}</version>
-        </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.2.1</version>
           <configuration>
             <rules>
               <requireMavenVersion>
@@ -614,7 +592,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven-surefire-plugin.version}</version>
           <configuration>
             <failIfNoTests>false</failIfNoTests>
             <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
@@ -657,10 +634,6 @@
           </configuration>
         </plugin>
 
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-        </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
@@ -673,15 +646,6 @@
             </excludes>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>${maven-remote-resources-plugin.version}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
@@ -693,11 +657,6 @@
             </dependency>
           </dependencies>
         </plugin>
-        <plugin>
-          <groupId>com.atlassian.maven.plugins</groupId>
-          <artifactId>maven-clover2-plugin</artifactId>
-          <version>${maven-clover2-plugin.version}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -801,7 +760,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${maven-checkstyle-plugin.version}</version>
         <configuration>
           <!-- We decide not to check style on test directory to focus more on code than format. -->
           <!--includeTestSourceDirectory>true</includeTestSourceDirectory-->
@@ -810,15 +768,6 @@
           <linkXRef>false</linkXRef>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pdf-plugin</artifactId>
-        <configuration>
-          <outputDirectory>${project.reporting.outputDirectory}
-          </outputDirectory>
-          <includeReports>false</includeReports>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>

From 366c6391c1fb49c156a0beeef3e95c6653a34d19 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Tue, 11 Nov 2025 09:47:37 +0100
Subject: [PATCH 2/3] remove duplicate maven-source-plugin execution

---
 pom.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index bcab191555..e4ad50970a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,21 +549,6 @@
             </compilerArgs>
           </configuration>
         </plugin>
-        <!-- Make a jar and put the sources in the jar.
-        In the parent pom, so submodules will do the right thing. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <phase>prepare-package</phase>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
 
         <!-- General configuration for submodules who want to build a test jar -->
         <plugin>

From 5a985a6b343bcfabb89e2c87c58df7cc9c12fb97 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Tue, 11 Nov 2025 10:04:02 +0100
Subject: [PATCH 3/3] override maven-source-plugin execution from
 maven-apache-parent POM

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e4ad50970a..820214c863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -908,7 +908,7 @@
             <executions>
               <execution>
                 <!-- builds source jars and attaches them to the project for publishing -->
-                <id>ratis-java-sources</id>
+                <id>attach-sources</id> <!-- override execution from maven-apache-parent POM -->
                 <phase>package</phase>
                 <goals>
                   <goal>jar-no-fork</goal>