Remove unnecessary JARs from HPI (#362)

jenkinsci · Dec 13, 2023 · 8c9c0ae · 8c9c0ae
1 parent e2419ed
commit 8c9c0ae
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,10 +91,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
@@ -132,10 +128,6 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>google-oauth-plugin</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci</groupId>
-      <artifactId>annotation-indexer</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -164,6 +156,11 @@
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+        <!-- Provided by core -->
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
@@ -190,6 +187,7 @@
           <groupId>com.google.http-client</groupId>
           <artifactId>google-http-client</artifactId>
         </exclusion>
+        <!-- Provided by core -->
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
@@ -214,6 +212,13 @@
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
       <version>2.8.0</version>
+      <exclusions>
+        <!-- Provided by core -->
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>

diff --git a/src/main/java/com/google/jenkins/plugins/k8sengine/KubernetesEngineBuilder.java b/src/main/java/com/google/jenkins/plugins/k8sengine/KubernetesEngineBuilder.java
@@ -33,6 +33,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.jenkins.plugins.credentials.oauth.GoogleOAuth2Credentials;
 import com.google.jenkins.plugins.k8sengine.client.ClientUtil;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.Extension;
 import hudson.FilePath;
@@ -57,7 +58,6 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
 import jenkins.model.Jenkins;
 import jenkins.tasks.SimpleBuildStep;
 import org.jenkinsci.Symbol;
@@ -236,10 +236,10 @@ void pushAfterBuildStep(KubeConfigAfterBuildStep afterBuildStep) {
   /** {@inheritDoc} */
   @Override
   public void perform(
-      @Nonnull Run<?, ?> run,
-      @Nonnull FilePath workspace,
-      @Nonnull Launcher launcher,
-      @Nonnull TaskListener listener)
+      @NonNull Run<?, ?> run,
+      @NonNull FilePath workspace,
+      @NonNull Launcher launcher,
+      @NonNull TaskListener listener)
       throws InterruptedException, IOException {
     LOGGER.log(
         Level.INFO,
@@ -363,7 +363,7 @@ public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
     private String defaultProjectId;
     private String credentialsId;
 
-    @Nonnull
+    @NonNull
     @Override
     public String getDisplayName() {
       return Messages.KubernetesEngineBuilder_DisplayName();

diff --git a/src/main/java/com/google/jenkins/plugins/k8sengine/VerificationTask.java b/src/main/java/com/google/jenkins/plugins/k8sengine/VerificationTask.java
@@ -14,13 +14,13 @@
 
 package com.google.jenkins.plugins.k8sengine;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.PrintStream;
 import java.time.Duration;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
@@ -96,9 +96,9 @@ private VerificationTask verify() {
    * @return If the {@link Manifests.ManifestObject}'s were successfully verified.
    */
   public static boolean verifyObjects(
-      @Nonnull KubectlWrapper kubectl,
-      @Nonnull List<Manifests.ManifestObject> manifestObjects,
-      @Nonnull PrintStream consoleLogger,
+      @NonNull KubectlWrapper kubectl,
+      @NonNull List<Manifests.ManifestObject> manifestObjects,
+      @NonNull PrintStream consoleLogger,
       int timeoutInMinutes) {
     List<VerificationTask> verificationTasks =
         manifestObjects.stream()