From 6728cad2470a8c09ce88d373dd029221979d941f Mon Sep 17 00:00:00 2001
From: Dane Pitkin <dpitkin@apache.org>
Date: Wed, 17 Jul 2024 18:00:53 -0400
Subject: [PATCH 1/4] Try to clear Java's build cache

---
 ci/scripts/java_build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh
index 0fa1edab429..f069a51b2dd 100755
--- a/ci/scripts/java_build.sh
+++ b/ci/scripts/java_build.sh
@@ -32,7 +32,7 @@ java_jni_dist_dir=${3}
 if [[ "$(uname -s)" == "Linux" ]] && [[ "$(uname -m)" == "s390x" ]]; then
   # Since some files for s390_64 are not available at maven central,
   # download pre-build files from Artifactory and install them explicitly
-  mvn_install="mvn clean install:install-file"
+  mvn_install="mvn clean install:install-file -DrerunGoals"
   wget="wget"
   artifactory_base_url="https://apache.jfrog.io/artifactory/arrow"
 
@@ -98,12 +98,12 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
   mvn="${mvn} -Darrow.cpp.build.dir=${java_jni_dist_dir} -Parrow-jni"
 fi
 
-${mvn} clean install
+${mvn} clean install -DrerunGoals
 
 if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then
   # HTTP pooling is turned of to avoid download issues https://issues.apache.org/jira/browse/ARROW-11633
   mkdir -p ${build_dir}/docs/java/reference
-  ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false clean install site
+  ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -DrerunGoals clean install site
   rsync -a target/site/apidocs/ ${build_dir}/docs/java/reference
 fi
 

From 68db6e0e3a820f4f232ed81d376dfa36f115e20a Mon Sep 17 00:00:00 2001
From: Dane Pitkin <dpitkin@apache.org>
Date: Wed, 17 Jul 2024 18:13:13 -0400
Subject: [PATCH 2/4] Disable stored output

---
 java/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/pom.xml b/java/pom.xml
index 4228496ef68..905c892d466 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -477,6 +477,12 @@ under the License.
                     </fileSets>
                   </inputs>
                 </plugin>
+                <plugin>
+                  <artifactId>maven-compiler-plugin</artifactId>
+                  <outputs>
+                    <storeEnabled>false</storeEnabled>
+                  </outputs>
+                </plugin>
               </plugins>
             </develocity>
           </configuration>

From 4bfe7a6d858ce9a1276214d0573760739c2c4250 Mon Sep 17 00:00:00 2001
From: Dane Pitkin <dpitkin@apache.org>
Date: Wed, 17 Jul 2024 18:21:49 -0400
Subject: [PATCH 3/4] Delete arrow-maven-plugins in release script

---
 ci/scripts/java_build.sh     | 6 +++---
 dev/release/utils-prepare.sh | 1 -
 java/pom.xml                 | 8 +-------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh
index f069a51b2dd..0fa1edab429 100755
--- a/ci/scripts/java_build.sh
+++ b/ci/scripts/java_build.sh
@@ -32,7 +32,7 @@ java_jni_dist_dir=${3}
 if [[ "$(uname -s)" == "Linux" ]] && [[ "$(uname -m)" == "s390x" ]]; then
   # Since some files for s390_64 are not available at maven central,
   # download pre-build files from Artifactory and install them explicitly
-  mvn_install="mvn clean install:install-file -DrerunGoals"
+  mvn_install="mvn clean install:install-file"
   wget="wget"
   artifactory_base_url="https://apache.jfrog.io/artifactory/arrow"
 
@@ -98,12 +98,12 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
   mvn="${mvn} -Darrow.cpp.build.dir=${java_jni_dist_dir} -Parrow-jni"
 fi
 
-${mvn} clean install -DrerunGoals
+${mvn} clean install
 
 if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then
   # HTTP pooling is turned of to avoid download issues https://issues.apache.org/jira/browse/ARROW-11633
   mkdir -p ${build_dir}/docs/java/reference
-  ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -DrerunGoals clean install site
+  ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false clean install site
   rsync -a target/site/apidocs/ ${build_dir}/docs/java/reference
 fi
 
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 760a7f404a7..6ba8b22a06e 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -88,7 +88,6 @@ update_versions() {
     # versions-maven-plugin:set-scm-tag does not update the whole reactor. Invoking separately
     mvn versions:set-scm-tag -DnewTag=apache-arrow-${version} -DgenerateBackupPoms=false -pl :arrow-java-root
     mvn versions:set-scm-tag -DnewTag=apache-arrow-${version} -DgenerateBackupPoms=false -pl :arrow-bom
-    mvn versions:set-scm-tag -DnewTag=apache-arrow-${version} -DgenerateBackupPoms=false -pl :arrow-maven-plugins
   fi
   git add "pom.xml"
   git add "**/pom.xml"
diff --git a/java/pom.xml b/java/pom.xml
index 905c892d466..d819dae41c3 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -477,12 +477,6 @@ under the License.
                     </fileSets>
                   </inputs>
                 </plugin>
-                <plugin>
-                  <artifactId>maven-compiler-plugin</artifactId>
-                  <outputs>
-                    <storeEnabled>false</storeEnabled>
-                  </outputs>
-                </plugin>
               </plugins>
             </develocity>
           </configuration>
@@ -732,7 +726,7 @@ under the License.
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.29</version>
+            <version>10.17.0</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>

From 8c9b54e6091da33447b70801539d89f731f1b2d4 Mon Sep 17 00:00:00 2001
From: Dane Pitkin <dpitkin@apache.org>
Date: Wed, 17 Jul 2024 18:23:06 -0400
Subject: [PATCH 4/4] Revert bad edit

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

diff --git a/java/pom.xml b/java/pom.xml
index d819dae41c3..4228496ef68 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -726,7 +726,7 @@ under the License.
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>10.17.0</version>
+            <version>8.29</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>