From 16f3070ee6fff6ef51af99739ad8f71c46d89f84 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Thu, 14 Dec 2023 11:48:33 -0800
Subject: [PATCH] EOL JSR 305 (#427)

---
 pom.xml                                                       | 4 ++++
 .../jenkins/plugins/computeengine/ComputeEngineCloud.java     | 3 +--
 .../jenkins/plugins/computeengine/ComputeEngineInstance.java  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5574abb6..33f47549 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,10 @@
       <artifactId>google-http-client</artifactId>
       <version>${google.http.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
         <!-- Provided by Jenkins core -->
         <exclusion>
           <groupId>com.google.guava</groupId>
diff --git a/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineCloud.java b/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineCloud.java
index e3addf1a..7611640b 100644
--- a/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineCloud.java
+++ b/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineCloud.java
@@ -62,7 +62,6 @@
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import lombok.Getter;
@@ -446,7 +445,7 @@ static void checkPermissions(@NonNull AccessControlled context, Permission... pe
     @Extension
     public static class GoogleCloudDescriptor extends Descriptor<Cloud> {
 
-        @Nonnull
+        @NonNull
         @Override
         public String getDisplayName() {
             return Messages.ComputeEngineCloud_DisplayName();
diff --git a/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineInstance.java b/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineInstance.java
index 5f8baff9..ec0f92a2 100644
--- a/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineInstance.java
+++ b/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineInstance.java
@@ -19,6 +19,7 @@
 import com.google.cloud.graphite.platforms.plugin.client.ComputeClient.OperationException;
 import com.google.common.base.Strings;
 import com.google.jenkins.plugins.computeengine.ssh.GoogleKeyCredential;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
 import hudson.model.Computer;
 import hudson.model.Descriptor;
@@ -32,7 +33,6 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
 import jenkins.model.Jenkins;
 import lombok.Builder;
 import lombok.Getter;