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

Commit 8063d1d

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#163)
1 parent 4ddd627 commit 8063d1d

File tree

7 files changed

+53
-83
lines changed

7 files changed

+53
-83
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-redis/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,13 @@
111111
</dependencies>
112112
</profile>
113113
</profiles>
114+
115+
<build>
116+
<plugins>
117+
<plugin>
118+
<groupId>org.codehaus.mojo</groupId>
119+
<artifactId>flatten-maven-plugin</artifactId>
120+
</plugin>
121+
</plugins>
122+
</build>
114123
</project>

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

Lines changed: 9 additions & 0 deletions
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-redis-v1beta1/pom.xml‎

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

Lines changed: 5 additions & 82 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-redis-parent</site.installationModule>
66-
<google.core.version>1.93.5</google.core.version>
67-
<google.api-common.version>1.9.1</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.29.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>
@@ -104,84 +93,18 @@
10493
<version>1.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-redis:current} -->
10594
</dependency>
10695

107-
<!-- TODO(chingor): Remove this when protobuf-java-util and gax-httpjson converge -->
10896
<dependency>
109-
<groupId>com.google.code.gson</groupId>
110-
<artifactId>gson</artifactId>
111-
<version>2.8.6</version>
112-
</dependency>
113-
114-
<dependency>
115-
<groupId>io.grpc</groupId>
116-
<artifactId>grpc-bom</artifactId>
117-
<version>${grpc.version}</version>
118-
<type>pom</type>
119-
<scope>import</scope>
120-
</dependency>
121-
<dependency>
122-
<groupId>com.google.api</groupId>
123-
<artifactId>gax-bom</artifactId>
124-
<version>${gax.version}</version>
125-
<type>pom</type>
126-
<scope>import</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>com.google.guava</groupId>
130-
<artifactId>guava-bom</artifactId>
131-
<version>${guava.version}</version>
132-
<type>pom</type>
133-
<scope>import</scope>
134-
</dependency>
135-
<dependency>
136-
<groupId>com.google.protobuf</groupId>
137-
<artifactId>protobuf-bom</artifactId>
138-
<version>${protobuf.version}</version>
97+
<groupId>com.google.cloud</groupId>
98+
<artifactId>google-cloud-shared-dependencies</artifactId>
99+
<version>0.8.1</version>
139100
<type>pom</type>
140101
<scope>import</scope>
141102
</dependency>
142103

143-
<dependency>
144-
<groupId>com.google.api</groupId>
145-
<artifactId>api-common</artifactId>
146-
<version>${google.api-common.version}</version>
147-
</dependency>
148-
<dependency>
149-
<groupId>com.google.api.grpc</groupId>
150-
<artifactId>proto-google-common-protos</artifactId>
151-
<version>${google.common-protos.version}</version>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.threeten</groupId>
155-
<artifactId>threetenbp</artifactId>
156-
<version>${threeten.version}</version>
157-
</dependency>
158-
<dependency>
159-
<groupId>javax.annotation</groupId>
160-
<artifactId>javax.annotation-api</artifactId>
161-
<version>${javax.annotations.version}</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>org.codehaus.mojo</groupId>
165-
<artifactId>animal-sniffer-annotations</artifactId>
166-
<version>${animal-sniffer.version}</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>com.google.cloud</groupId>
170-
<artifactId>google-cloud-core</artifactId>
171-
<version>${google.core.version}</version>
172-
</dependency>
173-
174104
<dependency>
175105
<groupId>junit</groupId>
176106
<artifactId>junit</artifactId>
177-
<version>${junit.version}</version>
178-
<scope>test</scope>
179-
</dependency>
180-
<dependency>
181-
<groupId>com.google.api</groupId>
182-
<artifactId>gax-grpc</artifactId>
183-
<version>${gax.version}</version>
184-
<classifier>testlib</classifier>
107+
<version>4.13</version>
185108
<scope>test</scope>
186109
</dependency>
187110
</dependencies>
@@ -273,7 +196,7 @@
273196
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
274197
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
275198
<link>https://googleapis.dev/java/gax/latest/</link>
276-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
199+
<link>https://googleapis.github.io/api-common-java/</link>
277200
</links>
278201
</configuration>
279202
</plugin>

‎proto-google-cloud-redis-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-redis-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)