Use Guava from Jenkins core (#268)

jenkinsci · Dec 7, 2023 · 03a57b0 · 03a57b0
1 parent c9ac797
commit 03a57b0
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,6 @@
     <hpi.compatibleSinceVersion>1.5.0</hpi.compatibleSinceVersion>
     <google.api.version>1.35.2</google.api.version>
     <google.http.version>1.43.3</google.http.version>
-    <google.guava.version>32.1.2-jre</google.guava.version>
     <google-oauth.version>1.34.1</google-oauth.version>
     <storage.revision>20220705</storage.revision>
     <concurrency>5</concurrency>
@@ -158,6 +157,10 @@
           <groupId>com.google.http-client</groupId>
           <artifactId>google-http-client</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpcore</artifactId>
@@ -181,6 +184,10 @@
           <groupId>com.google.http-client</groupId>
           <artifactId>google-http-client</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -192,6 +199,10 @@
           <groupId>com.google.code.findbugs</groupId>
           <artifactId>jsr305</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
@@ -213,18 +224,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- com.google.guava -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${google.guava.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <!-- org.joda.time -->
     <dependency>
       <groupId>joda-time</groupId>
@@ -375,13 +374,6 @@
           <reuseForks>false</reuseForks>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.jenkins-ci.tools</groupId>
-        <artifactId>maven-hpi-plugin</artifactId>
-        <configuration>
-          <maskClasses>com.google.common.</maskClasses>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>