Merge pull request #645 from basil/pom

Refresh plugin for December 2022

Author: jglick

Jenkinsfile

@@ -1,5 +1,4 @@
-buildPlugin(configurations: [
-    [ platform: "linux", jdk: "8"],
-    [ platform: "windows", jdk: "8"],
-    [ platform: "linux", jdk: "11" ]
+buildPlugin(useContainerAgent: true, configurations: [
+  [platform: 'linux', jdk: 17],
+  [platform: 'windows', jdk: 11],
 ])

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.47</version>
+        <version>4.53</version>
         <relativePath />
     </parent>
     <artifactId>github-branch-source</artifactId>
@@ -24,7 +24,7 @@
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
-        <jenkins.version>2.346.1</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
         <useBeta>true</useBeta>
     </properties>
 
@@ -38,12 +38,11 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>github-api</artifactId>
-            <version>1.303-400.v35c2d8258028</version>
         </dependency>
         <dependency>
             <groupId>com.coravy.hudson.plugins.github</groupId>
             <artifactId>github</artifactId>
-            <version>1.34.3</version>
+            <version>1.36.0</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -71,7 +70,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8-standalone</artifactId>
-            <version>2.33.2</version>
+            <version>2.35.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -112,7 +111,6 @@
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>pipeline-groovy-lib</artifactId>
-            <version>612.v84da_9c54906d</version> <!-- TODO until in BOM -->
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -136,24 +134,19 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.346.x</artifactId>
-                <version>1595.v8c71c13cc3a_9</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>1750.v0071fa_4c4a_e3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.12.0</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
         <plugins>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.24.1</version>
+                <version>2.28.0</version>
                 <executions>
                     <execution>
                         <id>spotless-check</id>

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

@@ -108,7 +108,7 @@ public String getMergeHash() {
   }
 
   void validateMergeHash() throws AbortException {
-    if (this.mergeHash == NOT_MERGEABLE_HASH) {
+    if (NOT_MERGEABLE_HASH.equals(this.mergeHash)) {
       throw new AbortException(
           "Pull request "
               + ((PullRequestSCMHead) this.getHead()).getNumber()