JENKINS-32983: fix InjectedTest

resolve classpath issues adding missing dependencies fix XSS vulnerability with Jelly escape-by-default
jenkinsci · Feb 18, 2016 · 7186991 · 7186991
1 parent 6aad43f
commit 7186991
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,6 +55,16 @@
         <artifactId>maven-plugin</artifactId>
         <version>2.12.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>4.4.4</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>

diff --git a/...ain/resources/org/jenkinsci/plugins/maveninvoker/InvokerMavenAggregatedReport/index.jelly b/...ain/resources/org/jenkinsci/plugins/maveninvoker/InvokerMavenAggregatedReport/index.jelly
@@ -17,7 +17,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
+<?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/maveninvoker/MavenInvokerBuildAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/maveninvoker/MavenInvokerBuildAction/index.jelly
@@ -17,7 +17,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
+<?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/maveninvoker/MavenInvokerBuildAction/summary.jelly b/src/main/resources/org/jenkinsci/plugins/maveninvoker/MavenInvokerBuildAction/summary.jelly
@@ -17,6 +17,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
+<?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" xmlns:i="jelly:fmt">
    <t:summary icon="${it.iconFileName}">

diff --git a/src/main/resources/org/jenkinsci/plugins/maveninvoker/MavenInvokerRecorder/config.jelly b/src/main/resources/org/jenkinsci/plugins/maveninvoker/MavenInvokerRecorder/config.jelly
@@ -17,6 +17,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
+<?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" xmlns:bh="/lib/health">
    <f:entry title="Maven Invoker report pattern">