Merge pull request #108 from oleg-nenashev/bug/JENKINS-38607

[FIXED JENKINS-38607] - Add explicit compatibility notice for the JENKINS-31573 change
jenkinsci · Sep 30, 2016 · df25156 · df25156
2 parents 8aec81f + 886d726
commit df25156
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,15 +73,18 @@
     </scm>
 
     <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.jenkins-ci.tools</groupId>
-                <artifactId>maven-hpi-plugin</artifactId>
-                <version>1.98</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
+      <plugins>
+        <plugin>
+          <groupId>org.jenkins-ci.tools</groupId>
+          <artifactId>maven-hpi-plugin</artifactId>
+          <extensions>true</extensions>
+          <configuration>
+            <!-- Fix of JENKINS-31573 changed the property file parsing approach. 
+                 Now it follows the Java property file standard. -->
+            <compatibleSinceVersion>1.93</compatibleSinceVersion>
+          </configuration>
+        </plugin>
+      </plugins>
     </build>
 
     <dependencies>

diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <div>
     This plugin makes it possible to set an environment for the builds.
 </div>
diff --git a/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectBuilder/config.jelly b/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectBuilder/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 

diff --git a/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectNodeProperty/config.jelly b/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectNodeProperty/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 

diff --git a/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectNodeProperty/global.jelly b/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectNodeProperty/global.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:section title="${%Global Passwords}">

diff --git a/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectPasswordWrapper/config.jelly b/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectPasswordWrapper/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 

diff --git a/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectVarList/index.jelly b/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectVarList/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
     <l:layout title="${it.displayName}">
         <j:invokeStatic var="currentThread" className="java.lang.Thread" method="currentThread"/>