Skip to content

Commit 27346e3

Browse files
kolea2kolea2
authored
Use libraries-bom for snippets - part 2 (#1781)
* Use libraries-bom for snippets - part 2 * Use libraries-bom for snippets - part 2 * Use libraries-bom for snippets - part 2 * fixes * fix inspectImageFile(), revert speech pom changes until libraries-bom updates the dependency * revert speech pom changes until libraries-bom updates the dependency * Add documenation about libraries-bom. Revert samples with failing tests * revert InspectImageFile until tests are fixed
1 parent 82722a5 commit 27346e3

File tree

8 files changed

+145
-32
lines changed

8 files changed

+145
-32
lines changed

‎container-registry/container-analysis/pom.xml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,43 @@
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2828
</properties>
2929

30+
<!-- [START dependencies] -->
31+
<!-- Using libraries-bom to manage versions.
32+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
33+
<dependencyManagement>
34+
<dependencies>
35+
<dependency>
36+
<groupId>com.google.cloud</groupId>
37+
<artifactId>libraries-bom</artifactId>
38+
<version>3.0.0</version>
39+
<type>pom</type>
40+
<scope>import</scope>
41+
</dependency>
42+
</dependencies>
43+
</dependencyManagement>
44+
3045
<dependencies>
31-
<!-- [START dependencies] -->
3246
<dependency>
3347
<groupId>com.google.cloud</groupId>
3448
<artifactId>google-cloud-containeranalysis</artifactId>
35-
<version>0.117.0-beta</version>
3649
</dependency>
3750
<dependency>
3851
<groupId>io.grafeas</groupId>
3952
<artifactId>grafeas</artifactId>
40-
<version>0.21.0</version>
4153
</dependency>
4254
<dependency>
4355
<groupId>com.google.cloud</groupId>
4456
<artifactId>google-cloud-core</artifactId>
45-
<version>1.91.3</version>
4657
</dependency>
4758
<dependency>
4859
<groupId>com.google.cloud</groupId>
4960
<artifactId>google-cloud-core-grpc</artifactId>
50-
<version>1.91.3</version>
5161
</dependency>
52-
5362
<dependency>
5463
<groupId>com.google.cloud</groupId>
5564
<artifactId>google-cloud-pubsub</artifactId>
56-
<version>1.100.0</version>
5765
</dependency>
66+
5867
<dependency>
5968
<groupId>commons-cli</groupId>
6069
<artifactId>commons-cli</artifactId>
@@ -70,13 +79,14 @@
7079
<artifactId>netty-tcnative-boringssl-static</artifactId>
7180
<version>2.0.27.Final</version>
7281
</dependency>
73-
7482
<!-- [END dependencies] -->
7583
<dependency>
7684
<groupId>junit</groupId>
7785
<artifactId>junit</artifactId>
7886
<version>4.12</version>
7987
<scope>test</scope>
8088
</dependency>
89+
<!-- [START dependencies] -->
8190
</dependencies>
91+
<!-- [END dependencies] -->
8292
</project>

‎firestore/pom.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,25 @@
4242
<firestore.project.id/>
4343
</properties>
4444

45+
<!-- [START fs-maven] -->
46+
<!-- Using libraries-bom to manage versions.
47+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
48+
<dependencyManagement>
49+
<dependencies>
50+
<dependency>
51+
<groupId>com.google.cloud</groupId>
52+
<artifactId>libraries-bom</artifactId>
53+
<version>3.0.0</version>
54+
<type>pom</type>
55+
<scope>import</scope>
56+
</dependency>
57+
</dependencies>
58+
</dependencyManagement>
59+
4560
<dependencies>
46-
<!-- Firestore -->
47-
<!-- [START fs-maven] -->
4861
<dependency>
4962
<groupId>com.google.cloud</groupId>
5063
<artifactId>google-cloud-firestore</artifactId>
51-
<version>1.30.0</version>
5264
</dependency>
5365
<!-- [END fs-maven] -->
5466

@@ -59,8 +71,9 @@
5971
<version>4.13-beta-3</version>
6072
<scope>test</scope>
6173
</dependency>
74+
<!-- [START fs-maven] -->
6275
</dependencies>
63-
76+
<!-- [END fs-maven] -->
6477
<build>
6578
<plugins>
6679
<plugin>

‎flexible/cloudstorage/pom.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,27 @@
4040
<jetty>9.4.4.v20170414</jetty>
4141
</properties>
4242

43+
<!-- [START gae_flex_storage_dependencies] -->
44+
<!-- Using libraries-bom to manage versions.
45+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
46+
<dependencyManagement>
47+
<dependencies>
48+
<dependency>
49+
<groupId>com.google.cloud</groupId>
50+
<artifactId>libraries-bom</artifactId>
51+
<version>3.0.0</version>
52+
<type>pom</type>
53+
<scope>import</scope>
54+
</dependency>
55+
</dependencies>
56+
</dependencyManagement>
57+
4358
<dependencies>
59+
<dependency>
60+
<groupId>com.google.cloud</groupId>
61+
<artifactId>google-cloud-storage</artifactId>
62+
</dependency>
63+
<!-- [END gae_flex_storage_dependencies] -->
4464
<dependency>
4565
<groupId>javax.servlet</groupId>
4666
<artifactId>javax.servlet-api</artifactId>
@@ -49,13 +69,8 @@
4969
<scope>provided</scope>
5070
</dependency>
5171
<!-- [START gae_flex_storage_dependencies] -->
52-
<dependency>
53-
<groupId>com.google.cloud</groupId>
54-
<artifactId>google-cloud-storage</artifactId>
55-
<version>1.100.0</version>
56-
</dependency>
57-
<!-- [END gae_flex_storage_dependencies] -->
5872
</dependencies>
73+
<!-- [END gae_flex_storage_dependencies] -->
5974
<build>
6075
<!-- for hot reload of the web application -->
6176
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>

‎flexible/datastore/pom.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,27 @@
4040
<jetty>9.4.4.v20170414</jetty>
4141
</properties>
4242

43+
<!-- [START gae_flex_datastore_config] -->
44+
<!-- Using libraries-bom to manage versions.
45+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
46+
<dependencyManagement>
47+
<dependencies>
48+
<dependency>
49+
<groupId>com.google.cloud</groupId>
50+
<artifactId>libraries-bom</artifactId>
51+
<version>3.0.0</version>
52+
<type>pom</type>
53+
<scope>import</scope>
54+
</dependency>
55+
</dependencies>
56+
</dependencyManagement>
57+
4358
<dependencies>
59+
<dependency>
60+
<groupId>com.google.cloud</groupId>
61+
<artifactId>google-cloud-datastore</artifactId>
62+
</dependency>
63+
<!-- [END gae_flex_datastore_config] -->
4464
<dependency>
4565
<groupId>javax.servlet</groupId>
4666
<artifactId>javax.servlet-api</artifactId>
@@ -49,13 +69,8 @@
4969
<scope>provided</scope>
5070
</dependency>
5171
<!-- [START gae_flex_datastore_config] -->
52-
<dependency>
53-
<groupId>com.google.cloud</groupId>
54-
<artifactId>google-cloud-datastore</artifactId>
55-
<version>1.100.0</version>
56-
</dependency>
57-
<!-- [END gae_flex_datastore_config] -->
5872
</dependencies>
73+
<!-- [END gae_flex_datastore_config] -->
5974
<build>
6075
<!-- for hot reload of the web application -->
6176
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>

‎healthcare/v1beta1/pom.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,22 @@
2828
<maven>3.5</maven>
2929
</prerequisites>
3030

31+
<!-- [START dependencies] -->
32+
<!-- Using libraries-bom to manage versions.
33+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
34+
<dependencyManagement>
35+
<dependencies>
36+
<dependency>
37+
<groupId>com.google.cloud</groupId>
38+
<artifactId>libraries-bom</artifactId>
39+
<version>3.0.0</version>
40+
<type>pom</type>
41+
<scope>import</scope>
42+
</dependency>
43+
</dependencies>
44+
</dependencyManagement>
45+
3146
<dependencies>
32-
<!-- [START dependencies] -->
3347
<dependency>
3448
<groupId>com.google.apis</groupId>
3549
<artifactId>google-api-services-healthcare</artifactId>
@@ -43,7 +57,6 @@
4357
<dependency>
4458
<groupId>com.google.cloud</groupId>
4559
<artifactId>google-cloud-core</artifactId>
46-
<version>1.91.3</version>
4760
<scope>compile</scope>
4861
</dependency>
4962
<!-- [END dependencies] -->
@@ -65,5 +78,7 @@
6578
<artifactId>httpmime</artifactId>
6679
<version>4.5.10</version>
6780
</dependency>
81+
<!-- [START dependencies] -->
6882
</dependencies>
83+
<!-- [END dependencies] -->
6984
</project>

‎language/automl/pom.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,25 @@
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
</properties>
3737

38+
<!-- [START automl_language_java_dependencies] -->
39+
<!-- Using libraries-bom to manage versions.
40+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
41+
<dependencyManagement>
42+
<dependencies>
43+
<dependency>
44+
<groupId>com.google.cloud</groupId>
45+
<artifactId>libraries-bom</artifactId>
46+
<version>3.0.0</version>
47+
<type>pom</type>
48+
<scope>import</scope>
49+
</dependency>
50+
</dependencies>
51+
</dependencyManagement>
52+
3853
<dependencies>
39-
<!-- [START automl_language_java_dependencies] -->
4054
<dependency>
4155
<groupId>com.google.cloud</groupId>
4256
<artifactId>google-cloud-automl</artifactId>
43-
<version>0.114.1-beta</version>
4457
</dependency>
4558
<!-- [END automl_language_java_dependencies] -->
4659
<dependency>
@@ -63,7 +76,9 @@
6376
<version>1.0</version>
6477
<scope>test</scope>
6578
</dependency>
79+
<!-- [START automl_language_java_dependencies] -->
6680
</dependencies>
81+
<!-- [END automl_language_java_dependencies] -->
6782

6883
<profiles>
6984
<profile>

‎pubsub/cloud-client/pom.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,25 @@
3434
<maven.compiler.source>1.8</maven.compiler.source>
3535
</properties>
3636

37+
<!-- [START pubsub_java_dependencies] -->
38+
<!-- Using libraries-bom to manage versions.
39+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
40+
<dependencyManagement>
41+
<dependencies>
42+
<dependency>
43+
<groupId>com.google.cloud</groupId>
44+
<artifactId>libraries-bom</artifactId>
45+
<version>3.0.0</version>
46+
<type>pom</type>
47+
<scope>import</scope>
48+
</dependency>
49+
</dependencies>
50+
</dependencyManagement>
51+
3752
<dependencies>
38-
<!-- [START pubsub_java_dependencies] -->
3953
<dependency>
4054
<groupId>com.google.cloud</groupId>
4155
<artifactId>google-cloud-pubsub</artifactId>
42-
<version>1.100.0</version>
4356
</dependency>
4457
<!-- [END pubsub_java_dependencies] -->
4558

@@ -56,7 +69,9 @@
5669
<version>1.0</version>
5770
<scope>test</scope>
5871
</dependency>
72+
<!-- [START pubsub_java_dependencies] -->
5973
</dependencies>
74+
<!-- [END pubsub_java_dependencies] -->
6075

6176
<build>
6277
<plugins>

‎texttospeech/beta/pom.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,25 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
</properties>
3434

35+
<!-- [START tts_java_dependencies_beta] -->
36+
<!-- Using libraries-bom to manage versions.
37+
See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
38+
<dependencyManagement>
39+
<dependencies>
40+
<dependency>
41+
<groupId>com.google.cloud</groupId>
42+
<artifactId>libraries-bom</artifactId>
43+
<version>3.0.0</version>
44+
<type>pom</type>
45+
<scope>import</scope>
46+
</dependency>
47+
</dependencies>
48+
</dependencyManagement>
49+
3550
<dependencies>
36-
<!-- [START tts_java_dependencies_beta] -->
3751
<dependency>
3852
<groupId>com.google.cloud</groupId>
3953
<artifactId>google-cloud-texttospeech</artifactId>
40-
<version>0.117.0-beta</version>
4154
</dependency>
4255
<dependency>
4356
<groupId>net.sourceforge.argparse4j</groupId>
@@ -59,7 +72,9 @@
5972
<version>1.0</version>
6073
<scope>test</scope>
6174
</dependency>
75+
<!-- [START tts_java_dependencies_beta] -->
6276
</dependencies>
77+
<!-- [END tts_java_dependencies_beta] -->
6378

6479

6580
<profiles>

0 commit comments

Comments
 (0)