Merge pull request #162 from jenkinsci/modern-pom

Modernize the pom

pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.24</version>
+    <version>4.47</version>
   </parent>
 
   <!--
@@ -31,7 +31,6 @@
   <packaging>hpi</packaging>
 
   <name>Google OAuth Credentials plugin</name>
-  <description>This plugin implements the OAuth Credentials interfaces to surface Google Service Account credentials to Jenkins.</description>
   <url>https://github.com/jenkinsci/google-oauth-plugin/blob/develop/docs/home.md</url>
   <licenses>
     <license>
@@ -67,12 +66,11 @@
 
   <!-- Bring some sanity to version numbering... -->
   <properties>
-    <jenkins.version>2.222.4</jenkins.version>
+    <jenkins.version>2.319.3</jenkins.version>
     <hpi.compatibleSinceVersion>1.0.0</hpi.compatibleSinceVersion>
     <google.api.version>1.32.1</google.api.version>
     <oauth2.revision>20200213</oauth2.revision>
     <lombok.version>1.18.24</lombok.version>
-    <java.level>8</java.level>
     <spotbugs.effort>Max</spotbugs.effort>
     <doclint>none</doclint>
     <runSuite>**/GoogleOAuthPluginTestSuite.class</runSuite>
@@ -82,16 +80,16 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.222.x</artifactId>
-        <version>887.vae9c8ac09ff7</version>
+        <artifactId>bom-2.319.x</artifactId>
+        <version>1607.va_c1576527071</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <!-- Ensures version compatibility: https://googleapis.github.io/google-http-java-client/setup.html -->
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>20.9.0</version>
+        <version>26.1.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -180,7 +178,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>oauth-credentials</artifactId>
-      <version>0.4</version>
+      <version>0.5</version>
     </dependency>
     <!-- com.google.http-client -->
     <dependency>

src/main/java/com/google/jenkins/plugins/credentials/oauth/GoogleRobotMetadataCredentials.java

@@ -26,11 +26,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.jenkins.plugins.util.ExecutorException;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**

src/main/java/com/google/jenkins/plugins/credentials/oauth/GoogleRobotPrivateKeyCredentials.java

@@ -22,13 +22,13 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.DataBoundConstructor;
 

src/main/java/com/google/jenkins/plugins/credentials/oauth/JsonServiceAccountConfig.java

@@ -19,6 +19,7 @@
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.util.PemReader;
 import com.google.api.client.util.Strings;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import java.io.ByteArrayInputStream;
@@ -31,7 +32,6 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.CheckForNull;
 import jenkins.model.Jenkins;
 import org.apache.commons.fileupload.FileItem;
 import org.kohsuke.accmod.Restricted;

src/main/java/com/google/jenkins/plugins/credentials/oauth/P12ServiceAccountConfig.java

@@ -17,6 +17,7 @@
 
 import com.cloudbees.plugins.credentials.SecretBytes;
 import com.google.api.client.util.Strings;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import java.io.ByteArrayInputStream;
@@ -30,7 +31,6 @@
 import java.security.cert.CertificateException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.CheckForNull;
 import jenkins.model.Jenkins;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.IOUtils;

src/main/java/com/google/jenkins/plugins/credentials/oauth/RemotableGoogleCredentials.java

@@ -21,6 +21,7 @@
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.common.collect.Ordering;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import org.joda.time.DateTime;
@@ -42,6 +43,9 @@ final class RemotableGoogleCredentials extends GoogleRobotCredentials {
    * is {@code package-private}. This should only be called from {@link
    * GoogleRobotCredentials#forRemote}.
    */
+  @SuppressFBWarnings(
+      value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
+      justification = "False positive from what I can see in Ordering.natural().nullsFirst()")
   public RemotableGoogleCredentials(
       GoogleRobotCredentials credentials,
       GoogleOAuth2ScopeRequirement requirement,

src/main/java/com/google/jenkins/plugins/credentials/oauth/ServiceAccountConfig.java

@@ -17,14 +17,14 @@
 
 import com.cloudbees.plugins.credentials.SecretBytes;
 import com.google.common.base.Strings;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.Describable;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.PrivateKey;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.CheckForNull;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.FileUtils;
 

src/main/resources/index.jelly

@@ -0,0 +1,4 @@
+<?jelly escape-by-default='true'?>
+<div>
+    This plugin implements the OAuth Credentials interfaces to surface Google Service Account credentials to Jenkins.
+</div>