Bump libraries and credentials

jenkinsci · Sep 6, 2022 · 67b6201 · 67b6201
1 parent 777ce38
commit 67b6201
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,6 @@
     <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>
@@ -90,7 +89,7 @@
       <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>
@@ -179,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>

diff --git a/src/main/java/com/google/jenkins/plugins/credentials/oauth/RemotableGoogleCredentials.java b/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,