Jenkins Plugin: rebase external on internal version (#53)

Signed-off-by: Mladjan Gadzic <gadzic.mladjan@gmail.com>

Author: mladjan-gadzic

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.18</version>
     <relativePath />
   </parent>
 
@@ -43,21 +43,20 @@
     <changelist>999999-SNAPSHOT</changelist>
     <jenkins.host.address />
     <slaveAgentPort />
-    <jenkins.version>2.462.1</jenkins.version>
-    <bom>2.462.x</bom>
-    <bom.version>3387.v0f2773fa_3200</bom.version>
+    <jenkins.baseline>2.504</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <no-test-jar>false</no-test-jar>
     <useBeta>true</useBeta>
-    <gitHubRepo>armadaproject/${artifactId}</gitHubRepo>
-    <java-client.version>0.0.2</java-client.version>
+    <gitHubRepo>armadaproject/${project.artifactId}</gitHubRepo>
+    <java-client.version>0.0.3</java-client.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-${bom}</artifactId>
-        <version>${bom.version}</version>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
+        <version>5015.vb_52d36583443</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -156,7 +155,7 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-server-mock</artifactId>
-      <version>6.10.0</version>
+      <version>7.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/io/armadaproject/ArmadaMapper.java

@@ -1,4 +1,4 @@
-package io.armadaproject;
+package io.armadaproject.jenkins.plugin.job;
 
 import api.SubmitOuterClass.JobSubmitRequest;
 import api.SubmitOuterClass.JobSubmitRequest.Builder;

src/main/java/io/armadaproject/ClusterConfigParser.java

@@ -1,41 +0,0 @@
-package io.armadaproject;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ClusterConfigParser {
-
-  public static Map<String, String> parse(String configPath) throws Exception {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder builder = factory.newDocumentBuilder();
-    Document doc = builder.parse(configPath);
-
-    doc.getDocumentElement().normalize();
-
-    Map<String, String> clusterMap = new HashMap<>();
-
-    NodeList clusterList = doc.getElementsByTagName("cluster");
-
-    for (int i = 0; i < clusterList.getLength(); i++) {
-      Node clusterNode = clusterList.item(i);
-
-      if (clusterNode.getNodeType() == Node.ELEMENT_NODE) {
-        Element clusterElement = (Element) clusterNode;
-
-        String name = clusterElement.getElementsByTagName("name").item(0).getTextContent();
-        String url = clusterElement.getElementsByTagName("url").item(0).getTextContent();
-
-        clusterMap.put(name, url);
-      }
-    }
-
-    return clusterMap;
-  }
-
-}