[karaf] branch karaf-4.2.x updated: [KARAF-6413]Windows Service fails to start initially

[ff...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new f9cac7b  [KARAF-6413]Windows Service fails to start initially
f9cac7b is described below

commit f9cac7bd85fa28081967af8a2a8ea3e45f09accd
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Sep 10 14:43:04 2019 -0400

    [KARAF-6413]Windows Service fails to start initially
    
    (cherry picked from commit 479f64dd02521b45bd72eb067ec46392f98b6f19)
---
 assemblies/features/base/pom.xml | 2 +-
 pom.xml                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index 0ed2f36..219313e 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -240,7 +240,7 @@
                                     <groupId>com.sun.winsw</groupId>
                                     <artifactId>winsw</artifactId>
                                     <version>${winsw.version}</version>
-                                    <classifier>bin</classifier>
+                                    <classifier>net4</classifier>
                                     <type>exe</type>
                                     <outputDirectory>target/classes/resources/bin/contrib</outputDirectory>
                                     <destFileName>karaf-service-win.exe</destFileName>
diff --git a/pom.xml b/pom.xml
index d34c535..5fa9d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@
         <javax.mail.version>1.4.7</javax.mail.version>
 
         <websocket.version>1.1</websocket.version>
-        <winsw.version>1.18</winsw.version>
+        <winsw.version>2.3.0</winsw.version>
 
 
         <surefire.argLine />