Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

Commit fb6d3f8

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#196)
1 parent 82786bd commit fb6d3f8

File tree

8 files changed

+49
-69
lines changed

8 files changed

+49
-69
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ docs/
3030

3131
# Python utilities
3232
*.pyc
33+
34+
.flattened-pom.xml

‎google-cloud-monitoring/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,13 @@
105105
</dependencies>
106106
</profile>
107107
</profiles>
108+
109+
<build>
110+
<plugins>
111+
<plugin>
112+
<groupId>org.codehaus.mojo</groupId>
113+
<artifactId>flatten-maven-plugin</artifactId>
114+
</plugin>
115+
</plugins>
116+
</build>
108117
</project>

‎grpc-google-cloud-monitoring-v3/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,13 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
6069
</project>

‎pom.xml

+5-68
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-monitoring-parent</site.installationModule>
66-
<google.core.version>1.91.1</google.core.version>
67-
<google.api-common.version>1.9.2</google.api-common.version>
68-
<google.common-protos.version>1.18.0</google.common-protos.version>
69-
<gax.version>1.56.0</gax.version>
70-
<grpc.version>1.30.0</grpc.version>
71-
<protobuf.version>3.12.2</protobuf.version>
72-
<junit.version>4.13</junit.version>
73-
<guava.version>29.0-android</guava.version>
74-
<threeten.version>1.4.4</threeten.version>
75-
<javax.annotations.version>1.3.2</javax.annotations.version>
76-
<animal-sniffer.version>1.18</animal-sniffer.version>
7766
</properties>
7867

7968
<dependencyManagement>
@@ -95,69 +84,17 @@
9584
</dependency>
9685

9786
<dependency>
98-
<groupId>io.grpc</groupId>
99-
<artifactId>grpc-bom</artifactId>
100-
<version>${grpc.version}</version>
101-
<type>pom</type>
102-
<scope>import</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>com.google.api</groupId>
106-
<artifactId>gax-bom</artifactId>
107-
<version>${gax.version}</version>
108-
<type>pom</type>
109-
<scope>import</scope>
110-
</dependency>
111-
<dependency>
112-
<groupId>com.google.guava</groupId>
113-
<artifactId>guava-bom</artifactId>
114-
<version>${guava.version}</version>
87+
<groupId>com.google.cloud</groupId>
88+
<artifactId>google-cloud-shared-dependencies</artifactId>
89+
<version>0.8.1</version>
11590
<type>pom</type>
11691
<scope>import</scope>
11792
</dependency>
11893

119-
<dependency>
120-
<groupId>com.google.protobuf</groupId>
121-
<artifactId>protobuf-java</artifactId>
122-
<version>${protobuf.version}</version>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.google.api</groupId>
126-
<artifactId>api-common</artifactId>
127-
<version>${google.api-common.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>com.google.api.grpc</groupId>
131-
<artifactId>proto-google-common-protos</artifactId>
132-
<version>${google.common-protos.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.threeten</groupId>
136-
<artifactId>threetenbp</artifactId>
137-
<version>${threeten.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>javax.annotation</groupId>
141-
<artifactId>javax.annotation-api</artifactId>
142-
<version>${javax.annotations.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.codehaus.mojo</groupId>
146-
<artifactId>animal-sniffer-annotations</artifactId>
147-
<version>${animal-sniffer.version}</version>
148-
</dependency>
149-
15094
<dependency>
15195
<groupId>junit</groupId>
15296
<artifactId>junit</artifactId>
153-
<version>${junit.version}</version>
154-
<scope>test</scope>
155-
</dependency>
156-
<dependency>
157-
<groupId>com.google.api</groupId>
158-
<artifactId>gax-grpc</artifactId>
159-
<version>${gax.version}</version>
160-
<classifier>testlib</classifier>
97+
<version>4.13</version>
16198
<scope>test</scope>
16299
</dependency>
163100
</dependencies>
@@ -247,7 +184,7 @@
247184
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
248185
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
249186
<link>https://googleapis.dev/java/gax/latest/</link>
250-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
187+
<link>https://googleapis.github.io/api-common-java/</link>
251188
</links>
252189
</configuration>
253190
</plugin>

‎proto-google-cloud-monitoring-v3/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
<artifactId>guava</artifactId>
3131
</dependency>
3232
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>org.codehaus.mojo</groupId>
38+
<artifactId>flatten-maven-plugin</artifactId>
39+
</plugin>
40+
</plugins>
41+
</build>
3342
</project>

‎samples/install-without-bom/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
<version>1.100.2-SNAPSHOT</version>
3333
</dependency>
3434
<!-- [END monitoring_install_without_bom] -->
35+
<dependency>
36+
<groupId>com.google.protobuf</groupId>
37+
<artifactId>protobuf-java-util</artifactId>
38+
<version>3.12.2</version>
39+
</dependency>
3540
</dependencies>
3641
<!-- {x-version-update-end} -->
3742

‎samples/snapshot/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<artifactId>google-cloud-monitoring</artifactId>
3131
<version>1.100.1</version>
3232
</dependency>
33+
<dependency>
34+
<groupId>com.google.protobuf</groupId>
35+
<artifactId>protobuf-java-util</artifactId>
36+
<version>3.12.2</version>
37+
</dependency>
3338

3439
<dependency>
3540
<groupId>junit</groupId>

‎samples/snippets/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@
4343
<artifactId>google-cloud-monitoring</artifactId>
4444
</dependency>
4545
<!-- [END monitoring_install_with_bom] -->
46-
46+
<dependency>
47+
<groupId>com.google.protobuf</groupId>
48+
<artifactId>protobuf-java-util</artifactId>
49+
<version>3.12.2</version>
50+
</dependency>
4751
<dependency>
4852
<groupId>junit</groupId>
4953
<artifactId>junit</artifactId>

0 commit comments

Comments
 (0)