Refresh plugin for 2023 (#382)

Author: timja

.github/dependabot.yml

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":semanticCommitsDisabled"
+  ],
+  "automerge": true,
+  "labels": [
+    "dependencies"
+  ],
+  "rebaseWhen": "conflicted"
+}

.github/release-drafter.yml

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

.github/renovate.json

@@ -1,5 +1,10 @@
-#!/usr/bin/env groovy
-
-
-/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin(useContainerAgent: true, platforms: ['linux'])
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  useContainerAgent: true,
+  configurations: [
+    [platform: 'linux', jdk: 17],
+    [platform: 'linux', jdk: 11],
+])

.mvn/extensions.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.29</version>
+        <version>4.55</version>
     </parent>
 
     <artifactId>azure-vm-agents</artifactId>
@@ -36,21 +36,16 @@
     </developers>
 
     <scm>
-        <connection>scm:git:ssh://git@github.com/${gitHubRepo}.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/${gitHubRepo}.git</developerConnection>
+        <connection>scm:git:https://github.com/${gitHubRepo}</connection>
+        <developerConnection>scm:git:https://github.com/${gitHubRepo}</developerConnection>
         <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
 
     <properties>
         <changelist>9999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/azure-vm-agents-plugin</gitHubRepo>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <jenkins.version>2.277.2</jenkins.version>
-        <java.level>8</java.level>
-        <findbugs.failOnError>true</findbugs.failOnError>
-        <findbugs.excludeFilterFile>findbugs-exclude.xml</findbugs.excludeFilterFile>
+        <jenkins.version>2.361.4</jenkins.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <azure-credentials.version>198.vf9c2fdfde55c</azure-credentials.version>
     </properties>
@@ -59,8 +54,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.277.x</artifactId>
-                <version>966.v3857b7c82032</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>1883.vcb_768a_7c3610</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -71,7 +66,7 @@
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>azure-sdk</artifactId>
-            <version>55.v31806ceca163</version>
+            <version>118.v43f74dd9ca_dc</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -81,7 +76,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.55.2</version>
+            <version>0.1.55.61.va_e9ee26616e7</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

Jenkinsfile

@@ -223,15 +223,9 @@ public void cleanDeployments(long successTimeoutInMinutes, long failTimeoutInMin
                 //    being accepted by Azure.
                 // To avoid this, we implement a retry.  If we hit an exception, we will decrement the number
                 // of retries.  If we hit 0, we remove the deployment from our list.
-                Deployment deployment;
-                try {
-                    deployment = azureClient.deployments().
-                            getByResourceGroup(info.getResourceGroupName(), info.getDeploymentName());
-                } catch (NullPointerException e) {
-                    LOGGER.log(getNormalLoggingLevel(), "Deployment " + info.getDeploymentName()
-                           + " not found, skipping");
-                    continue;
-                }
+                Deployment deployment = azureClient.deployments().
+                        getByResourceGroup(info.getResourceGroupName(), info.getDeploymentName());
+
                 if (deployment == null) {
                     LOGGER.log(getNormalLoggingLevel(), "Deployment " + info.getDeploymentName()
                            + " not found, skipping");

pom.xml

@@ -1560,9 +1560,6 @@ public ListBoxModel doFillExistingStorageAccountNameItems(
                         model.add(storageAccount.name());
                     }
                 }
-
-            } catch (NullPointerException e) {
-                // Do nothing
             } catch (Exception e) {
                 LOGGER.log(Level.WARNING, "Cannot list storage account: ", e);
             }

src/main/java/com/microsoft/azure/vmagent/AzureVMAgentCleanUpTask.java

@@ -1073,12 +1073,12 @@ public static void addLogRecorder(Jenkins h) throws IOException {
                 return;
             }
             LogRecorderManager manager = h.getLog();
-            Map<String, LogRecorder> logRecorders = manager.logRecorders;
-            if (!logRecorders.containsKey(LOG_RECORDER_NAME)) {
-                LogRecorder recorder = new LogRecorder(LOG_RECORDER_NAME);
+            LogRecorder recorder = new LogRecorder(LOG_RECORDER_NAME);
+            List<LogRecorder> logRecorders = manager.getRecorders();
+            if (!logRecorders.contains(recorder)) {
                 String packageName = AzureVMAgent.class.getPackage().getName();
-                recorder.targets.add(new LogRecorder.Target(packageName, Level.WARNING));
-                logRecorders.put(LOG_RECORDER_NAME, recorder);
+                recorder.getLoggers().add(new LogRecorder.Target(packageName, Level.WARNING));
+                logRecorders.add(recorder);
                 recorder.save();
             }
         }