apacheGH-39734: [Java] Bump org.codehaus.mojo:exec-maven-plugin from …

…1.6.0 to 3.1.1 (apache#39696) ### Rationale for this change This PR was created to replace apache#39374 and do the necessary changes for `org.codehaus.mojo` upgrade to take place. ### What changes are included in this PR? The changes to the `org.codehaus.mojo` version and an upgrade on the maven version used in the `.env`. ### Are these changes tested? Tested locally, but this requires a CI verification on Java. ### Are there any user-facing changes? No Authored-by: vibhatha <[email protected]> Signed-off-by: David Li <[email protected]>
milvus-io · Feb 2, 2024 · 0fb00fd · 0fb00fd
1 parent 32bd01f
commit 0fb00fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.env b/.env
@@ -65,7 +65,7 @@ JDK=8
 KARTOTHEK=latest
 # LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
 LLVM=14
-MAVEN=3.5.4
+MAVEN=3.6.3
 NODE=18
 NUMBA=latest
 NUMPY=latest

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1709,9 +1709,7 @@ services:
         arch: ${ARCH}
         # Use a newer JDK as it seems to improve stability
         jdk: 17
-        # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should
-        # be set to ${MAVEN}
-        maven: 3.5
+        maven: ${MAVEN}
         node: ${NODE}
         go: ${GO}
     volumes: *conda-volumes
@@ -1843,9 +1841,7 @@ services:
         arch: ${ARCH}
         python: ${PYTHON}
         jdk: ${JDK}
-        # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should
-        # be set to ${MAVEN}
-        maven: 3.5
+        maven: ${MAVEN}
         hdfs: ${HDFS}
     links:
       - impala:impala
@@ -1886,9 +1882,7 @@ services:
         arch: ${ARCH}
         python: ${PYTHON}
         jdk: ${JDK}
-        # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should
-        # be set to ${MAVEN}
-        maven: 3.5
+        maven: ${MAVEN}
         spark: ${SPARK}
         numpy: ${NUMPY}
     shm_size: *shm-size

diff --git a/java/performance/pom.xml b/java/performance/pom.xml
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <id>run-java-benchmarks</id>

diff --git a/java/pom.xml b/java/pom.xml
@@ -1038,7 +1038,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
             <executions>
               <execution>
                 <id>cdata-cmake</id>
@@ -1099,7 +1099,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
             <executions>
               <execution>
                 <id>jni-cpp-cmake</id>
@@ -1214,7 +1214,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
             <executions>
               <execution>
                 <id>jni-cpp-cmake</id>