Skip to content

Commit e1ece40

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#191)
1 parent d3d2370 commit e1ece40

File tree

5 files changed

+34
-99
lines changed

5 files changed

+34
-99
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ docs/
3030

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

‎google-cloud-logging/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,13 @@
124124
<scope>test</scope>
125125
</dependency>
126126
</dependencies>
127+
128+
<build>
129+
<plugins>
130+
<plugin>
131+
<groupId>org.codehaus.mojo</groupId>
132+
<artifactId>flatten-maven-plugin</artifactId>
133+
</plugin>
134+
</plugins>
135+
</build>
127136
</project>

‎grpc-google-cloud-logging-v2/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,13 @@
3838
<artifactId>proto-google-cloud-logging-v2</artifactId>
3939
</dependency>
4040
</dependencies>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>flatten-maven-plugin</artifactId>
47+
</plugin>
48+
</plugins>
49+
</build>
4150
</project>

‎pom.xml‎

Lines changed: 4 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-logging-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>
77-
<google.auth.version>0.20.0</google.auth.version>
78-
<http-client-bom.version>1.35.0</http-client-bom.version>
7966
</properties>
8067

8168
<dependencyManagement>
@@ -96,93 +83,18 @@
9683
<version>1.101.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
9784
</dependency>
9885

99-
<dependency>
100-
<groupId>io.grpc</groupId>
101-
<artifactId>grpc-bom</artifactId>
102-
<version>${grpc.version}</version>
103-
<type>pom</type>
104-
<scope>import</scope>
105-
</dependency>
106-
<dependency>
107-
<groupId>com.google.api</groupId>
108-
<artifactId>gax-bom</artifactId>
109-
<version>${gax.version}</version>
110-
<type>pom</type>
111-
<scope>import</scope>
112-
</dependency>
113-
<dependency>
114-
<groupId>com.google.guava</groupId>
115-
<artifactId>guava-bom</artifactId>
116-
<version>${guava.version}</version>
117-
<type>pom</type>
118-
<scope>import</scope>
119-
</dependency>
120-
<dependency>
121-
<groupId>com.google.http-client</groupId>
122-
<artifactId>google-http-client-bom</artifactId>
123-
<version>${http-client-bom.version}</version>
124-
<type>pom</type>
125-
<scope>import</scope>
126-
</dependency>
127-
<dependency>
128-
<groupId>com.google.auth</groupId>
129-
<artifactId>google-auth-library-bom</artifactId>
130-
<version>${google.auth.version}</version>
131-
<type>pom</type>
132-
<scope>import</scope>
133-
</dependency>
13486
<dependency>
13587
<groupId>com.google.cloud</groupId>
136-
<artifactId>google-cloud-core-bom</artifactId>
137-
<version>${google.core.version}</version>
138-
<type>pom</type>
139-
<scope>import</scope>
140-
</dependency>
141-
<dependency>
142-
<groupId>com.google.protobuf</groupId>
143-
<artifactId>protobuf-bom</artifactId>
144-
<version>${protobuf.version}</version>
88+
<artifactId>google-cloud-shared-dependencies</artifactId>
89+
<version>0.8.1</version>
14590
<type>pom</type>
14691
<scope>import</scope>
14792
</dependency>
14893

149-
<dependency>
150-
<groupId>com.google.api</groupId>
151-
<artifactId>api-common</artifactId>
152-
<version>${google.api-common.version}</version>
153-
</dependency>
154-
<dependency>
155-
<groupId>com.google.api.grpc</groupId>
156-
<artifactId>proto-google-common-protos</artifactId>
157-
<version>${google.common-protos.version}</version>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.threeten</groupId>
161-
<artifactId>threetenbp</artifactId>
162-
<version>${threeten.version}</version>
163-
</dependency>
164-
<dependency>
165-
<groupId>org.codehaus.mojo</groupId>
166-
<artifactId>animal-sniffer-annotations</artifactId>
167-
<version>${animal-sniffer.version}</version>
168-
</dependency>
169-
<dependency>
170-
<groupId>com.google.code.gson</groupId>
171-
<artifactId>gson</artifactId>
172-
<version>2.8.6</version>
173-
</dependency>
174-
17594
<dependency>
17695
<groupId>junit</groupId>
17796
<artifactId>junit</artifactId>
178-
<version>${junit.version}</version>
179-
<scope>test</scope>
180-
</dependency>
181-
<dependency>
182-
<groupId>com.google.api</groupId>
183-
<artifactId>gax-grpc</artifactId>
184-
<version>${gax.version}</version>
185-
<classifier>testlib</classifier>
97+
<version>4.13</version>
18698
<scope>test</scope>
18799
</dependency>
188100
<dependency>
@@ -208,13 +120,6 @@
208120
<version>1.0.1</version>
209121
<scope>test</scope>
210122
</dependency>
211-
<dependency>
212-
<groupId>com.google.cloud</groupId>
213-
<artifactId>google-cloud-core</artifactId>
214-
<version>${google.core.version}</version>
215-
<type>test-jar</type>
216-
<scope>test</scope>
217-
</dependency>
218123
</dependencies>
219124
</dependencyManagement>
220125

@@ -302,7 +207,7 @@
302207
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
303208
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
304209
<link>https://googleapis.dev/java/gax/latest/</link>
305-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
210+
<link>https://googleapis.github.io/api-common-java/</link>
306211
</links>
307212
</configuration>
308213
</plugin>

‎proto-google-cloud-logging-v2/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
<artifactId>api-common</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>

0 commit comments

Comments
 (0)