Merge branch 'master' of github.com:jenkinsci/jenkins

changelog.html

@@ -56,7 +56,9 @@ Upcoming changes</a>
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
   <li class=rfe>
-    <f:dropdownDescriptorSelector> does not allow defaulting to specifig instance
+    Windows services now auto-restart in case of abnormal process termination.
+  <li class=rfe>
+    &lt;f:dropdownDescriptorSelector> does not allow defaulting to specifig instance
      (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17858">issue 17858</a>)
   <li class=bug>
     mark maven settings / global settings as default for new jobs

core/pom.xml

@@ -501,14 +501,6 @@ THE SOFTWARE.
       <artifactId>jmdns</artifactId>
       <version>3.4.0-jenkins-3</version>
     </dependency>
-    <dependency>
-      <groupId>com.sun.winsw</groupId>
-      <artifactId>winsw</artifactId>
-      <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' -->
-    </dependency>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
@@ -746,7 +738,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>com.sun.winsw</groupId>
                   <artifactId>winsw</artifactId>
-                  <version>1.10</version>
+                  <version>1.13</version>
                   <classifier>bin</classifier>
                   <type>exe</type>
                   <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>

core/src/main/resources/windows-service/jenkins-slave.xml

@@ -44,4 +44,6 @@ THE SOFTWARE.
   <interactive />
   -->
   <logmode>rotate</logmode>
-</service>
\ No newline at end of file
+
+  <onfailure action="restart" />
+</service>

core/src/main/resources/windows-service/jenkins.xml

@@ -45,4 +45,6 @@ THE SOFTWARE.
   <interactive />
   -->
   <logmode>rotate</logmode>
-</service>
\ No newline at end of file
+
+  <onfailure action="restart" />
+</service>

war/pom.xml

@@ -125,7 +125,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>windows-slave-installer</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>