Merge branch 'master' into log-ignored-branches

Author: jimklimov

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.0-beta-7</version>
+    <version>1.2</version>
   </extension>
 </extensions>

pom.xml

@@ -26,7 +26,7 @@
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
         <java.level>8</java.level>
-        <jenkins.version>2.283</jenkins.version>
+        <jenkins.version>2.289.1</jenkins.version>
         <useBeta>true</useBeta>
     </properties>
 
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8-standalone</artifactId>
-            <version>2.28.1</version>
+            <version>2.29.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -118,8 +118,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.277.x</artifactId>
-                <version>872.v03c18fa35487</version>
+                <artifactId>bom-2.289.x</artifactId>
+                <version>887.vae9c8ac09ff7</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -128,12 +128,6 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>3.11</version>
             </dependency>
-            <!-- TODO remove once branch-api >= 2.6.3 in bom -->
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>branch-api</artifactId>
-                <version>2.6.3</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>

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

@@ -1881,7 +1881,7 @@ public List<SCMTrait<? extends SCMTrait<?>>> getTraitsDefaults() {
       IconSet.icons.addIcon(
           new Icon(
               "icon-github-repo icon-xlg",
-              "github-branch-source/images/svgs/sprite-github.svg#github-repo",
+              "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo",
               Icon.ICON_XLARGE_STYLE,
               IconFormat.EXTERNAL_SVG_SPRITE));