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

Commit 7ca8b66

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#175)
1 parent b9622b5 commit 7ca8b66

File tree

5 files changed

+40
-79
lines changed

5 files changed

+40
-79
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@ api_key
4242
# Python utilities
4343
*.pyc
4444
artman-genfiles
45-
venv
45+
venv
46+
47+
.flattened-pom.xml

‎google-cloud-errorreporting/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,13 @@
102102
</dependencies>
103103
</profile>
104104
</profiles>
105+
106+
<build>
107+
<plugins>
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>flatten-maven-plugin</artifactId>
111+
</plugin>
112+
</plugins>
113+
</build>
105114
</project>

‎grpc-google-cloud-error-reporting-v1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,13 @@
5555
</dependencies>
5656
</profile>
5757
</profiles>
58+
59+
<build>
60+
<plugins>
61+
<plugin>
62+
<groupId>org.codehaus.mojo</groupId>
63+
<artifactId>flatten-maven-plugin</artifactId>
64+
</plugin>
65+
</plugins>
66+
</build>
5867
</project>

‎pom.xml

+10-78
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-errorreporting-parent</site.installationModule>
66-
<google.core.version>1.93.5</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>
@@ -83,64 +72,6 @@
8372
<artifactId>google-cloud-errorreporting</artifactId>
8473
<version>0.119.3-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-errorreporting:current} -->
8574
</dependency>
86-
87-
<dependency>
88-
<groupId>io.grpc</groupId>
89-
<artifactId>grpc-bom</artifactId>
90-
<version>${grpc.version}</version>
91-
<type>pom</type>
92-
<scope>import</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.google.api</groupId>
96-
<artifactId>gax-bom</artifactId>
97-
<version>${gax.version}</version>
98-
<type>pom</type>
99-
<scope>import</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>com.google.guava</groupId>
103-
<artifactId>guava-bom</artifactId>
104-
<version>${guava.version}</version>
105-
<type>pom</type>
106-
<scope>import</scope>
107-
</dependency>
108-
109-
<dependency>
110-
<groupId>com.google.protobuf</groupId>
111-
<artifactId>protobuf-java</artifactId>
112-
<version>${protobuf.version}</version>
113-
</dependency>
114-
<dependency>
115-
<groupId>com.google.api</groupId>
116-
<artifactId>api-common</artifactId>
117-
<version>${google.api-common.version}</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>com.google.api.grpc</groupId>
121-
<artifactId>proto-google-common-protos</artifactId>
122-
<version>${google.common-protos.version}</version>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.google.cloud</groupId>
126-
<artifactId>google-cloud-core</artifactId>
127-
<version>${google.core.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>org.threeten</groupId>
131-
<artifactId>threetenbp</artifactId>
132-
<version>${threeten.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>javax.annotation</groupId>
136-
<artifactId>javax.annotation-api</artifactId>
137-
<version>${javax.annotations.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>org.codehaus.mojo</groupId>
141-
<artifactId>animal-sniffer-annotations</artifactId>
142-
<version>${animal-sniffer.version}</version>
143-
</dependency>
14475
<dependency>
14576
<groupId>com.google.api.grpc</groupId>
14677
<artifactId>proto-google-cloud-error-reporting-v1beta1</artifactId>
@@ -153,16 +84,17 @@
15384
</dependency>
15485

15586
<dependency>
156-
<groupId>junit</groupId>
157-
<artifactId>junit</artifactId>
158-
<version>${junit.version}</version>
159-
<scope>test</scope>
87+
<groupId>com.google.cloud</groupId>
88+
<artifactId>google-cloud-shared-dependencies</artifactId>
89+
<version>0.8.1</version>
90+
<type>pom</type>
91+
<scope>import</scope>
16092
</dependency>
93+
16194
<dependency>
162-
<groupId>com.google.api</groupId>
163-
<artifactId>gax-grpc</artifactId>
164-
<version>${gax.version}</version>
165-
<classifier>testlib</classifier>
95+
<groupId>junit</groupId>
96+
<artifactId>junit</artifactId>
97+
<version>4.13</version>
16698
<scope>test</scope>
16799
</dependency>
168100
</dependencies>
@@ -252,7 +184,7 @@
252184
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
253185
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
254186
<link>https://googleapis.dev/java/gax/latest/</link>
255-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
187+
<link>https://googleapis.github.io/api-common-java/</link>
256188
</links>
257189
</configuration>
258190
</plugin>

‎proto-google-cloud-error-reporting-v1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,13 @@
3333
<artifactId>guava</artifactId>
3434
</dependency>
3535
</dependencies>
36+
37+
<build>
38+
<plugins>
39+
<plugin>
40+
<groupId>org.codehaus.mojo</groupId>
41+
<artifactId>flatten-maven-plugin</artifactId>
42+
</plugin>
43+
</plugins>
44+
</build>
3645
</project>

0 commit comments

Comments
 (0)