This is an automated email from the ASF dual-hosted git repository.
ffang 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 3a279c6 [KARAF-6062]CLASSPATH error when using KARAF with JDK11 on
windows
3a279c6 is described below
commit 3a279c663436a8c4a8cb993df0ff3e9cc3e63213
Author: Freeman Fang <[email protected]>
AuthorDate: Wed Dec 26 15:07:09 2018 +0800
[KARAF-6062]CLASSPATH error when using KARAF with JDK11 on windows
---
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
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 3f2938f..037cd02 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
@@ -229,6 +229,12 @@ for /f tokens^=2-5^ delims^=.-_+^" %%j in ('"%JAVA%"
-fullversion 2^>^&1') do (
if %%j==1 (set JAVA_VERSION=%%k) else (set JAVA_VERSION=%%j)
)
+if %JAVA_VERSION% GTR 8 (
+ pushd "%KARAF_HOME%\lib\jdk9plus"
+ for %%G in (*.jar) do call:APPEND_TO_JDK9PLUS_CLASSPATH %%G
+ popd
+)
+
:CheckRootInstance
set ROOT_INSTANCE_RUNNING=false
if exist "%KARAF_HOME%\instances\instance.properties" (
@@ -419,9 +425,6 @@ if "%KARAF_PROFILER%" == "" goto :RUN
rem If major version is greater than 1 (meaning Java 9 or 10), we
don't use endorsed lib but module
rem If major version is 1 (meaning Java 1.6, 1.7, 1.8), we use
endorsed lib
if %JAVA_VERSION% GTR 8 (
- pushd "%KARAF_HOME%\lib\jdk9plus"
- for %%G in (*.jar) do call:APPEND_TO_JDK9PLUS_CLASSPATH %%G
- popd
"%JAVA%" %JAVA_OPTS% %OPTS% ^
--add-reads=java.xml=java.logging ^
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
