From 05adb0d84ccb59f52e6cb7af338ca0466e5f9ee3 Mon Sep 17 00:00:00 2001
From: David Rabinowitz <davidrab@google.com>
Date: Mon, 10 Feb 2025 15:56:29 -0800
Subject: [PATCH] Build upgrades

---
 .mvn/wrapper/maven-wrapper.properties         |  2 +-
 cloudbuild/nightly.yaml                       |  2 +-
 spark-bigquery-parent/pom.xml                 | 38 +++++++++----------
 spark-bigquery-python-lib/pom.xml             |  4 +-
 .../src/assembly/descriptor.xml               |  1 +
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 598fb3415..9b66d8c7a 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/cloudbuild/nightly.yaml b/cloudbuild/nightly.yaml
index 9491b8067..8f461d308 100644
--- a/cloudbuild/nightly.yaml
+++ b/cloudbuild/nightly.yaml
@@ -32,6 +32,6 @@ images: ['gcr.io/$PROJECT_ID/dataproc-spark-bigquery-connector-nightly']
 timeout: 14400s
 
 options:
-  machineType: 'N1_HIGHCPU_32'
+  machineType: 'E2_HIGHCPU_32'
 
 logsBucket: spark-bigquery-connector-cloud-build-logs
diff --git a/spark-bigquery-parent/pom.xml b/spark-bigquery-parent/pom.xml
index d9ebd7ef3..b8e6f1f6e 100644
--- a/spark-bigquery-parent/pom.xml
+++ b/spark-bigquery-parent/pom.xml
@@ -293,7 +293,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.26.0</version>
+                <version>1.27.1</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -314,7 +314,7 @@
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20231013</version>
+                <version>20250107</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -347,7 +347,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.11</version>
+                    <version>0.8.12</version>
                     <executions>
                         <execution>
                             <goals>
@@ -359,32 +359,32 @@
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>4.8.3.0</version>
+                    <version>4.8.6.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.2.5</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.21.2</version>
+                    <version>3.26.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -394,22 +394,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.3</version>
                     <configuration>
                         <skip>${deploy.skip}</skip>
                     </configuration>
@@ -420,7 +420,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -564,7 +564,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <version>1.6.0</version>
                 <configuration>
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>resolveCiFriendliesOnly</flattenMode>
@@ -755,7 +755,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>verify-shaded-artifact</id>
@@ -917,7 +917,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -935,7 +935,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.3.1</version>
                         <configuration>
                             <forceCreation>true</forceCreation>
                         </configuration>
@@ -951,7 +951,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.4.1</version>
+                        <version>3.11.2</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
diff --git a/spark-bigquery-python-lib/pom.xml b/spark-bigquery-python-lib/pom.xml
index 0298762d4..66cd82698 100644
--- a/spark-bigquery-python-lib/pom.xml
+++ b/spark-bigquery-python-lib/pom.xml
@@ -18,7 +18,9 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <descriptor>src/assembly/descriptor.xml</descriptor>
+          <descriptors>
+            <descriptor>src/assembly/descriptor.xml</descriptor>
+          </descriptors>
         </configuration>
         <executions>
           <execution>
diff --git a/spark-bigquery-python-lib/src/assembly/descriptor.xml b/spark-bigquery-python-lib/src/assembly/descriptor.xml
index 245ae3544..55cebbeba 100644
--- a/spark-bigquery-python-lib/src/assembly/descriptor.xml
+++ b/spark-bigquery-python-lib/src/assembly/descriptor.xml
@@ -1,4 +1,5 @@
 <assembly>
+    <id>python-lib</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
         <format>zip</format>