Merge remote branch 'origin/rc'

core/src/main/resources/hudson/AboutJenkins/index.jelly

@@ -25,7 +25,6 @@ THE SOFTWARE.
 <!-- 3rd party license acknowledgements and  -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:layout title="${%about(app.VERSION)}">
-    <st:include it="${app}" page="sidepanel.jelly" />
     <l:main-panel>
       <h1>${%about(app.VERSION)}</h1>
       <p>
@@ -35,9 +34,9 @@ THE SOFTWARE.
       <p>
         ${%dependencies}
       </p>
-      <t:3rdPartyLicenses>
+      <t:thirdPartyLicenses>
         <st:include page="/META-INF/licenses.xml" />
-      </t:3rdPartyLicenses>
+      </t:thirdPartyLicenses>
     </l:main-panel>
   </l:layout>
 </j:jelly>

core/src/main/resources/hudson/PluginManager/installed.jelly

@@ -68,7 +68,7 @@ THE SOFTWARE.
                   </div>
                 </td>
                 <td class="center pane" style="white-space:nowrap">
-                  <a href="plugin/${p.shortName}/3rdPartyLicenses">
+                  <a href="plugin/${p.shortName}/thirdPartyLicenses">
                     ${p.version}
                   </a>
                 </td>

core/src/main/resources/hudson/PluginWrapper/3rdPartyLicenses.jelly → core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly

@@ -29,7 +29,7 @@ THE SOFTWARE.
       <h1>${%about(it.longName+' '+it.version)}</h1>
 
       <h3>${%3rd Party Dependencies}</h3>
-      <t:3rdPartyLicenses>
+      <t:thirdPartyLicenses>
         <j:choose>
           <j:when test="${it.hasLicensesXml()}">
             <j:include uri="${it.baseResourceURL}/WEB-INF/licenses.xml" />
@@ -38,7 +38,7 @@ THE SOFTWARE.
             <p>${%No information recorded}</p>
           </j:otherwise>
         </j:choose>
-      </t:3rdPartyLicenses>
+      </t:thirdPartyLicenses>
     </l:main-panel>
   </l:layout>
 </j:jelly>

core/src/test/java/hudson/util/io/TarArchiverTest.java

@@ -44,8 +44,8 @@ public class TarArchiverTest extends TestCase {
     public void testPermission() throws Exception {
         if (Functions.isWindows())  return; // can't test on Windows
 
-        File tar = new File("test.tar");
-        File zip = new File("test.zip");
+        File tar = File.createTempFile("test","tar");
+        File zip = File.createTempFile("test","zip");
 
         FilePath dir = new FilePath(File.createTempFile("test","dir"));
 
@@ -88,7 +88,7 @@ public class TarArchiverTest extends TestCase {
         } finally {
             tar.delete();
             zip.delete();
-            dir.delete();
+            dir.deleteRecursive();
         }
     }
 }