You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/10/28 07:05:54 UTC
[karaf] branch master updated: Revert "Put JAVA_OPTS between quotes
for handling parameters with spaces"
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new a358a1c Revert "Put JAVA_OPTS between quotes for handling parameters with spaces"
a358a1c is described below
commit a358a1cd48bbdab1c2e57343d7eb1a5d164d55a7
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Oct 28 08:05:44 2019 +0100
Revert "Put JAVA_OPTS between quotes for handling parameters with spaces"
This reverts commit 3bbde624957cec0520a3cbeb388ad07306654695.
---
.../features/base/src/main/filtered-resources/resources/bin/karaf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index 28ea80a..e51bb8d 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -299,7 +299,7 @@ run() {
if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then
if [ "${VERSION}" -gt "8" ]; then
- ${KARAF_EXEC} "${JAVA}" "${JAVA_OPTS}" \
+ ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
--add-reads=java.xml=java.logging \
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
--patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-@@project.version@@.jar \
@@ -330,7 +330,7 @@ run() {
-classpath "${CLASSPATH}" \
${MAIN} "$@"
else
- ${KARAF_EXEC} "${JAVA}" "${JAVA_OPTS}" \
+ ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
-Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \
-Djava.ext.dirs="${JAVA_EXT_DIRS}" \
-Dkaraf.instances="${KARAF_HOME}/instances" \