Skip to content

Commit 209cae3

Browse files
stephaniewang526stephaniewang526
authored
feat: adopt flatten-maven-plugin and java-shared-dependencies (#325)
* feat: adopt flatten-maven-plugin and java-shared-dependencies * add mockito-core v2.28.2 back
1 parent ac580e3 commit 209cae3

File tree

2 files changed

+9
-125
lines changed

2 files changed

+9
-125
lines changed

‎google-cloud-storage/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,11 @@
208208
</plugin>
209209
</plugins>
210210
</pluginManagement>
211+
<plugins>
212+
<plugin>
213+
<groupId>org.codehaus.mojo</groupId>
214+
<artifactId>flatten-maven-plugin</artifactId>
215+
</plugin>
216+
</plugins>
211217
</build>
212218
</project>

‎pom.xml

+3-125
Original file line numberDiff line numberDiff line change
@@ -63,132 +63,23 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-storage-parent</site.installationModule>
66-
<google.core.version>1.93.4</google.core.version>
67-
<google.api-common.version>1.9.0</google.api-common.version>
68-
<junit.version>4.13</junit.version>
69-
<threeten.version>1.4.4</threeten.version>
70-
<javax.annotations.version>1.3.2</javax.annotations.version>
71-
<animal-sniffer.version>1.18</animal-sniffer.version>
72-
<opencensus.version>0.24.0</opencensus.version>
7366
</properties>
7467

7568
<dependencyManagement>
7669
<dependencies>
77-
<dependency>
78-
<groupId>com.google.guava</groupId>
79-
<artifactId>guava</artifactId>
80-
<version>29.0-android</version>
81-
</dependency>
82-
<dependency>
83-
<groupId>com.google.http-client</groupId>
84-
<artifactId>google-http-client-bom</artifactId>
85-
<version>1.35.0</version>
86-
<type>pom</type>
87-
<scope>import</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>com.google.code.gson</groupId>
91-
<artifactId>gson</artifactId>
92-
<version>2.8.6</version>
93-
</dependency>
9470
<dependency>
9571
<groupId>com.google.cloud</groupId>
96-
<artifactId>google-cloud-core-bom</artifactId>
97-
<version>${google.core.version}</version>
98-
<type>pom</type>
99-
<scope>import</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>com.google.auth</groupId>
103-
<artifactId>google-auth-library-bom</artifactId>
104-
<version>0.20.0</version>
105-
<type>pom</type>
106-
<scope>import</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>io.grpc</groupId>
110-
<artifactId>grpc-bom</artifactId>
111-
<version>1.29.0</version>
112-
<type>pom</type>
113-
<scope>import</scope>
114-
</dependency>
115-
<dependency>
116-
<groupId>com.google.api</groupId>
117-
<artifactId>gax-bom</artifactId>
118-
<version>1.56.0</version>
119-
<type>pom</type>
120-
<scope>import</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>com.google.protobuf</groupId>
124-
<artifactId>protobuf-bom</artifactId>
125-
<version>3.11.4</version>
72+
<artifactId>google-cloud-shared-dependencies</artifactId>
73+
<version>0.4.0</version>
12674
<type>pom</type>
12775
<scope>import</scope>
12876
</dependency>
77+
12978
<dependency>
13079
<groupId>com.google.apis</groupId>
13180
<artifactId>google-api-services-storage</artifactId>
13281
<version>v1-rev20200410-1.30.9</version>
13382
</dependency>
134-
<dependency>
135-
<groupId>org.checkerframework</groupId>
136-
<artifactId>checker-compat-qual</artifactId>
137-
<version>2.5.5</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>com.google.code.findbugs</groupId>
141-
<artifactId>jsr305</artifactId>
142-
<version>3.0.2</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>com.google.api</groupId>
146-
<artifactId>api-common</artifactId>
147-
<version>${google.api-common.version}</version>
148-
</dependency>
149-
<dependency>
150-
<groupId>com.google.api.grpc</groupId>
151-
<artifactId>proto-google-iam-v1</artifactId>
152-
<version>0.13.0</version>
153-
</dependency>
154-
<dependency>
155-
<groupId>com.google.api.grpc</groupId>
156-
<artifactId>proto-google-common-protos</artifactId>
157-
<version>1.18.0</version>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.threeten</groupId>
161-
<artifactId>threetenbp</artifactId>
162-
<version>${threeten.version}</version>
163-
</dependency>
164-
<dependency>
165-
<groupId>javax.annotation</groupId>
166-
<artifactId>javax.annotation-api</artifactId>
167-
<version>${javax.annotations.version}</version>
168-
</dependency>
169-
<dependency>
170-
<groupId>org.codehaus.mojo</groupId>
171-
<artifactId>animal-sniffer-annotations</artifactId>
172-
<version>${animal-sniffer.version}</version>
173-
</dependency>
174-
<dependency>
175-
<groupId>io.opencensus</groupId>
176-
<artifactId>opencensus-api</artifactId>
177-
<version>${opencensus.version}</version>
178-
</dependency>
179-
180-
<dependency>
181-
<groupId>junit</groupId>
182-
<artifactId>junit</artifactId>
183-
<version>${junit.version}</version>
184-
<scope>test</scope>
185-
</dependency>
186-
<dependency>
187-
<groupId>com.google.truth</groupId>
188-
<artifactId>truth</artifactId>
189-
<version>1.0.1</version>
190-
<scope>test</scope>
191-
</dependency>
19283
<dependency>
19384
<groupId>org.easymock</groupId>
19485
<artifactId>easymock</artifactId>
@@ -207,19 +98,6 @@
20798
<version>2.6</version>
20899
<scope>test</scope>
209100
</dependency>
210-
<dependency>
211-
<groupId>com.google.cloud</groupId>
212-
<artifactId>google-cloud-core</artifactId>
213-
<version>${google.core.version}</version>
214-
<type>test-jar</type>
215-
<scope>test</scope>
216-
</dependency>
217-
<dependency>
218-
<groupId>com.google.api.grpc</groupId>
219-
<artifactId>grpc-google-iam-v1</artifactId>
220-
<version>0.13.0</version>
221-
<scope>test</scope>
222-
</dependency>
223101
<dependency>
224102
<groupId>com.google.cloud</groupId>
225103
<artifactId>google-cloud-conformance-tests</artifactId>

0 commit comments

Comments
 (0)