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

Commit 1a61a5f

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

File tree

9 files changed

+71
-80
lines changed

9 files changed

+71
-80
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-tasks/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,13 @@
124124
</dependencies>
125125
</profile>
126126
</profiles>
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-tasks-v2/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>

‎grpc-google-cloud-tasks-v2beta2/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>

‎grpc-google-cloud-tasks-v2beta3/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-79
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-tasks-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.proto-iam-v1.version>0.13.0</google.proto-iam-v1.version>
7866
</properties>
7967

8068
<dependencyManagement>
@@ -116,79 +104,17 @@
116104
</dependency>
117105

118106
<dependency>
119-
<groupId>io.grpc</groupId>
120-
<artifactId>grpc-bom</artifactId>
121-
<version>${grpc.version}</version>
122-
<type>pom</type>
123-
<scope>import</scope>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.google.api</groupId>
127-
<artifactId>gax-bom</artifactId>
128-
<version>${gax.version}</version>
129-
<type>pom</type>
130-
<scope>import</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>com.google.guava</groupId>
134-
<artifactId>guava-bom</artifactId>
135-
<version>${guava.version}</version>
107+
<groupId>com.google.cloud</groupId>
108+
<artifactId>google-cloud-shared-dependencies</artifactId>
109+
<version>0.8.1</version>
136110
<type>pom</type>
137111
<scope>import</scope>
138112
</dependency>
139113

140-
<dependency>
141-
<groupId>com.google.protobuf</groupId>
142-
<artifactId>protobuf-java</artifactId>
143-
<version>${protobuf.version}</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>com.google.api</groupId>
147-
<artifactId>api-common</artifactId>
148-
<version>${google.api-common.version}</version>
149-
</dependency>
150-
<dependency>
151-
<groupId>com.google.api.grpc</groupId>
152-
<artifactId>proto-google-common-protos</artifactId>
153-
<version>${google.common-protos.version}</version>
154-
</dependency>
155-
<dependency>
156-
<groupId>com.google.cloud</groupId>
157-
<artifactId>google-cloud-core</artifactId>
158-
<version>${google.core.version}</version>
159-
</dependency>
160-
<dependency>
161-
<groupId>org.threeten</groupId>
162-
<artifactId>threetenbp</artifactId>
163-
<version>${threeten.version}</version>
164-
</dependency>
165-
<dependency>
166-
<groupId>javax.annotation</groupId>
167-
<artifactId>javax.annotation-api</artifactId>
168-
<version>${javax.annotations.version}</version>
169-
</dependency>
170-
<dependency>
171-
<groupId>org.codehaus.mojo</groupId>
172-
<artifactId>animal-sniffer-annotations</artifactId>
173-
<version>${animal-sniffer.version}</version>
174-
</dependency>
175-
<dependency>
176-
<groupId>com.google.api.grpc</groupId>
177-
<artifactId>proto-google-iam-v1</artifactId>
178-
<version>${google.proto-iam-v1.version}</version>
179-
</dependency>
180-
181114
<dependency>
182115
<groupId>junit</groupId>
183116
<artifactId>junit</artifactId>
184-
<version>${junit.version}</version>
185-
<scope>test</scope>
186-
</dependency>
187-
<dependency>
188-
<groupId>com.google.api</groupId>
189-
<artifactId>gax-grpc</artifactId>
190-
<version>${gax.version}</version>
191-
<classifier>testlib</classifier>
117+
<version>4.13</version>
192118
<scope>test</scope>
193119
</dependency>
194120
</dependencies>
@@ -282,7 +208,7 @@
282208
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
283209
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
284210
<link>https://googleapis.dev/java/gax/latest/</link>
285-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
211+
<link>https://googleapis.github.io/api-common-java/</link>
286212
</links>
287213
</configuration>
288214
</plugin>

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

+9
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

‎proto-google-cloud-tasks-v2beta2/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

‎proto-google-cloud-tasks-v2beta3/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

0 commit comments

Comments
 (0)