Merge branch 'master' of github.com:hudson/hudson

changelog.html

@@ -40,12 +40,18 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=rfe.major>
+  <li class='major rfe'>
     Maven 3 support in maven-plugin. 
     (<a href="http://issues.hudson-ci.org/browse/HUDSON-4988">issue 4988</a>)
   <li class=bug>
     Turn Off "Show Friendly HTTP Error Messages" Feature on the Server Side.
     (<a href="http://issues.hudson-ci.org/browse/HUDSON-8352">issue 8352</a>)
+  <li class=bug>
+    Hudson installed as Windows service wasn't restarting properly
+    (<a href="http://issues.hudson-ci.org/browse/HUDSON-5090">issue 5090</a>)
+  <li class=bug>
+    Escape quotes.
+    (<a href="http://issues.hudson-ci.org/browse/HUDSON-8270">issue 8270</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

core/pom.xml

@@ -736,7 +736,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>com.sun.winsw</groupId>
       <artifactId>winsw</artifactId>
-      <version>1.9</version>
+      <version>1.10</version>
       <classifier>bin</classifier>
       <type>exe</type>
       <scope>provided</scope><!-- this isn't really a dependency that Maven should care about, so putting 'provided' -->

core/src/main/java/hudson/Util.java

@@ -807,6 +807,12 @@ public class Util {
             if(ch=='&')
                 buf.append("&");
             else
+            if(ch=='"')
+                buf.append(""");
+            else
+            if(ch=='\'')
+                buf.append("'");
+            else
             if(ch==' ') {
                 // All spaces in a block of consecutive spaces are converted to
                 // non-breaking space ( ) except for the last one.  This allows

core/src/test/java/hudson/UtilTest.java

@@ -170,4 +170,11 @@ public class UtilTest extends TestCase {
             Util.deleteRecursive(d);
         }
     }
+
+    public void TestEscape() {
+        assertEquals("<br>", Util.escape("\n"));
+        assertEquals("&lt;a>", Util.escape("<a>"));
+        assertEquals("&quot;&#039;", Util.escape("'\""));
+        assertEquals("&nbsp; ", Util.escape("  "));
+    }
 }

pom.xml

@@ -513,16 +513,6 @@ THE SOFTWARE.
         <enabled>false</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>maven.hudson-labs.org</id>
-      <url>http://maven.hudson-labs.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>      
-    </repository>
   </repositories>
 
   <pluginRepositories>