Skip to content

Commit 510f6a5

Browse files
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#156)
1 parent 5d83b9e commit 510f6a5

File tree

5 files changed

+22
-53
lines changed

5 files changed

+22
-53
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@ api_key
4141
*.pyc
4242
artman-genfiles
4343
venv
44+
45+
.flattened-pom.xml

google-cloud-nio-examples/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<skip>true</skip>
4242
</configuration>
4343
</plugin>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>flatten-maven-plugin</artifactId>
47+
</plugin>
4448
</plugins>
4549
</build>
4650
</project>

google-cloud-nio-retrofit/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<skip>false</skip>
2727
</configuration>
2828
</plugin>
29+
<plugin>
30+
<groupId>org.codehaus.mojo</groupId>
31+
<artifactId>flatten-maven-plugin</artifactId>
32+
</plugin>
2933
</plugins>
3034
</build>
3135
</project>

google-cloud-nio/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
</ignoredUnusedDeclaredDependencies>
184184
</configuration>
185185
</plugin>
186+
186187
</plugins>
187188
</build>
188189
</project>

pom.xml

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,18 @@
7272
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7373
<github.global.server>github</github.global.server>
7474
<site.installationModule>google-cloud-storage-nio-parent</site.installationModule>
75-
<junit.version>4.13</junit.version>
76-
<auto-value-annotations.version>1.7.3</auto-value-annotations.version>
77-
<auto-value.version>1.7.3</auto-value.version>
78-
<guava.version>29.0-android</guava.version>
7975
</properties>
8076

8177
<dependencyManagement>
8278
<dependencies>
79+
<dependency>
80+
<groupId>com.google.cloud</groupId>
81+
<artifactId>google-cloud-shared-dependencies</artifactId>
82+
<version>0.8.1</version>
83+
<type>pom</type>
84+
<scope>import</scope>
85+
</dependency>
86+
8387
<dependency>
8488
<groupId>com.google.cloud</groupId>
8589
<artifactId>google-cloud-storage</artifactId>
@@ -94,58 +98,18 @@
9498
<groupId>com.google.auto.value</groupId>
9599
<artifactId>auto-value</artifactId>
96100
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
97-
<version>${auto-value.version}</version>
98-
</dependency>
99-
<dependency>
100-
<groupId>com.google.protobuf</groupId>
101-
<artifactId>protobuf-bom</artifactId>
102-
<version>3.12.2</version>
103-
<type>pom</type>
104-
<scope>import</scope>
101+
<version>${auto-value-annotation.version}</version>
105102
</dependency>
106103
<dependency>
107104
<groupId>com.google.auto.value</groupId>
108105
<artifactId>auto-value-annotations</artifactId>
109-
<version>${auto-value-annotations.version}</version>
110-
</dependency>
111-
<dependency>
112-
<groupId>com.google.cloud</groupId>
113-
<artifactId>google-cloud-core-bom</artifactId>
114-
<version>1.93.6</version>
115-
<type>pom</type>
116-
<scope>import</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>com.google.api</groupId>
120-
<artifactId>gax-bom</artifactId>
121-
<version>1.57.0</version>
122-
<type>pom</type>
123-
<scope>import</scope>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.google.http-client</groupId>
127-
<artifactId>google-http-client-bom</artifactId>
128-
<version>1.35.0</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>
136-
<type>pom</type>
137-
<scope>import</scope>
138-
</dependency>
139-
<dependency>
140-
<groupId>com.google.code.findbugs</groupId>
141-
<artifactId>jsr305</artifactId>
142-
<version>3.0.2</version>
106+
<version>${auto-value-annotation.version}</version>
143107
</dependency>
144108

145109
<dependency>
146110
<groupId>junit</groupId>
147111
<artifactId>junit</artifactId>
148-
<version>${junit.version}</version>
112+
<version>4.13</version>
149113
<scope>test</scope>
150114
</dependency>
151115
<dependency>
@@ -154,12 +118,6 @@
154118
<version>1.0.1</version>
155119
<scope>test</scope>
156120
</dependency>
157-
<dependency>
158-
<groupId>com.google.guava</groupId>
159-
<artifactId>guava-testlib</artifactId>
160-
<version>${guava.version}</version>
161-
<scope>test</scope>
162-
</dependency>
163121
</dependencies>
164122
</dependencyManagement>
165123
<build>

0 commit comments

Comments
 (0)