From a4bbdd2820e058d1907a4bad0205be510c2243cf Mon Sep 17 00:00:00 2001
From: Sakthivel Subramanian <sakthipvmj@gmail.com>
Date: Thu, 6 Feb 2025 07:08:29 +0530
Subject: [PATCH] ci(spanner): use airlock for fetching dependencies

---
 google-cloud-spanner-bom/pom.xml                    |  3 ++-
 google-cloud-spanner-executor/pom.xml               | 13 ++++++++-----
 google-cloud-spanner/pom.xml                        |  1 +
 grpc-google-cloud-spanner-admin-database-v1/pom.xml |  1 +
 grpc-google-cloud-spanner-admin-instance-v1/pom.xml |  1 +
 grpc-google-cloud-spanner-executor-v1/pom.xml       |  1 +
 grpc-google-cloud-spanner-v1/pom.xml                |  1 +
 pom.xml                                             |  2 +-
 .../pom.xml                                         |  1 +
 .../pom.xml                                         |  1 +
 proto-google-cloud-spanner-executor-v1/pom.xml      |  1 +
 proto-google-cloud-spanner-v1/pom.xml               |  1 +
 12 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 085b147fdc..c2082ac5d5 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.42.0</version>
+    <version>3.41.1</version>
   </parent>
 
   <name>Google Cloud Spanner BOM</name>
@@ -113,6 +113,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>3.6.0</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index b73d1b1b5a..afc1828deb 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -47,6 +47,11 @@
       <artifactId>exporter-trace</artifactId>
       <version>0.33.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.cloud.opentelemetry</groupId>
+      <artifactId>shared-resourcemapping</artifactId>
+      <version>0.33.0</version>
+    </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
@@ -145,10 +150,6 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-credentials</artifactId>
@@ -200,7 +201,9 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
         <executions>
           <execution>
             <id>copy-resources</id>
@@ -266,7 +269,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4 </ignoredDependencies>
+            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,com.google.cloud.opentelemetry:shared-resourcemapping</ignoredDependencies>
           </configuration>
         </plugin>
       </plugins>
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index b6fde80b05..3c538f8a6f 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -133,6 +133,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
 
       <plugin>
diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 8eed75ce3b..b751aaae21 100644
--- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -83,6 +83,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index 9028974e8e..159b34b3bd 100644
--- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -83,6 +83,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml
index ba80d3d14a..dc9a089e9c 100644
--- a/grpc-google-cloud-spanner-executor-v1/pom.xml
+++ b/grpc-google-cloud-spanner-executor-v1/pom.xml
@@ -75,6 +75,7 @@
           <?m2e ignore?>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>flatten-maven-plugin</artifactId>
+          <version>1.6.0</version>
         </plugin>
     </plugins>
   </build>
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index 7efa1ddecd..82fc0c20d7 100644
--- a/grpc-google-cloud-spanner-v1/pom.xml
+++ b/grpc-google-cloud-spanner-v1/pom.xml
@@ -75,6 +75,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/pom.xml b/pom.xml
index b6ffa243fe..8da72824b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.42.0</version>
+    <version>3.41.1</version>
   </parent>
 
   <developers>
diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml
index ddb354e86e..09f7c0353c 100644
--- a/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -41,6 +41,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index fc47897da8..84e4a5c9e0 100644
--- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -41,6 +41,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml
index 1e245bcaee..b71fd4045b 100644
--- a/proto-google-cloud-spanner-executor-v1/pom.xml
+++ b/proto-google-cloud-spanner-executor-v1/pom.xml
@@ -64,6 +64,7 @@
           <?m2e ignore?>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>flatten-maven-plugin</artifactId>
+          <version>1.6.0</version>
         </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml
index e27dbd40b9..78c31118ab 100644
--- a/proto-google-cloud-spanner-v1/pom.xml
+++ b/proto-google-cloud-spanner-v1/pom.xml
@@ -37,6 +37,7 @@
         <?m2e ignore?>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>