Merge branch 'master' into apiUri

Author: carlossg

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.16</version>
+        <version>4.18</version>
         <relativePath />
     </parent>
     <artifactId>github-branch-source</artifactId>
@@ -23,16 +23,17 @@
     <properties>
         <revision>2.10.3</revision>
         <changelist>-SNAPSHOT</changelist>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
         <java.level>8</java.level>
-        <jenkins.version>2.271</jenkins.version>
+        <jenkins.version>2.283</jenkins.version>
         <useBeta>true</useBeta>
     </properties>
 
     <scm>
-        <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-        <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-        <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
     <dependencies>
@@ -117,8 +118,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.263.x</artifactId>
-                <version>23</version>
+                <artifactId>bom-2.277.x</artifactId>
+                <version>28</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -140,7 +141,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>2.10.1</version>
                 <executions>
                     <execution>
                         <id>spotless-check</id>

src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java

@@ -171,6 +171,33 @@ private static void configureThreadLocalChecker(TaskListener listener, String ap
     localRateLimitChecker.set(checker);
   }
 
+  /**
+   * Verify a GitHub connection
+   *
+   * <p>WARNING: this call is not protected by rate limit checking. It is possible to exceed the
+   * rate limit by calling this method.
+   *
+   * <p>This method should only be called from {@link Connector}. This works without any locking
+   * because the checker is local to this thread.
+   *
+   * @param gitHub the GitHub connection to check for validity
+   */
+  static void verifyConnection(GitHub gitHub) throws IOException {
+    Objects.requireNonNull(gitHub);
+    LocalChecker checker = getLocalChecker();
+    try {
+      TaskListener listener =
+          checker != null ? checker.listener : new LogTaskListener(LOGGER, Level.INFO);
+
+      // Pass empty apiUrl to force no rate limit checking
+      localRateLimitChecker.set(NoThrottle.getChecker(listener, ""));
+
+      gitHub.checkApiUrlValidity();
+    } finally {
+      localRateLimitChecker.set(checker);
+    }
+  }
+
   /** For test purposes only. */
   static LocalChecker getLocalChecker() {
     return localRateLimitChecker.get();