Merge pull request #21 from jenkinsci/SEI/bugs/SEI-7025

fix: [SEI-7025]: Removed validation check for jenkins user name and t…
jenkinsci · Aug 7, 2024 · 5b65a73 · 5b65a73
2 parents 937b500 + 11d04c1
commit 5b65a73
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 20 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
 buildPlugin(
   useContainerAgent: true,
   configurations: [
-    [platform: 'linux', jdk: 8],
-    [platform: 'windows', jdk: 8],
+    [platform: 'linux', jdk: 17],
+    [platform: 'windows', jdk: 17],
 ])
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.4</version>
+        <version>4.53</version>
         <relativePath />
     </parent>
 
@@ -17,7 +17,7 @@
     <version>${revision}${changelist}</version>
 
     <name>Propelo's Job Reporter</name>
-    
+
     <description>Reports back to Propelo after each Job Run with metadata and unsuccessful job logs.</description>
     <!-- <display-info>ok</display-info> -->
     <url>https://app.propelo.ai</url>
@@ -93,19 +93,19 @@
         <spotbugs.version>4.7.3</spotbugs.version>
         <findbugs.skip>true</findbugs.skip>
         <spotbugs.skip>true</spotbugs.skip>
-        <java.level>8</java.level>
-        <jenkins.version>2.200</jenkins.version>
+        <java.level>17</java.level>
+        <jenkins.version>2.361.4</jenkins.version>
     </properties>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.2</version><!--$NO-MVN-MAN-VER$ -->
+                <version>3.8.1</version><!--$NO-MVN-MAN-VER$ -->
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -286,7 +286,7 @@
     </dependencies>
 
     <repositories>
-         <repository>
+        <repository>
             <id>central</id>
             <name>central</name>
             <url>https://repo.maven.apache.org/maven2</url>

diff --git a/...resources/io/jenkins/plugins/propelo/job_reporter/extensions/LevelOpsMgmtLink/index.jelly b/...resources/io/jenkins/plugins/propelo/job_reporter/extensions/LevelOpsMgmtLink/index.jelly
@@ -17,13 +17,52 @@
                     </f:entry>
 
                     <f:entry name="applicationType" description="Select the application type" title="Choose Application Type" field="applicationType">
