From 980150dd4dd931751155995be76416faa4201ce2 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Fri, 30 Sep 2016 13:03:17 +0200
Subject: [PATCH 1/2] [FIXED JENKINS-38607] - Add explicit compatibility notice
 for the JENKINS-31573 change

Also updates maven-hpi-version to the version declared in POM
---
 pom.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 738c6a8e..be9fe984 100644
--- 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>

From 886d7262fa70908c0515be6bc81ec8a1b6455804 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Fri, 30 Sep 2016 13:52:40 +0200
Subject: [PATCH 2/2] Escape all Jelly files by default (required with new
 maven-hpi-plugin)

---
 src/main/resources/index.jelly                                   | 1 +
 .../jenkinsci/plugins/envinject/EnvInjectBuilder/config.jelly    | 1 +
 .../plugins/envinject/EnvInjectNodeProperty/config.jelly         | 1 +
 .../plugins/envinject/EnvInjectNodeProperty/global.jelly         | 1 +
 .../plugins/envinject/EnvInjectPasswordWrapper/config.jelly      | 1 +
 .../org/jenkinsci/plugins/envinject/EnvInjectVarList/index.jelly | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
index 7d9656dd..c6e5eb0e 100755
--- 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>
\ No newline at end of file
diff --git a/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectBuilder/config.jelly b/src/main/resources/org/jenkinsci/plugins/envinject/EnvInjectBuilder/config.jelly
index a1d53f45..58722a4f 100644
--- 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
index 1071946b..ee0a51c3 100644
--- 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
index d7727217..85e3915f 100644
--- 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
index f765f7de..823cdd3f 100644
--- 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
index 4482df9f..771423fe 100644
--- 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"/>