Skip to content

Commit b7b125e

Browse files
kweinmeisterkweinmeister
authored
chore: add managed dependencies (GoogleCloudPlatform#7894)
* chore: use managed dependencies in appengine samples * additional dependencies * updates for test failures * Fix build errors and formatting * add missing newline * address code review feedback
1 parent 302874a commit b7b125e

File tree

112 files changed

+1486
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1486
-430
lines changed

‎aiplatform/pom.xml‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<groupId>com.example.aiplatform</groupId>
57
<artifactId>aiplatform-snippets</artifactId>
@@ -22,28 +24,37 @@
2224
<maven.compiler.source>1.8</maven.compiler.source>
2325
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2426
</properties>
27+
28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<artifactId>libraries-bom</artifactId>
32+
<groupId>com.google.cloud</groupId>
33+
<scope>import</scope>
34+
<type>pom</type>
35+
<version>26.12.0</version>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
39+
2540
<!-- [START aiplatform_install_with_bom] -->
2641
<dependencies>
2742
<dependency>
2843
<groupId>com.google.cloud</groupId>
2944
<artifactId>google-cloud-aiplatform</artifactId>
30-
<version>3.4.1</version>
3145
</dependency>
3246
<!-- [END aiplatform_install_with_bom] -->
3347
<dependency>
3448
<groupId>com.google.cloud</groupId>
3549
<artifactId>google-cloud-storage</artifactId>
36-
<version>2.18.0</version>
3750
</dependency>
3851
<dependency>
3952
<groupId>com.google.protobuf</groupId>
4053
<artifactId>protobuf-java-util</artifactId>
41-
<version>4.0.0-rc-2</version>
4254
</dependency>
4355
<dependency>
4456
<groupId>com.google.code.gson</groupId>
4557
<artifactId>gson</artifactId>
46-
<version>2.10.1</version>
4758
</dependency>
4859
<dependency>
4960
<groupId>junit</groupId>
@@ -60,12 +71,10 @@
6071
<dependency>
6172
<groupId>com.google.api.grpc</groupId>
6273
<artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
63-
<version>0.25.0</version>
6474
</dependency>
65-
<dependency>
66-
<groupId>com.google.cloud</groupId>
67-
<artifactId>google-cloud-bigquery</artifactId>
68-
<version>2.24.3</version>
69-
</dependency>
75+
<dependency>
76+
<groupId>com.google.cloud</groupId>
77+
<artifactId>google-cloud-bigquery</artifactId>
78+
</dependency>
7079
</dependencies>
7180
</project>

‎appengine-java11-bundled-services/datastore/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1820
<modelVersion>4.0.0</modelVersion>
1921
<packaging>war</packaging>
2022
<version>1.0-SNAPSHOT</version>
@@ -36,6 +38,18 @@
3638
<maven.compiler.source>11</maven.compiler.source>
3739
</properties>
3840

41+
<dependencyManagement>
42+
<dependencies>
43+
<dependency>
44+
<artifactId>libraries-bom</artifactId>
45+
<groupId>com.google.cloud</groupId>
46+
<scope>import</scope>
47+
<type>pom</type>
48+
<version>26.12.0</version>
49+
</dependency>
50+
</dependencies>
51+
</dependencyManagement>
52+
3953
<dependencies>
4054
<dependency>
4155
<groupId>com.google.appengine</groupId>
@@ -61,7 +75,6 @@
6175
<dependency>
6276
<groupId>com.google.auto.value</groupId>
6377
<artifactId>auto-value-annotations</artifactId>
64-
<version>1.10.1</version>
6578
</dependency>
6679

6780
<dependency>
@@ -73,7 +86,6 @@
7386
<dependency>
7487
<groupId>com.google.guava</groupId>
7588
<artifactId>guava</artifactId>
76-
<version>31.1-jre</version>
7789
</dependency>
7890

7991
<dependency>

‎appengine-java11/gaeinfo/pom.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,18 @@ Copyright 2019 Google LLC
3636
<maven.compiler.source>11</maven.compiler.source>
3737
</properties>
3838

39+
<dependencyManagement>
40+
<dependencies>
41+
<dependency>
42+
<artifactId>libraries-bom</artifactId>
43+
<groupId>com.google.cloud</groupId>
44+
<scope>import</scope>
45+
<type>pom</type>
46+
<version>26.12.0</version>
47+
</dependency>
48+
</dependencies>
49+
</dependencyManagement>
50+
3951
<!-- All dependencies are scoped as provided.
4052
Dependent-jars are created and added to
4153
${project.build.directory}/appengine-staging -->
@@ -67,7 +79,6 @@ Copyright 2019 Google LLC
6779
<dependency>
6880
<groupId>com.google.code.gson</groupId>
6981
<artifactId>gson</artifactId>
70-
<version>2.10.1</version>
7182
<scope>provided</scope>
7283
</dependency>
7384

‎appengine-java11/oauth2/pom.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@
3838
<maven.compiler.target>11</maven.compiler.target>
3939
</properties>
4040

41+
<dependencyManagement>
42+
<dependencies>
43+
<dependency>
44+
<artifactId>libraries-bom</artifactId>
45+
<groupId>com.google.cloud</groupId>
46+
<scope>import</scope>
47+
<type>pom</type>
48+
<version>26.12.0</version>
49+
</dependency>
50+
</dependencies>
51+
</dependencyManagement>
52+
4153
<!-- All dependencies are scoped as provided.
4254
Dependent-jars are created and added to
4355
${project.build.directory}/appengine-staging -->
@@ -57,14 +69,12 @@
5769
<dependency>
5870
<groupId>com.google.oauth-client</groupId>
5971
<artifactId>google-oauth-client</artifactId>
60-
<version>1.34.1</version>
6172
<scope>provided</scope>
6273
</dependency>
6374

6475
<dependency>
6576
<groupId>com.google.oauth-client</groupId>
6677
<artifactId>google-oauth-client-servlet</artifactId>
67-
<version>1.34.1</version>
6878
<scope>provided</scope>
6979
</dependency>
7080

‎appengine-java11/vertx-helloworld/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ limitations under the License.
3939

4040
<dependencyManagement>
4141
<dependencies>
42+
<dependency>
43+
<artifactId>libraries-bom</artifactId>
44+
<groupId>com.google.cloud</groupId>
45+
<scope>import</scope>
46+
<type>pom</type>
47+
<version>26.12.0</version>
48+
</dependency>
4249
<dependency>
4350
<groupId>io.vertx</groupId>
4451
<artifactId>vertx-dependencies</artifactId>
@@ -62,7 +69,6 @@ limitations under the License.
6269
<dependency>
6370
<groupId>org.slf4j</groupId>
6471
<artifactId>slf4j-simple</artifactId>
65-
<version>1.7.36</version>
6672
<type>jar</type>
6773
</dependency>
6874
<dependency>

‎appengine-java17-bundled-services/datastore/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1820
<modelVersion>4.0.0</modelVersion>
1921
<packaging>war</packaging>
2022
<version>1.0-SNAPSHOT</version>
@@ -36,6 +38,18 @@
3638
<maven.compiler.source>11</maven.compiler.source>
3739
</properties>
3840

41+
<dependencyManagement>
42+
<dependencies>
43+
<dependency>
44+
<artifactId>libraries-bom</artifactId>
45+
<groupId>com.google.cloud</groupId>
46+
<scope>import</scope>
47+
<type>pom</type>
48+
<version>26.12.0</version>
49+
</dependency>
50+
</dependencies>
51+
</dependencyManagement>
52+
3953
<dependencies>
4054
<dependency>
4155
<groupId>com.google.appengine</groupId>
@@ -61,7 +75,6 @@
6175
<dependency>
6276
<groupId>com.google.auto.value</groupId>
6377
<artifactId>auto-value-annotations</artifactId>
64-
<version>1.10.1</version>
6578
</dependency>
6679

6780
<dependency>
@@ -73,7 +86,6 @@
7386
<dependency>
7487
<groupId>com.google.guava</groupId>
7588
<artifactId>guava</artifactId>
76-
<version>31.1-jre</version>
7789
</dependency>
7890

7991
<dependency>

‎appengine-java8/analytics/pom.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,24 @@
3737
<appengine.sdk.version>2.0.12</appengine.sdk.version>
3838
</properties>
3939

40+
<dependencyManagement>
41+
<dependencies>
42+
<dependency>
43+
<artifactId>libraries-bom</artifactId>
44+
<groupId>com.google.cloud</groupId>
45+
<scope>import</scope>
46+
<type>pom</type>
47+
<version>26.12.0</version>
48+
</dependency>
49+
</dependencies>
50+
</dependencyManagement>
51+
4052
<dependencies>
4153
<!-- Compile/runtime dependencies -->
4254
<dependency>
4355
<groupId>com.google.appengine</groupId>
4456
<artifactId>appengine-api-1.0-sdk</artifactId>
45-
<version>2.0.12</version>
57+
<version>2.0.13</version>
4658
</dependency>
4759

4860
<dependency>
@@ -54,7 +66,7 @@
5466
<dependency>
5567
<groupId>org.apache.httpcomponents</groupId>
5668
<artifactId>httpclient</artifactId>
57-
<version>4.5.13</version>
69+
<version>4.5.14</version>
5870
</dependency>
5971

6072
<dependency>
@@ -75,7 +87,7 @@
7587
<dependency>
7688
<groupId>com.google.appengine</groupId>
7789
<artifactId>appengine-api-stubs</artifactId>
78-
<version>2.0.12</version>
90+
<version>2.0.13</version>
7991
<scope>test</scope>
8092
</dependency>
8193

@@ -88,7 +100,7 @@
88100
<dependency>
89101
<groupId>org.mockito</groupId>
90102
<artifactId>mockito-core</artifactId>
91-
<version>4.11.0</version>
103+
<version>1.10.19</version>
92104
<scope>test</scope>
93105
</dependency>
94106
<dependency>

‎appengine-java8/appidentity/pom.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
limitations under the License.
1515
-->
1616
<project xmlns="http://maven.apache.org/POM/4.0.0"
17-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
1920
<packaging>war</packaging>
2021
<version>1.0-SNAPSHOT</version>
@@ -36,6 +37,18 @@
3637
<maven.compiler.source>1.8</maven.compiler.source>
3738
</properties>
3839

40+
<dependencyManagement>
41+
<dependencies>
42+
<dependency>
43+
<artifactId>libraries-bom</artifactId>
44+
<groupId>com.google.cloud</groupId>
45+
<scope>import</scope>
46+
<type>pom</type>
47+
<version>26.12.0</version>
48+
</dependency>
49+
</dependencies>
50+
</dependencyManagement>
51+
3952
<dependencies>
4053
<dependency>
4154
<groupId>com.google.appengine</groupId>
@@ -46,7 +59,6 @@
4659
<dependency>
4760
<groupId>com.google.guava</groupId>
4861
<artifactId>guava</artifactId>
49-
<version>31.1-jre</version>
5062
</dependency>
5163

5264
<dependency>

‎appengine-java8/bigquery/pom.xml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
limitations under the License.
1515
-->
1616
<project xmlns="http://maven.apache.org/POM/4.0.0"
17-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
1920
<packaging>war</packaging>
2021
<version>1.0-SNAPSHOT</version>
@@ -36,6 +37,18 @@
3637
<maven.compiler.source>1.8</maven.compiler.source>
3738
</properties>
3839

40+
<dependencyManagement>
41+
<dependencies>
42+
<dependency>
43+
<artifactId>libraries-bom</artifactId>
44+
<groupId>com.google.cloud</groupId>
45+
<scope>import</scope>
46+
<type>pom</type>
47+
<version>26.12.0</version>
48+
</dependency>
49+
</dependencies>
50+
</dependencyManagement>
51+
3952
<dependencies>
4053
<dependency>
4154
<groupId>com.google.appengine</groupId>
@@ -53,12 +66,10 @@
5366
<dependency>
5467
<groupId>com.google.cloud</groupId>
5568
<artifactId>google-cloud-bigquery</artifactId>
56-
<version>2.24.3</version>
5769
</dependency>
5870
<dependency>
5971
<groupId>com.google.cloud</groupId>
6072
<artifactId>google-cloud-monitoring</artifactId>
61-
<version>3.14.0</version>
6273
</dependency>
6374

6475
<dependency>

0 commit comments

Comments
 (0)