This is an automated email from the ASF dual-hosted git repository.
jbonofre 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 fa8dbb9 [KARAF-7095] Use full path in wrapper
fa8dbb9 is described below
commit fa8dbb9d1b2158158b66e0489d2dcc0044a4941b
Author: jbonofre <[email protected]>
AuthorDate: Fri Apr 9 08:11:11 2021 +0200
[KARAF-7095] Use full path in wrapper
(cherry picked from commit 1943cbf77d17103c9fc5a75998cbd7864c469a41)
---
.../org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf | 2 +-
.../org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf | 2 +-
.../apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
index f792326..287e4ec 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
@@ -30,7 +30,7 @@
set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_S
# Include JAVA_HOME/bin in the default PATH variable
set.PATH=%PATH_WITH_JAVA%
-set.JDK_JAVA_OPTIONS=--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-%KARAF_VERSION%.jar
--patch-module
java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED --ad [...]
+set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED
--patch-module
java.base=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.locator-%KARAF_VERSION%.jar
--patch-module
java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/ [...]
# Java Application
wrapper.working.dir=%KARAF_BASE%
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
index c28e15b..d3faa4b 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
@@ -30,7 +30,7 @@
set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_S
# Include JAVA_HOME/bin in the default PATH variable
set.PATH=%PATH_WITH_JAVA%
-set.JDK_JAVA_OPTIONS=--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-%KARAF_VERSION%.jar
--patch-module
java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED --ad [...]
+set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED
--patch-module
java.base=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.locator-%KARAF_VERSION%.jar
--patch-module
java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/ [...]
# Java Application
wrapper.working.dir=%KARAF_BASE%
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
index 0ab19c3..46d5308 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
@@ -30,7 +30,7 @@
set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_S
# Include JAVA_HOME/bin in the default PATH variable
set.PATH=%PATH_WITH_JAVA%
-set.JDK_JAVA_OPTIONS=--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-%KARAF_VERSION%.jar
--patch-module
java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED --ad [...]
+set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED
--patch-module
java.base=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.locator-%KARAF_VERSION%.jar
--patch-module
java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/ [...]
# Java Application
wrapper.working.dir=%KARAF_BASE%
