[tomee] branch tomee-8.x updated: TOMEE-3979 fix for service bat

[ce...@apache.org]

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

cesarhernandezgt pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-8.x by this push:
     new 287d0e80f1 TOMEE-3979 fix for service bat
     new 238cd4b4c4 Merge pull request #887 from cesarhernandezgt/TOMEE-3979-tomee-8.x
287d0e80f1 is described below

commit 287d0e80f111fd6c832a3ae69a9497aa94611c42
Author: Cesar Hernandez <cf...@gmail.com>
AuthorDate: Tue Jun 14 10:21:04 2022 -0600

    TOMEE-3979 fix for service bat
---
 tomee/apache-tomee/src/main/resources/service.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tomee/apache-tomee/src/main/resources/service.bat b/tomee/apache-tomee/src/main/resources/service.bat
index d7cbd825f4..fc94ed4b7c 100644
--- a/tomee/apache-tomee/src/main/resources/service.bat
+++ b/tomee/apache-tomee/src/main/resources/service.bat
@@ -88,6 +88,7 @@ goto okJavaHome
 :gotJreHome
 if not exist "%JRE_HOME%\bin\java.exe" goto noJavaHome
 if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
+for /f tokens^=2^ delims^=.-_^" %%j in ('"%JRE_HOME%\bin\java.exe" -fullversion 2^>^&1') do set "JAVA_MAJOR_VERSION=%%j"
 goto okJavaHome
 :gotJdkHome
 for /f tokens^=2^ delims^=.-_^" %%j in ('"%JAVA_HOME%\bin\java.exe" -fullversion 2^>^&1') do set "JAVA_MAJOR_VERSION=%%j"