Revert "Add JavaVersionChecker to check Java version for compatibilit…

…y before… (#13356)" (#13364) This reverts commit 620a654.
elastic · Oct 26, 2021 · e619b7a · e619b7a
1 parent 620a654
commit e619b7a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 161 deletions.
diff --git a/bin/logstash.bat b/bin/logstash.bat
@@ -47,9 +47,6 @@ if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
 )
 set JAVA_OPTS=%LS_JAVA_OPTS%
 
-rem check the Java version
-%JAVA% -cp "%CLASSPATH%" "org.logstash.util.JavaVersionChecker" || exit /b 1
-
 %JAVA% %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.Logstash %*
 
 goto :end

diff --git a/bin/logstash.lib.sh b/bin/logstash.lib.sh
@@ -138,11 +138,6 @@ setup_java() {
   export JAVACMD
 
   CLASSPATH="$(setup_classpath $LOGSTASH_JARS)"
-
-  # Verify the version of Java being used, and exit if the wrong version of Java is not available.
-  if ! "${JAVACMD}" -cp "${CLASSPATH}" org.logstash.util.JavaVersionChecker ; then
-    exit 1
-  fi
   JAVA_OPTS=`exec "${JAVACMD}" -cp "${CLASSPATH}" org.logstash.launchers.JvmOptionsParser "$LOGSTASH_HOME" "$LS_JVM_OPTS"`
   unset CLASSPATH
   export JAVA_OPTS

diff --git a/logstash-core/src/main/java/org/logstash/util/JavaVersion.java b/logstash-core/src/main/java/org/logstash/util/JavaVersion.java
diff --git a/logstash-core/src/main/java/org/logstash/util/JavaVersionChecker.java b/logstash-core/src/main/java/org/logstash/util/JavaVersionChecker.java