From 51d96ed90845a40ad91f4216cb9da4c13b624693 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Sat, 5 Aug 2023 11:45:45 +0200
Subject: [PATCH] fix qserv PATH environment

---
 hsarback/pom.xml                                   | 6 +++---
 qserv-deploy/pom.xml                               | 4 ++--
 qserv-deploy/src/deb/systemd/hsadmin-qserv.service | 3 +--
 qserv/pom.xml                                      | 4 ++--
 util/pom.xml                                       | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hsarback/pom.xml b/hsarback/pom.xml
index 8c49ba5..31baebd 100644
--- a/hsarback/pom.xml
+++ b/hsarback/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.hsadmin</groupId>
 	<artifactId>hsar</artifactId>
 	<packaging>war</packaging>
-	<version>4.0.13</version>
+	<version>4.0.14</version>
 	<name>HSAdmin Stable Backend Webapp</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -36,12 +36,12 @@
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-util</artifactId>
-			<version>4.0.13</version>
+			<version>4.0.14</version>
 		</dependency>
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-qserv</artifactId>
-			<version>4.0.13</version>
+			<version>4.0.14</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-httpclient</groupId>
diff --git a/qserv-deploy/pom.xml b/qserv-deploy/pom.xml
index fb48ed6..d14b12c 100644
--- a/qserv-deploy/pom.xml
+++ b/qserv-deploy/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hsadmin</groupId>
 	<artifactId>hsadmin-qserv</artifactId>
-	<version>4.0.13</version>
+	<version>4.0.14</version>
 	<packaging>jar</packaging>
 
 	<name>HSAdmin-QServ</name>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-qserv</artifactId>
-			<version>4.0.13</version>
+			<version>4.0.14</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
diff --git a/qserv-deploy/src/deb/systemd/hsadmin-qserv.service b/qserv-deploy/src/deb/systemd/hsadmin-qserv.service
index 7d39856..f13a32c 100644
--- a/qserv-deploy/src/deb/systemd/hsadmin-qserv.service
+++ b/qserv-deploy/src/deb/systemd/hsadmin-qserv.service
@@ -4,8 +4,7 @@ After=network.target nss-lookup.target
 
 [Service]
 Type=simple
-Environment="PATH=/usr/local/bin:/usr/bin:/bin"
-Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64"
+Environment="PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 Environment="JAVA_OPTS=-Xbootclasspath/a:/etc/hsadmin/qserv/ -Djavax.net.ssl.keyStore=/etc/hsadmin/qserv/keystore -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=/etc/hsadmin/qserv/truststore -Djavax.net.ssl.trustStorePassword=password -Dorg.apache.activemq.SERIALIZABLE_PACKAGES=java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf,com.thoughtworks.xstream.mapper,de.hsadmin.core.qserv,de.hsadmin.mods.cust,de.hsadmin.mods.db,de.hsadmin.mods.dom,de.hsadmin.mods.email,de.hsadmin.mods.pac,de.hsadmin.mods.qstat,de.hsadmin.mods.user"
 ExecStart=/usr/bin/java $JAVA_OPTS -jar /usr/local/lib/hostsharing/hsadmin/hsadmin-qserv-full.jar /etc/hsadmin/qserv/qserv.properties
 StandardOutput=file:/var/log/hostsharing/hsadmin/hsar-qserv.err
diff --git a/qserv/pom.xml b/qserv/pom.xml
index 9f790bf..1fa1edc 100644
--- a/qserv/pom.xml
+++ b/qserv/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hsadmin.core</groupId>
 	<artifactId>hsadmin-qserv</artifactId>
-	<version>4.0.13</version>
+	<version>4.0.14</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>11</java.version>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-util</artifactId>
-			<version>4.0.13</version>
+			<version>4.0.14</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
diff --git a/util/pom.xml b/util/pom.xml
index 227c54e..4b0889f 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hsadmin.core</groupId>
 	<artifactId>hsadmin-util</artifactId>
-	<version>4.0.13</version>
+	<version>4.0.14</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>11</java.version>