Skip to content

Commit 6b0947b

Browse files
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#259)
1 parent ec7b3fa commit 6b0947b

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ api_key
4040
# Python utilities
4141
*.pyc
4242
artman-genfiles
43+
44+
.flattened-pom.xml

google-cloud-pubsub/pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<dependency>
8686
<groupId>com.google.auto.value</groupId>
8787
<artifactId>auto-value-annotations</artifactId>
88-
<version>${autovalue.version}</version>
8988
</dependency>
9089
<dependency>
9190
<groupId>com.google.http-client</groupId>
@@ -163,11 +162,16 @@
163162
<path>
164163
<groupId>com.google.auto.value</groupId>
165164
<artifactId>auto-value</artifactId>
166-
<version>${autovalue.version}</version>
165+
<version>${auto-value-annotation.version}</version>
167166
</path>
168167
</annotationProcessorPaths>
169168
</configuration>
170169
</plugin>
170+
171+
<plugin>
172+
<groupId>org.codehaus.mojo</groupId>
173+
<artifactId>flatten-maven-plugin</artifactId>
174+
</plugin>
171175
</plugins>
172176
</build>
173177

@@ -181,7 +185,6 @@
181185
<dependency>
182186
<groupId>javax.annotation</groupId>
183187
<artifactId>javax.annotation-api</artifactId>
184-
<version>${javax.annotations.version}</version>
185188
</dependency>
186189
</dependencies>
187190
</profile>

grpc-google-cloud-pubsub-v1/pom.xml

+9
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

+2-11
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-pubsub-parent</site.installationModule>
66-
<easymock.version>4.2</easymock.version>
67-
<javax.annotations.version>1.3.2</javax.annotations.version>
68-
<errorprone.version>2.4.0</errorprone.version>
69-
<autovalue.version>1.7.3</autovalue.version>
7066
</properties>
7167

7268
<dependencyManagement>
@@ -95,15 +91,10 @@
9591
<version>1.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
9692
</dependency>
9793

98-
<dependency>
99-
<groupId>javax.annotation</groupId>
100-
<artifactId>javax.annotation-api</artifactId>
101-
<version>${javax.annotations.version}</version>
102-
</dependency>
10394
<dependency>
10495
<groupId>com.google.errorprone</groupId>
10596
<artifactId>error_prone_annotations</artifactId>
106-
<version>${errorprone.version}</version>
97+
<version>2.4.0</version>
10798
</dependency>
10899

109100
<!-- Test dependencies -->
@@ -116,7 +107,7 @@
116107
<dependency>
117108
<groupId>org.easymock</groupId>
118109
<artifactId>easymock</artifactId>
119-
<version>${easymock.version}</version>
110+
<version>4.2</version>
120111
<scope>test</scope>
121112
</dependency>
122113
<dependency>

proto-google-cloud-pubsub-v1/pom.xml

+9
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)