Merge branch 'release/1.x' into cleanup

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.3</version>
+    <version>1.7</version>
   </extension>
 </extensions>

Jenkinsfile

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

pom.xml

@@ -3,15 +3,15 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.40</version>
+        <version>4.51</version>
         <relativePath />
     </parent>
     <packaging>hpi</packaging>
     <properties>
         <revision>1.29</revision>
         <changelist>-SNAPSHOT</changelist>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-        <jenkins.version>2.303.1</jenkins.version>
+        <jenkins.version>2.346.3</jenkins.version>
         <hpi.compatibleSinceVersion>1.9</hpi.compatibleSinceVersion>
     </properties>
     <artifactId>stashNotifier</artifactId>
@@ -80,8 +80,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.303.x</artifactId>
-                <version>1382.v7d694476f340</version>
+                <artifactId>bom-2.346.x</artifactId>
+                <version>1763.v092b_8980a_f5e</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

readme.md

@@ -9,7 +9,6 @@ Requirements
 ============
 
 * **[Stash][] 2.1** or newer / **[Bitbucket Server][] 4.0** or newer
-* **Jenkins 2.60.3** or newer
 
 This plugin uses the Atlassian Stash / Bitbucket Server [Build REST API][].
 

src/main/java/org/jenkinsci/plugins/stashNotifier/DefaultApacheHttpNotifier.java

@@ -75,12 +75,11 @@ HttpPost createRequest(
             final JSONObject payload,
             final Credentials credentials,
             @NonNull NotificationContext context) throws AuthenticationException {
-        PrintStream logger = context.getLogger();
         HttpPost req = new HttpPost(uri.toString());
 
         if (credentials != null) {
             if (credentials instanceof UsernamePasswordCredentials) {
-                logger.println("createRequest - UsernamePasswordCredentials");
+                LOGGER.debug("createRequest - UsernamePasswordCredentials");
                 req.addHeader(new BasicScheme().authenticate(
                         new org.apache.http.auth.UsernamePasswordCredentials(
                                 ((UsernamePasswordCredentials)credentials).getUsername(),
@@ -89,7 +88,7 @@ HttpPost createRequest(
                         null));
             }
             else if (credentials instanceof StringCredentials) {
-                logger.println("createRequest - StringCredentials/secret text");
+                LOGGER.debug("createRequest - StringCredentials/secret text");
                 req.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + ((StringCredentials)credentials).getSecret().getPlainText());
             } 
             else {

src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifierModule.java

@@ -49,7 +49,7 @@ HttpNotifierSelector providesHttpNotifierSelector(@StashNotifierDefault HttpNoti
                 .orElse(fallback);
         Class<? extends HttpNotifierSelector> selectedClass = selector.getClass();
         if (selectedClass.getName().equals(preferredHttpNotifierSelector)) {
-            LOGGER.info("Using {}", selectedClass.getName());
+            LOGGER.debug("Using {}", selectedClass.getName());
         } else {
             LOGGER.warn("{} not found - using {}", preferredHttpNotifierSelector, selectedClass.getName());
         }