-                        <select name="applicationType" selected = "${applicationType}">
-                            <option value="SEI-Harness-PROD1" selected="${applicationType.equals('SEI-Harness-PROD1') ? 'true':null}">SEI-Harness-PROD1</option>
-                            <option value="SEI-Harness-PROD2" selected="${applicationType.equals('SEI-Harness-PROD2') ? 'true':null}">SEI-Harness-PROD2</option>
-                            <option value="SEI-Harness-PROD3" selected="${applicationType.equals('SEI-Harness-PROD3') ? 'true':null}">SEI-Harness-PROD3</option>
-                            <option value="SEI-Legacy-US" selected="${applicationType.equals('SEI-Legacy-US') ? 'true':null}">SEI-Legacy-US</option>
-                            <option value="SEI-Legacy-EU" selected="${applicationType.equals('SEI-Legacy-EU') ? 'true':null}">SEI-Legacy-EU</option>
-                         </select>
+                        <select name="applicationType">
+                            <j:choose>
+                                <j:when test="${it.configuration.applicationType == 'SEI_HARNESS_PROD1'}">
+                                    <option value="SEI-Harness-PROD1" selected="">SEI-Harness-PROD1</option>
+                                    <option value="SEI-Harness-PROD2">SEI-Harness-PROD2</option>
+                                    <option value="SEI-Harness-PROD3">SEI-Harness-PROD3</option>
+                                    <option value="SEI-Legacy-US">SEI-Legacy-US</option>
+                                    <option value="SEI-Legacy-EU">SEI-Legacy-EU</option>
+                                </j:when>
+                                <j:when test="${it.configuration.applicationType == 'SEI_HARNESS_PROD2'}">
+                                    <option value="SEI-Harness-PROD1">SEI-Harness-PROD1</option>
+                                    <option value="SEI-Harness-PROD2" selected="">SEI-Harness-PROD2</option>
+                                    <option value="SEI-Harness-PROD3">SEI-Harness-PROD3</option>
+                                    <option value="SEI-Legacy-US">SEI-Legacy-US</option>
+                                    <option value="SEI-Legacy-EU">SEI-Legacy-EU</option>
+                                </j:when>
+                                <j:when test="${it.configuration.applicationType == 'SEI_HARNESS_PROD3'}">
+                                    <option value="SEI-Harness-PROD1">SEI-Harness-PROD1</option>
+                                    <option value="SEI-Harness-PROD2">SEI-Harness-PROD2</option>
+                                    <option value="SEI-Harness-PROD3" selected="">SEI-Harness-PROD3</option>
+                                    <option value="SEI-Legacy-US">SEI-Legacy-US</option>
+                                    <option value="SEI-Legacy-EU">SEI-Legacy-EU</option>
+                                </j:when>
+                                <j:when test="${it.configuration.applicationType == 'SEI_LEGACY'}">
+                                    <option value="SEI-Harness-PROD1">SEI-Harness-PROD1</option>
+                                    <option value="SEI-Harness-PROD2">SEI-Harness-PROD2</option>
+                                    <option value="SEI-Harness-PROD3">SEI-Harness-PROD3</option>
+                                    <option value="SEI-Legacy-US" selected="">SEI-Legacy-US</option>
+                                    <option value="SEI-Legacy-EU">SEI-Legacy-EU</option>
+                                </j:when>
+                                <j:when test="${it.configuration.applicationType == 'SEI_LEGACY_EU'}">
+                                    <option value="SEI-Harness-PROD1">SEI-Harness-PROD1</option>
+                                    <option value="SEI-Harness-PROD2">SEI-Harness-PROD2</option>
+                                    <option value="SEI-Harness-PROD3">SEI-Harness-PROD3</option>
+                                    <option value="SEI-Legacy-US">SEI-Legacy-US</option>
+                                    <option value="SEI-Legacy-EU" selected="">SEI-Legacy-EU</option>
+                                </j:when>
+                                <j:otherwise>
+                                    <option value="SEI-Harness-PROD1">SEI-Harness-PROD1</option>
+                                    <option value="SEI-Harness-PROD2">SEI-Harness-PROD2</option>
+                                    <option value="SEI-Harness-PROD3">SEI-Harness-PROD3</option>
+                                    <option value="SEI-Legacy-US">SEI-Legacy-US</option>
+                                    <option value="SEI-Legacy-EU">SEI-Legacy-EU</option>
+                                </j:otherwise>
+                            </j:choose>
+                          </select>
                     </f:entry>
 
 
@@ -55,9 +94,9 @@
                     -->
                     <f:entry title="Jenkins User Name" field="jenkinsUserName"
                         help="/plugin/${it.urlName}/help/help-jenkinsUserName.html">
-                        <f:textbox value="${it.configuration.jenkinsUserName}" name="jenkinsUserName"
-                            checkUrl="'${rootURL}/plugin/${it.urlName}/checkJenkinsUserName?value='+escape(this.value)" checkMethod="post"/>
+                        <f:textbox value="${it.configuration.jenkinsUserName}" name="jenkinsUserName"/>
                     </f:entry>
+
                     <f:entry title="Jenkins User Token" description="Jenkins User Token" field="jenkinsUserToken"
                         help="/plugin/${it.urlName}/help/help-jenkinsUserToken.html">
                     <f:password value="${it.configuration.jenkinsUserToken}" name="jenkinsUserToken"/>
@@ -78,4 +117,4 @@
 
         </l:main-panel>
     </l:layout>
-</j:jelly>
+</j:jelly>