You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2018/04/11 09:16:00 UTC
[karaf] branch master updated (eaae22a -> 3b3b831)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
discard eaae22a [KARAF-5696 [KARAF-5696] Fix version detection on windows
new 3b3b831 [KARAF-5696] Fix version detection on windows
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (eaae22a)
\
N -- N -- N refs/heads/master (3b3b831)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
--
To stop receiving notification emails like this one, please contact
gnodet@apache.org.
[karaf] 01/01: [KARAF-5696] Fix version detection on windows
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 3b3b831a58024dd57cca94cd4478e3b66b253a1e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Apr 11 11:10:54 2018 +0200
[KARAF-5696] Fix version detection on windows
---
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 8 ++++++--
1 file changed, 6 insertions(+), 2 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 b18b46c..d87b929 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
@@ -214,6 +214,11 @@ if not "%JAVA%" == "" goto :Check_JAVA_END
set JAVA=%JAVA_HOME%\bin\java
:Check_JAVA_END
+rem Retrieve java version
+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)
+)
+
:CheckRootInstance
set ROOT_INSTANCE_RUNNING=false
if exist "%KARAF_HOME%\instances\instance.properties" (
@@ -395,10 +400,9 @@ if "%KARAF_PROFILER%" == "" goto :RUN
if "%ROOT_INSTANCE_RUNNING%" == "false" SET IS_RUNNABLE=true
if "%CHECK_ROOT_INSTANCE_RUNNING%" == "false" SET IS_RUNNABLE=true
if "%IS_RUNNABLE%" == "true" (
- for /f tokens^=2-5^ delims^=.-_^" %%j in ('"%JAVA%" -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%"
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 1 (
+ if %JAVA_VERSION% GTR 8 (
"%JAVA%" %JAVA_OPTS% %OPTS% ^
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,java.xml.ws,ALL-UNNAMED ^
--patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-@@project.version@@.jar ^
--
To stop receiving notification emails like this one, please contact
gnodet@apache.org.