From 0f3f165132e1922f66a8afc979598c8833ba99d8 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 18 Apr 2022 08:56:03 -0400
Subject: [PATCH] Update POM & BOM, test on Java 17

---
 Jenkinsfile |  5 ++++-
 pom.xml     | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 85d7f039..651206a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1,4 @@
-buildPlugin(platforms: ['maven', 'windows'])
+buildPlugin(useContainerAgent: true, configurations: [
+  [platform: 'linux', jdk: '17', jenkins: '2.343'],
+  [platform: 'windows', jdk: '8'],
+])
diff --git a/pom.xml b/pom.xml
index f1c7bd7d..3c9cd2a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.39</version>
+    <version>4.40</version>
     <relativePath />
   </parent>
 
@@ -14,14 +14,12 @@
   <packaging>hpi</packaging>
 
   <name>Credentials Binding Plugin</name>
-  <description>Allows credentials to be bound to environment variables for use from miscellaneous build steps.
-  </description>
-  <url>https://github.com/jenkinsci/credentials-binding-plugin</url>
+  <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
   <properties>
     <revision>1.28</revision>
     <changelist>-SNAPSHOT</changelist>
     <jenkins.version>2.319.1</jenkins.version>
-    <java.level>8</java.level>
+    <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
   <licenses>
     <license>
@@ -30,10 +28,10 @@
     </license>
   </licenses>
 
-  <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>
-    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+  <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
+    <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>
 
@@ -55,7 +53,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.319.x</artifactId>
-        <version>1246.va_b_50630c1d19</version>
+        <version>1280.vd669827e38cd</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -65,7 +63,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1087.v16065d268466</version> <!-- TODO until in BOM -->
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>