[JENKINS-49017][JENKINS-49210] Allow to run tests against latest cores

* This change allows us to run "mvn test -Djenkins.version=2.102 -Djava.level=8" to test compatibility with JEP-200
jenkinsci · Jan 27, 2018 · 510132e · 510132e
1 parent e8393e1
commit 510132e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.25</version>
+    <version>2.37</version>
   </parent>
 
   <groupId>jp.ikedam.jenkins.plugins</groupId>

diff --git a/...p/ikedam/jenkins/plugins/extensible_choice_parameter/ChoiceWatchQueueDecisionHandler.java b/...p/ikedam/jenkins/plugins/extensible_choice_parameter/ChoiceWatchQueueDecisionHandler.java
@@ -94,7 +94,7 @@ protected void onQueueing(Task p, List<Action> actions)
                 ExtensibleChoiceParameterDefinition choiceDef = (ExtensibleChoiceParameterDefinition)def;
                 if(choiceDef.getChoiceListProvider() != null)
                 {
-                    choiceDef.getChoiceListProvider().onBuildTriggeredWithValue(job, choiceDef, value.value);
+                    choiceDef.getChoiceListProvider().onBuildTriggeredWithValue(job, choiceDef, value.getValue().toString());
                 }
             }
         }

diff --git a/...in/java/jp/ikedam/jenkins/plugins/extensible_choice_parameter/ChoiceWatchRunListener.java b/...in/java/jp/ikedam/jenkins/plugins/extensible_choice_parameter/ChoiceWatchRunListener.java
@@ -67,7 +67,7 @@ public void onFinalized(AbstractBuild<?,?> build)
                 ExtensibleChoiceParameterDefinition choiceDef = (ExtensibleChoiceParameterDefinition)def;
                 if(choiceDef.getChoiceListProvider() != null)
                 {
-                    choiceDef.getChoiceListProvider().onBuildCompletedWithValue(build, choiceDef, value.value);
+                    choiceDef.getChoiceListProvider().onBuildCompletedWithValue(build, choiceDef, value.getValue().toString());
                 }
             }
         }

diff --git a/...edam/jenkins/plugins/extensible_choice_parameter/ExtensibleChoiceParameterDefinition.java b/...edam/jenkins/plugins/extensible_choice_parameter/ExtensibleChoiceParameterDefinition.java
@@ -395,12 +395,12 @@ public ExtensibleChoiceParameterDefinition(String name, ChoiceListProvider choic
      */
     protected ParameterValue createValueCommon(StringParameterValue value)
     {
-        if(!isEditable() && !getChoiceList().contains(value.value))
+        if(!isEditable() && !getChoiceList().contains(value.getValue()))
         {
             // Something strange!: Not editable and specified a value not in the choices.
             throw new IllegalArgumentException(String.format(
                 "Illegal choice '%s' in parameter '%s'",
-                value.value,
+                value.getValue(),
                 value.getName()
             ));
         }