From b7f6c14425a3c5ce5da640f7aea6ba3526511862 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 17 May 2016 10:03:02 -0400 Subject: [PATCH 1/2] using 1.18 on winsw --- artemis-cli/pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml index fa7ce97e90..b447974ce9 100644 --- a/artemis-cli/pom.xml +++ b/artemis-cli/pom.xml @@ -128,7 +128,7 @@ com.sun.winsw winsw - 1.9 + 1.18 bin exe ${basedir}/target/classes/org/apache/activemq/artemis/cli/commands/bin/ @@ -142,5 +142,12 @@ + + + jenkins + jenkins + http://repo.jenkins-ci.org/releases/ + + From 5f35d139be70f223ca2bcaa3ba6b61b0de729405 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 17 May 2016 10:43:00 -0400 Subject: [PATCH 2/2] ARTEMIS-354 Fixing security option on artemis-service for windows --- .../activemq/artemis/cli/commands/bin/artemis-service.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml index 300137005c..dfb802329c 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml @@ -46,7 +46,7 @@ -Ddata.dir="${artemis.instance}\data" -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration="file:${artemis.instance}\etc\logging.properties" - -Djava.security.auth.login.config"${artemis.instance}\etc\login.config" + -Djava.security.auth.login.config="${artemis.instance}\etc\login.config"