From fa3a82a9177476c7397c0a20c0999b4ebb798e29 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 22 Jul 2014 14:30:58 -0400
Subject: [PATCH] MatrixTestResult/index.jelly should have been moved to
 matrix-project-plugin.

---
 .../tasks/test/MatrixTestResult/index.jelly   | 72 -------------------
 war/pom.xml                                   |  2 +-
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly

diff --git a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
deleted file mode 100644
index dcc8d0e882..0000000000
--- a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Red Hat, Inc., Tom Huybrechts
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?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" xmlns:local="local" xmlns:test="/lib/test">
-  <l:layout title="Test">
-    <st:include page="sidepanel.jelly" it="${it.owner}"/>
-    <l:main-panel>
-      <h1 class="matrix-test-result-headline page-headline">Test Result</h1>
-      <test:bar/>
-
-      <table class="pane sortable bigtable">
-        <tr>
-          <td class="pane-header">Configuration Name</td>
-          <td class="pane-header" style="width:4em">Duration</td>
-          <td class="pane-header" style="width:4em">All</td>
-          <td class="pane-header" style="width:4em">Failed</td>
-          <td class="pane-header" style="width:4em">Skipped</td>
-        </tr>
-
-        <j:forEach var="report" items="${it.childReports}">
-          <tr>
-            <td class="pane">
-              <a href="../${report.child.project.shortUrl}testReport" class="model-link inside">${report.child.project.name}</a>
-            </td>
-            <td data="${report.result.duration}" class="pane" style="text-align:right">
-              ${report.result.durationString}
-            </td>
-            <td class="pane" style="text-align:right;">
-              ${report.result.totalCount}
-            </td>
-            <td class="pane" style="text-align:right;">
-              <!-- if only we have if..then..else in Jelly -->
-              <j:if test="${report.result.failCount!=0}">
-                <a href="#${report.child.project.name}">${report.result.failCount}</a>
-              </j:if>
-              <j:if test="${report.result.failCount==0}">0</j:if>
-
-
-            </td>
-            <td class="pane" style="text-align:right;">
-              ${report.result.skipCount}
-            </td>
-          </tr>
-        </j:forEach>
-      </table>
-
-      <t:aggregated-failed-tests/>
-    </l:main-panel>
-  </l:layout>
-</j:jelly>
diff --git a/war/pom.xml b/war/pom.xml
index 2e27fb0f05..463cbffa38 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -364,7 +364,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>matrix-project</artifactId>
-                  <version>1.2</version>
+                  <version>1.3</version>
                   <type>hpi</type>
                 </artifactItem>
               </artifactItems>
-- 
GitLab