From 8dc327ffd8710b123c2327131207b67aebca5ccb Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 20 Apr 2022 23:04:15 -0700
Subject: [PATCH] Update plugin parent POM and BOM

---
 pom.xml                                        | 18 +++++++++++-------
 src/main/java/hudson/tasks/AntWrapper.java     |  4 ++--
 .../tasks/_ant/AntTargetAnnotationTest.java    |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index d87025f..31cb6cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.31</version>
+    <version>4.40</version>
     <relativePath />
   </parent>
 
@@ -14,8 +14,8 @@
   <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
 
   <scm>
-    <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-    <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
+    <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
     <tag>${scmTag}</tag>
   </scm>
@@ -23,19 +23,23 @@
   <properties>
     <revision>1.14</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>2.249.3</jenkins.version>
-    <java.level>8</java.level>
+    <jenkins.version>2.289.3</jenkins.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.249.x</artifactId>
-        <version>961.vf0c9f6f59827</version>
+        <artifactId>bom-2.289.x</artifactId>
+        <version>1289.v5c4b_1c43511b_</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>
   <dependencies>
diff --git a/src/main/java/hudson/tasks/AntWrapper.java b/src/main/java/hudson/tasks/AntWrapper.java
index 379d84b..1abc058 100644
--- a/src/main/java/hudson/tasks/AntWrapper.java
+++ b/src/main/java/hudson/tasks/AntWrapper.java
@@ -43,7 +43,7 @@
 import hudson.tools.ToolInstallation;
 import java.io.IOException;
 import java.util.Map;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.model.Jenkins;
 import jenkins.tasks.SimpleBuildWrapper;
 import org.jenkinsci.Symbol;
@@ -87,7 +87,7 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
     }
 
     // TODO this is pretty generic and could perhaps be added to SimpleBuildWrapper?
-    private static void toolEnv(Context context, @Nonnull String tool, ToolInstallation[] tools, FilePath workspace, TaskListener listener, EnvVars initialEnvironment) throws IOException, InterruptedException {
+    private static void toolEnv(Context context, @NonNull String tool, ToolInstallation[] tools, FilePath workspace, TaskListener listener, EnvVars initialEnvironment) throws IOException, InterruptedException {
         ToolInstallation inst = null;
         for (ToolInstallation _inst : tools) {
             if (_inst.getName().equals(tool)) {
diff --git a/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java b/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java
index 3869d2a..4c0c6e7 100644
--- a/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java
+++ b/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java
@@ -41,7 +41,7 @@ public void test1() throws Exception {
         AntTargetNote.ENABLED = true;
         WebClient wc = r.createWebClient();
         HtmlPage c = wc.getPage(b, "console");
-        System.out.println(c.asText());
+        System.out.println(c.asNormalizedText());
         DomElement o = c.getElementById("console-outline");
 
         assertEquals(2,o.getByXPath(".//LI").size());