Skip to content

Commit a4bbdd2

Browse files
ci(spanner): use airlock for fetching dependencies
1 parent 7c78ec9 commit a4bbdd2

File tree

12 files changed

+20
-7
lines changed
  • google-cloud-spanner-bom
  • google-cloud-spanner-executor
  • google-cloud-spanner
  • grpc-google-cloud-spanner-admin-database-v1
  • grpc-google-cloud-spanner-admin-instance-v1
  • grpc-google-cloud-spanner-executor-v1
  • grpc-google-cloud-spanner-v1
  • proto-google-cloud-spanner-admin-database-v1
  • proto-google-cloud-spanner-admin-instance-v1
  • proto-google-cloud-spanner-executor-v1
  • proto-google-cloud-spanner-v1

12 files changed

+20
-7
lines changed

google-cloud-spanner-bom/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.42.0</version>
11+
<version>3.41.1</version>
1212
</parent>
1313

1414
<name>Google Cloud Spanner BOM</name>
@@ -113,6 +113,7 @@
113113
<plugin>
114114
<groupId>org.apache.maven.plugins</groupId>
115115
<artifactId>maven-checkstyle-plugin</artifactId>
116+
<version>3.6.0</version>
116117
<configuration>
117118
<skip>true</skip>
118119
</configuration>

google-cloud-spanner-executor/pom.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
<artifactId>exporter-trace</artifactId>
4848
<version>0.33.0</version>
4949
</dependency>
50+
<dependency>
51+
<groupId>com.google.cloud.opentelemetry</groupId>
52+
<artifactId>shared-resourcemapping</artifactId>
53+
<version>0.33.0</version>
54+
</dependency>
5055
<dependency>
5156
<groupId>com.google.cloud</groupId>
5257
<artifactId>google-cloud-spanner</artifactId>
@@ -145,10 +150,6 @@
145150
<groupId>com.google.api</groupId>
146151
<artifactId>gax-grpc</artifactId>
147152
</dependency>
148-
<dependency>
149-
<groupId>com.google.code.findbugs</groupId>
150-
<artifactId>jsr305</artifactId>
151-
</dependency>
152153
<dependency>
153154
<groupId>com.google.auth</groupId>
154155
<artifactId>google-auth-library-credentials</artifactId>
@@ -200,7 +201,9 @@
200201
<build>
201202
<plugins>
202203
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
203205
<artifactId>maven-resources-plugin</artifactId>
206+
<version>3.3.1</version>
204207
<executions>
205208
<execution>
206209
<id>copy-resources</id>
@@ -266,7 +269,7 @@
266269
<groupId>org.apache.maven.plugins</groupId>
267270
<artifactId>maven-dependency-plugin</artifactId>
268271
<configuration>
269-
<ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4 </ignoredDependencies>
272+
<ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,com.google.cloud.opentelemetry:shared-resourcemapping</ignoredDependencies>
270273
</configuration>
271274
</plugin>
272275
</plugins>

google-cloud-spanner/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<?m2e ignore?>
134134
<groupId>org.codehaus.mojo</groupId>
135135
<artifactId>flatten-maven-plugin</artifactId>
136+
<version>1.6.0</version>
136137
</plugin>
137138

138139
<plugin>

grpc-google-cloud-spanner-admin-database-v1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<?m2e ignore?>
8484
<groupId>org.codehaus.mojo</groupId>
8585
<artifactId>flatten-maven-plugin</artifactId>
86+
<version>1.6.0</version>
8687
</plugin>
8788
</plugins>
8889
</build>

grpc-google-cloud-spanner-admin-instance-v1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<?m2e ignore?>
8484
<groupId>org.codehaus.mojo</groupId>
8585
<artifactId>flatten-maven-plugin</artifactId>
86+
<version>1.6.0</version>
8687
</plugin>
8788
</plugins>
8889
</build>

grpc-google-cloud-spanner-executor-v1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<?m2e ignore?>
7676
<groupId>org.codehaus.mojo</groupId>
7777
<artifactId>flatten-maven-plugin</artifactId>
78+
<version>1.6.0</version>
7879
</plugin>
7980
</plugins>
8081
</build>

grpc-google-cloud-spanner-v1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<?m2e ignore?>
7676
<groupId>org.codehaus.mojo</groupId>
7777
<artifactId>flatten-maven-plugin</artifactId>
78+
<version>1.6.0</version>
7879
</plugin>
7980
</plugins>
8081
</build>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.42.0</version>
17+
<version>3.41.1</version>
1818
</parent>
1919

2020
<developers>

proto-google-cloud-spanner-admin-database-v1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<?m2e ignore?>
4242
<groupId>org.codehaus.mojo</groupId>
4343
<artifactId>flatten-maven-plugin</artifactId>
44+
<version>1.6.0</version>
4445
</plugin>
4546
</plugins>
4647
</build>

proto-google-cloud-spanner-admin-instance-v1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<?m2e ignore?>
4242
<groupId>org.codehaus.mojo</groupId>
4343
<artifactId>flatten-maven-plugin</artifactId>
44+
<version>1.6.0</version>
4445
</plugin>
4546
</plugins>
4647
</build>

0 commit comments

Comments
 (0)