From e698d1de41d4311bf5f8b1d2c40b591109e696e2 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Wed, 8 Mar 2017 16:19:21 +0100
Subject: [PATCH] Update Windows Agent Installer to 1.7 and WinSW to 2.0.2
 (#2765)

### WinSW changes

The update includes many fixes and improvements, the full list is provided in the [WinSW changelog](https://github.com/kohsuke/winsw/blob/master/CHANGELOG.md). There are several issues referenced in Jenkins bugtracker:

* [JENKINS-22692](https://issues.jenkins-ci.org/browse/JENKINS-22692) - Connection reset issues when WinSW gets terminated due to the system shutdown
* [JENKINS-23487](https://issues.jenkins-ci.org/browse/JENKINS-23487)- Support of shared directories in WinSW
* [JENKINS-39231](https://issues.jenkins-ci.org/browse/JENKINS-39231) - Enable Runaway Process Killer by default
* [JENKINS-39237](https://issues.jenkins-ci.org/browse/JENKINS-39237) - Auto-upgrade of JNLP agent versions on the slaves

### Windows Agent Installer changes

* Adapt the default configurations to pick fixes above
* Slave => Agent renaming where possible

### Jenkins core changes

* Modify the configuration template, reference advanced options
* Enable Runaway Process Killer by default

* Update Windows Agent Installer to 1.7

* Remove the obsolete jenkins-slave.xml file from the core.

Now it is within windows-slave-installer

* Use the deployed Snapshot for CI

* Pick the release version of windows-slave-installer-1.7
---
 core/pom.xml                                  |  2 +-
 .../windows-service/jenkins-slave.xml         | 49 -------------------
 .../resources/windows-service/jenkins.xml     | 25 ++++++++--
 war/pom.xml                                   |  2 +-
 4 files changed, 24 insertions(+), 54 deletions(-)
 delete mode 100644 core/src/main/resources/windows-service/jenkins-slave.xml

diff --git a/core/pom.xml b/core/pom.xml
index 6feb9ec997..9a4179653d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -755,7 +755,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>com.sun.winsw</groupId>
                   <artifactId>winsw</artifactId>
-                  <version>1.16</version>
+                  <version>2.0.2</version>
                   <classifier>bin</classifier>
                   <type>exe</type>
                   <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>
diff --git a/core/src/main/resources/windows-service/jenkins-slave.xml b/core/src/main/resources/windows-service/jenkins-slave.xml
deleted file mode 100644
index b4d3bf58f2..0000000000
--- a/core/src/main/resources/windows-service/jenkins-slave.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-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.
--->
-
-<!--
-  Windows service definition for Jenkins slave
-
-  To uninstall, run "jenkins-slave.exe stop" to stop the service, then "jenkins-slave.exe uninstall" to uninstall the service.
-  Both commands don't produce any output if the execution is successful. 
--->
-<service>
-  <id>@ID@</id>
-  <name>Jenkins Slave</name>
-  <description>This service runs a slave for Jenkins continuous integration system.</description>
-  <!--
-    if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
-    The following value assumes that you have java in your PATH.
-  -->
-  <executable>@JAVA@</executable>
-  <arguments>-Xrs @VMARGS@ -jar "%BASE%\slave.jar" @ARGS@</arguments>
-  <!--
-    interactive flag causes the empty black Java window to be displayed.
-    I'm still debugging this.
-  <interactive />
-  -->
-  <logmode>rotate</logmode>
-
-  <onfailure action="restart" />
-</service>
diff --git a/core/src/main/resources/windows-service/jenkins.xml b/core/src/main/resources/windows-service/jenkins.xml
index 2bc1e79c4e..30f22a98fe 100644
--- a/core/src/main/resources/windows-service/jenkins.xml
+++ b/core/src/main/resources/windows-service/jenkins.xml
@@ -1,7 +1,7 @@
 <!--
 The MIT License
 
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+Copyright (c) 2004-2017, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oleg Nenashev, and other Jenkins contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <!--
-  Windows service definition for Jenkins
+  Windows service definition for Jenkins.
 
   To uninstall, run "jenkins.exe stop" to stop the service, then "jenkins.exe uninstall" to uninstall the service.
   Both commands don't produce any output if the execution is successful. 
@@ -31,7 +31,7 @@ THE SOFTWARE.
 <service>
   <id>jenkins</id>
   <name>Jenkins</name>
-  <description>This service runs Jenkins continuous integration system.</description>
+  <description>This service runs Jenkins automation server.</description>
   <env name="JENKINS_HOME" value="%BASE%"/>
   <!--
     if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
@@ -47,4 +47,23 @@ THE SOFTWARE.
   <logmode>rotate</logmode>
 
   <onfailure action="restart" />
+  
+  <!-- 
+    In the case WinSW gets terminated and leaks the process, we want to abort
+    these runaway JAR processes on startup to prevent corruption of JENKINS_HOME.
+    So this extension is enabled by default.
+  -->
+  <extensions>
+    <!-- This is a sample configuration for the RunawayProcessKiller extension. -->
+    <extension enabled="true" 
+               className="winsw.Plugins.RunawayProcessKiller.RunawayProcessKillerExtension"
+               id="killOnStartup">
+      <pidfile>%BASE%\jenkins.pid</pidfile>
+      <stopTimeout>10000</stopTimeout>
+      <stopParentFirst>false</stopParentFirst>
+    </extension>
+  </extensions>
+  
+  <!-- See the referenced examples for more options -->
+  
 </service>
diff --git a/war/pom.xml b/war/pom.xml
index 2cb82f0a9a..c3b3e0d699 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -114,7 +114,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>windows-slave-installer</artifactId>
-      <version>1.6</version>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
-- 
GitLab