Require Jenkins 2.479.1 and Jakarta EE 9

Author: strangelookingnerd

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
 
       - run: mvn --batch-mode verify

.github/workflows/codecov.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
 
       - name: Generate code coverage

pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.88</version>
+        <version>5.7</version>
         <relativePath />
     </parent>
 
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -27,8 +27,8 @@
         <revision>5.0.1</revision>
         <changelist>-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.414</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
 
         <gitHubRepo>jenkinsci/office-365-connector-plugin</gitHubRepo>
 
@@ -44,7 +44,7 @@
                      https://repo.jenkins-ci.org/artifactory/public/io/jenkins/tools/bom/
 				     https://www.jenkins.io/doc/developer/plugin-development/dependency-management/#jenkins-plugin-bom
 				-->
-                <version>2982.vdce2153031a_0</version>
+                <version>4051.v78dce3ce8b_d6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -99,12 +99,6 @@
             <artifactId>commons-validator</artifactId>
             <version>1.7</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>findbugs-annotations</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -143,14 +137,14 @@
             <name>Out conn</name>
             <email>outconn@microsoft.com</email>
             <organization>Microsoft Corp.</organization>
-            <organizationUrl>http://microsoft.com</organizationUrl>
+            <organizationUrl>https://microsoft.com</organizationUrl>
         </developer>
         <developer>
             <id>srhebbar</id>
             <name>Srivardhan Hebbar</name>
             <email>srhebbar@microsoft.com</email>
             <organization>Microsoft Corp.</organization>
-            <organizationUrl>http://microsoft.com</organizationUrl>
+            <organizationUrl>https://microsoft.com</organizationUrl>
         </developer>
     </developers>
 

src/main/java/jenkins/plugins/office365connector/FactsBuilder.java

@@ -80,10 +80,9 @@ public void addRemarks() {
     }
 
     public void addCommitters() {
-        if (!(run instanceof RunWithSCM)) {
+        if (!(run instanceof RunWithSCM runWithSCM)) {
             return;
         }
-        RunWithSCM runWithSCM = (RunWithSCM) run;
         Set<User> authors = runWithSCM.getCulprits();
 
         String joinedCommitters = authors.stream()
@@ -93,10 +92,9 @@ public void addCommitters() {
     }
 
     public void addDevelopers() {
-        if (!(run instanceof RunWithSCM)) {
+        if (!(run instanceof RunWithSCM runWithSCM)) {
             return;
         }
-        RunWithSCM runWithSCM = (RunWithSCM) run;
 
         List<ChangeLogSet<ChangeLogSet.Entry>> sets = runWithSCM.getChangeSets();
 

src/main/java/jenkins/plugins/office365connector/HttpWorker.java

@@ -111,7 +111,7 @@ private CloseableHttpClient getHttpClient() {
                 if (!isNoProxyHost(this.url, noHostProxyPatterns)) {
                     builder.setProxy(new HttpHost(proxy.name, proxy.port));
                     String username = proxy.getUserName();
-                    String password = proxy.getPassword();
+                    String password = proxy.getSecretPassword().getPlainText();
                     // Consider it to be passed if username specified. Sufficient?
                     if (StringUtils.isNotBlank(username)) {
                         CredentialsProvider credsProvider = new BasicCredentialsProvider();

src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java

@@ -112,7 +112,7 @@ public void sendBuildStepNotification(StepParameters stepParameters) {
     private void executeWorker(Webhook webhook, Card card) {
         try {
             String url = run.getEnvironment(taskListener).expand(webhook.getUrl());
-            String data = gson.toJson(card == null ? null : card.toPaylod());
+            String data = gson.toJson(card == null ? null : card.toPayload());
             HttpWorker worker = new HttpWorker(url, data, webhook.getTimeout(), taskListener.getLogger());
             worker.submit();
         } catch (IOException | InterruptedException | RejectedExecutionException e) {

src/main/java/jenkins/plugins/office365connector/Webhook.java

@@ -31,7 +31,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class Webhook extends AbstractDescribableImpl<Webhook> {
 
@@ -258,7 +258,7 @@ public void setGlobalName(String name) {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject formData) {
+        public boolean configure(StaplerRequest2 req, JSONObject formData) {
             req.bindJSON(this, formData);
             save();
             return true;

src/main/java/jenkins/plugins/office365connector/WebhookJobPropertyDescriptor.java

@@ -23,7 +23,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 @Symbol("office365ConnectorWebhooks")
@@ -56,7 +56,7 @@ public String getDisplayName() {
     }
 
     @Override
-    public WebhookJobProperty newInstance(StaplerRequest req, JSONObject formData) {
+    public WebhookJobProperty newInstance(StaplerRequest2 req, JSONObject formData) {
 
         List<Webhook> webhooks = new ArrayList<>();
         if (formData != null && !formData.isNullObject()) {
@@ -75,7 +75,7 @@ public WebhookJobProperty newInstance(StaplerRequest req, JSONObject formData) {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject formData) {
+    public boolean configure(StaplerRequest2 req, JSONObject formData) {
         save();
         return true;
     }

src/main/java/jenkins/plugins/office365connector/model/Card.java

@@ -4,7 +4,7 @@
 
 public interface Card {
 
-    public Object toPaylod();
+    Object toPayload();
 
     void setAction(List<CardAction> actions);
 

src/main/java/jenkins/plugins/office365connector/model/Fact.java

@@ -2,9 +2,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * <p>
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.