Skip to content

Commit e2419ed

Browse files
authored
Use Guava from Jenkins core (#360)
1 parent f8e1267 commit e2419ed

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

pom.xml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<changelist>999999-SNAPSHOT</changelist>
6868
<gitHubRepo>jenkinsci/google-kubernetes-engine-plugin</gitHubRepo>
6969
<jenkins.version>2.387.3</jenkins.version>
70-
<google.guava.version>32.1.2-jre</google.guava.version>
7170
<google.api.version>1.25.0</google.api.version>
7271
<google.http.version>1.42.2</google.http.version>
7372
<cloudresourcemanager.revision>572</cloudresourcemanager.revision>
@@ -156,19 +155,6 @@
156155
<artifactId>gcp-client</artifactId>
157156
<version>${gcp-plugin-core.version}</version>
158157
</dependency>
159-
<dependency>
160-
<groupId>com.google.guava</groupId>
161-
<artifactId>guava</artifactId>
162-
<version>${google.guava.version}</version>
163-
<exclusions>
164-
<!-- We use the one from git:4.4.5: 2.3.4. Newer than
165-
the one here: 2.1.3 -->
166-
<exclusion>
167-
<groupId>com.google.errorprone</groupId>
168-
<artifactId>error_prone_annotations</artifactId>
169-
</exclusion>
170-
</exclusions>
171-
</dependency>
172158
<dependency>
173159
<groupId>com.google.http-client</groupId>
174160
<artifactId>google-http-client</artifactId>
@@ -178,6 +164,10 @@
178164
<groupId>org.apache.httpcomponents</groupId>
179165
<artifactId>httpclient</artifactId>
180166
</exclusion>
167+
<exclusion>
168+
<groupId>com.google.guava</groupId>
169+
<artifactId>guava</artifactId>
170+
</exclusion>
181171
</exclusions>
182172
</dependency>
183173
<dependency>
@@ -200,6 +190,10 @@
200190
<groupId>com.google.http-client</groupId>
201191
<artifactId>google-http-client</artifactId>
202192
</exclusion>
193+
<exclusion>
194+
<groupId>com.google.guava</groupId>
195+
<artifactId>guava</artifactId>
196+
</exclusion>
203197
</exclusions>
204198
</dependency>
205199
<dependency>

0 commit comments

Comments
 (0)