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

Commit caa7ac7

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#174)
1 parent 402e94d commit caa7ac7

File tree

7 files changed

+53
-74
lines changed

7 files changed

+53
-74
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
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-scheduler/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,13 @@
122122
</dependencies>
123123
</profile>
124124
</profiles>
125+
126+
<build>
127+
<plugins>
128+
<plugin>
129+
<groupId>org.codehaus.mojo</groupId>
130+
<artifactId>flatten-maven-plugin</artifactId>
131+
</plugin>
132+
</plugins>
133+
</build>
125134
</project>

‎grpc-google-cloud-scheduler-v1/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@
5353
</dependencies>
5454
</profile>
5555
</profiles>
56+
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.codehaus.mojo</groupId>
61+
<artifactId>flatten-maven-plugin</artifactId>
62+
</plugin>
63+
</plugins>
64+
</build>
5665
</project>

‎grpc-google-cloud-scheduler-v1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@
5353
</dependencies>
5454
</profile>
5555
</profiles>
56+
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.codehaus.mojo</groupId>
61+
<artifactId>flatten-maven-plugin</artifactId>
62+
</plugin>
63+
</plugins>
64+
</build>
5665
</project>

‎pom.xml‎

Lines changed: 5 additions & 73 deletions
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-scheduler-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>
@@ -105,67 +94,17 @@
10594
</dependency>
10695

10796
<dependency>
108-
<groupId>io.grpc</groupId>
109-
<artifactId>grpc-bom</artifactId>
110-
<version>${grpc.version}</version>
111-
<type>pom</type>
112-
<scope>import</scope>
113-
</dependency>
114-
<dependency>
115-
<groupId>com.google.api</groupId>
116-
<artifactId>gax-bom</artifactId>
117-
<version>${gax.version}</version>
118-
<type>pom</type>
119-
<scope>import</scope>
120-
</dependency>
121-
<dependency>
122-
<groupId>com.google.guava</groupId>
123-
<artifactId>guava-bom</artifactId>
124-
<version>${guava.version}</version>
97+
<groupId>com.google.cloud</groupId>
98+
<artifactId>google-cloud-shared-dependencies</artifactId>
99+
<version>0.8.1</version>
125100
<type>pom</type>
126101
<scope>import</scope>
127102
</dependency>
128103

129-
<dependency>
130-
<groupId>com.google.protobuf</groupId>
131-
<artifactId>protobuf-java</artifactId>
132-
<version>${protobuf.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>com.google.api</groupId>
136-
<artifactId>api-common</artifactId>
137-
<version>${google.api-common.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>com.google.api.grpc</groupId>
141-
<artifactId>proto-google-common-protos</artifactId>
142-
<version>${google.common-protos.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>com.google.cloud</groupId>
146-
<artifactId>google-cloud-core</artifactId>
147-
<version>${google.core.version}</version>
148-
</dependency>
149-
<dependency>
150-
<groupId>org.threeten</groupId>
151-
<artifactId>threetenbp</artifactId>
152-
<version>${threeten.version}</version>
153-
</dependency>
154-
<dependency>
155-
<groupId>javax.annotation</groupId>
156-
<artifactId>javax.annotation-api</artifactId>
157-
<version>${javax.annotations.version}</version>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.codehaus.mojo</groupId>
161-
<artifactId>animal-sniffer-annotations</artifactId>
162-
<version>${animal-sniffer.version}</version>
163-
</dependency>
164-
165104
<dependency>
166105
<groupId>junit</groupId>
167106
<artifactId>junit</artifactId>
168-
<version>${junit.version}</version>
107+
<version>4.13</version>
169108
<scope>test</scope>
170109
</dependency>
171110
<!-- google-cloud-pubsub is used for testing -->
@@ -176,13 +115,6 @@
176115
<type>pom</type>
177116
<scope>import</scope>
178117
</dependency>
179-
<dependency>
180-
<groupId>com.google.api</groupId>
181-
<artifactId>gax-grpc</artifactId>
182-
<version>${gax.version}</version>
183-
<classifier>testlib</classifier>
184-
<scope>test</scope>
185-
</dependency>
186118
</dependencies>
187119
</dependencyManagement>
188120

@@ -272,7 +204,7 @@
272204
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
273205
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
274206
<link>https://googleapis.dev/java/gax/latest/</link>
275-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
207+
<link>https://googleapis.github.io/api-common-java/</link>
276208
</links>
277209
</configuration>
278210
</plugin>

‎proto-google-cloud-scheduler-v1/pom.xml‎

Lines changed: 9 additions & 0 deletions
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>

‎proto-google-cloud-scheduler-v1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
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>

0 commit comments

Comments
 (0)