Merge branch 'arch_21109/make_java_11_the_minimum_version_for_rudder_…

…7_2_pr'

rudder-server/SOURCES/rudder-jetty.conf

@@ -14,7 +14,7 @@ ver() { printf "%03d%03d" `echo "$1" | tr '.' ' '`; }
 if [ -z "${JAVA_HOME}" ]
 then
     ## We support OpenJDK 8 onwards, privilege latest versions (sort -r) while searching for JAVA_HOME
-    if [ -d /usr/lib/jvm ]; then JAVA_HOME=$(find /usr/lib/jvm -maxdepth 1 -type d -name 'java-8-openjdk-*' | sort -r | head -n1); fi
+    if [ -d /usr/lib/jvm ]; then JAVA_HOME=$(find /usr/lib/jvm -maxdepth 1 -type d -name 'java-11-openjdk-*' | sort -r | head -n1); fi
     if [ -d /usr/java ]; then JAVA_HOME=/usr/java/latest; fi
 fi
 
@@ -27,8 +27,8 @@ fi
 # Check JVM major version
 JAVA_MAJOR_VERSION=`${JAVA} -version 2>&1 | grep -E "(java|openjdk) version" | sed 's%.*version "\([0-9]\+\.[0-9]\+\|[0-9]\+\).*%\1%'`
 
-if [ `ver ${JAVA_MAJOR_VERSION}` -lt `ver 1.8` ]; then
-  echo "Rudder requires Java 8 or later. Your version of Java (detected as ${JAVA}) is ${JAVA_MAJOR_VERSION}."
+if [ `ver ${JAVA_MAJOR_VERSION}` -lt `ver 11.0` ]; then
+  echo "Rudder requires Java 11 or later. Your version of Java (detected as ${JAVA}) is ${JAVA_MAJOR_VERSION}."
   echo "Please install a more recent JVM."
   exit 1
 fi

rudder-server/SPECS/rudder-server.spec

@@ -89,7 +89,7 @@ BuildRequires: gcc, rsync
 %if 0%{?rhel}
 BuildRequires: selinux-policy-devel
 Requires: mod_ssl httpd shadow-utils
-Requires: jre-headless >= 1.8
+Requires: jre-headless >= 11
 Requires: perl-Digest-SHA libtool-ltdl
 BuildRequires: openssl-devel libtool-ltdl-devel
 %endif
@@ -100,12 +100,8 @@ Requires: apache2 pwdutils libltdl7
 BuildRequires: libopenssl-devel
 %endif
 
-%if 0%{?sle_version} && 0%{?sle_version} >= 120100 && 0%{?sle_version} < 150000
-Requires: java-1_8_0-openjdk-headless
-%endif
-
 %if 0%{?sle_version} && 0%{?sle_version} >= 150000
-Requires: jre-headless >= 8
+Requires: jre-headless >= 11
 %endif
 
 ## Python 3