Fix JENKINS-28951

Allow for different transforms on top of the token evaluation
jenkinsci · Mar 13, 2016 · 63011d3 · 63011d3
1 parent 22a5aa7
commit 63011d3
Show file tree

Hide file tree

Showing 19 changed files with 672 additions and 303 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,10 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.609.2</version>
+    <version>2.0</version>
   </parent>
+
+  <properties>
+    <jenkins.version>1.642.2</jenkins.version>
+    <!--<jenkins.version>1.609.2</jenkins.version>-->
+  </properties>
 
   <licenses>
     <license>
@@ -15,7 +21,7 @@
   </licenses>
 
   <artifactId>token-macro</artifactId>
-  <version>1.12-SNAPSHOT</version>
+  <version>1.13-SNAPSHOT</version>
   <packaging>hpi</packaging>
   <name>Token Macro Plugin</name>
 
@@ -64,11 +70,16 @@
             </goals>
           </execution>
         </executions>
-      </plugin>                     
+      </plugin>
     </plugins>
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.parboiled</groupId>
+      <artifactId>parboiled-java</artifactId>
+      <version>1.1.7</version>
+    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>annotations</artifactId>
@@ -82,10 +93,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>config-file-provider</artifactId>
-      <version>2.7.1</version>
-      <optional>true</optional>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>jenkins-war</artifactId>
+      <type>war</type>
+      <version>${jenkins.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/src/main/java/org/jenkinsci/plugins/tokenmacro/DataBoundTokenMacro.java b/src/main/java/org/jenkinsci/plugins/tokenmacro/DataBoundTokenMacro.java
@@ -68,7 +68,7 @@ public abstract class DataBoundTokenMacro extends TokenMacro {
          */
         boolean required() default false;
 
-	String alias() default "";
+	    String alias() default "";
     }
 
     private interface Setter {