Require 2.346.3

Author: gounthar

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.13</version>
+    <version>4.51</version>
     <relativePath />
   </parent>
   <groupId>com.qualys.plugins</groupId>
@@ -17,10 +17,21 @@
   <packaging>hpi</packaging>
 
   <properties>
-      <jenkins.version>2.319.3</jenkins.version>
-      <java.version>1.8</java.version>
-    <java.level>8</java.level>
+      <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+      <jenkins.baseline>2.346</jenkins.baseline>
+      <jenkins.version>${jenkins.baseline}.3</jenkins.version>
   </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.jenkins.tools.bom</groupId>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
+        <version>1763.v092b_8980a_f5e</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <build>
   	<finalName>${project.artifactId}_${project.version}</finalName>
@@ -81,12 +92,10 @@
 	  <dependency>
 	    <groupId>org.jenkins-ci.plugins.workflow</groupId>
 	    <artifactId>workflow-step-api</artifactId>
-          <version>639.v6eca_cd8c04a_a_</version>
 	  </dependency>
 	  <dependency>
 	      <groupId>org.jenkins-ci.plugins</groupId>
 	      <artifactId>credentials</artifactId>
-	      <version>2.6.1.1</version>
 	      <optional>true</optional>
 	  </dependency>
 	  <dependency>
@@ -108,7 +117,7 @@
 </dependencies>
 
 <scm>
-	<connection>scm:git:ssh://github.com/jenkinsci/qualys-was-plugin.git</connection>
+	<connection>scm:git:https://github.com/jenkinsci/qualys-was-plugin.git</connection>
 	<developerConnection>scm:git:ssh://[email protected]/jenkinsci/qualys-was-plugin.git</developerConnection>
 	<url>https://github.com/jenkinsci/qualys-was-plugin</url>
     <tag>HEAD</tag>
@@ -117,12 +126,4 @@
 	<name>Qualys Inc.</name>
 	<url>https://www.qualys.com/</url>
 </organization>
-
-<developers>
-	<developer>
-		<id>Qualys</id>
-		<name>Qualys Inc.</name>
-		<email>[email protected]</email>
-	</developer>
-</developers>
 </project>

src/main/java/com/qualys/plugins/wasPlugin/QualysClient/QualysCSClient.java

@@ -8,7 +8,6 @@
     import com.google.gson.JsonParser;
     import com.qualys.plugins.wasPlugin.QualysAuth.QualysAuth;
 
-    import com.sun.org.apache.xerces.internal.impl.dtd.XMLElementDecl;
     import org.apache.http.HttpEntity;
     import org.apache.http.client.methods.CloseableHttpResponse;
     import org.apache.http.client.methods.HttpGet;
@@ -24,9 +23,7 @@
     import java.util.logging.Logger;
 
     import org.apache.http.util.EntityUtils;
-    import org.json.JSONArray;
     import org.json.JSONObject;
-    import org.json.XML;
 
     public class QualysCSClient extends QualysBaseClient {
         HashMap<String, String> apiMap;

src/main/java/com/qualys/plugins/wasPlugin/WASScanBuildStep.java

@@ -30,7 +30,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.qualys.plugins.wasPlugin.WASScanNotifier;
 import com.qualys.plugins.wasPlugin.QualysAuth.QualysAuth;
 import com.qualys.plugins.wasPlugin.QualysClient.QualysCSClient;
 import com.qualys.plugins.wasPlugin.QualysClient.QualysCSResponse;
@@ -43,7 +42,6 @@
 import hudson.model.TaskListener;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
-import hudson.util.Secret;
 import hudson.util.ListBoxModel.Option;
 import jenkins.model.Jenkins;
 

src/main/java/com/qualys/plugins/wasPlugin/WASScanLauncher.java

@@ -10,7 +10,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.commons.lang.StringUtils;
 
 import com.google.gson.JsonArray;

src/main/java/com/qualys/plugins/wasPlugin/util/Helper.java

@@ -5,36 +5,22 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
-import java.io.StringReader;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
 import org.apache.commons.io.FileUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;