[karaf] branch karaf-4.2.x updated: [KARAF-7095]JDK11+: we should use full lib path when patch-module

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang 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 5b0f473  [KARAF-7095]JDK11+: we should use full lib path when 
patch-module
5b0f473 is described below

commit 5b0f473e6dd677e412bdb5cbe0720c13a8a69850
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Wed Apr 7 15:55:24 2021 -0400

    [KARAF-7095]JDK11+: we should use full lib path when patch-module
    
    (cherry picked from commit 33174f7c6980795de9829b42f98d8b9903948f6f)
---
 .../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 f9d967e..8f84db2 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -308,8 +308,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 95e862e..9b16adc 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
@@ -428,8 +428,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 ^