You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2021/04/07 19:56:04 UTC
[karaf] branch main updated: [KARAF-7095]JDK11+: we should use full
lib path when patch-module
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 33174f7 [KARAF-7095]JDK11+: we should use full lib path when patch-module
new 6d0ba35 Merge branch 'main' of github.com:apache/karaf into main
33174f7 is described below
commit 33174f7c6980795de9829b42f98d8b9903948f6f
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Apr 7 15:55:24 2021 -0400
[KARAF-7095]JDK11+: we should use full lib path when patch-module
---
.../features/base/src/main/filtered-resources/resources/bin/karaf | 4 ++--
.../features/base/src/main/filtered-resources/resources/bin/karaf.bat | 4 ++--
2 files changed, 4 insertions(+), 4 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 0bc0f67..48bc56a 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -304,8 +304,8 @@ run() {
${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 \
- --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-@@project.version@@.jar \
+ --patch-module java.base=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-@@project.version@@.jar \
+ --patch-module java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-@@project.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 \
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index 8f95ae1..68f72cb 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -422,8 +422,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
"%JAVA%" %JAVA_OPTS% %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 ^
- --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-@@project.version@@.jar ^
+ --patch-module java.base=%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-@@project.version@@.jar ^
+ --patch-module java.xml=%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-@@project.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 ^