Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #21109: Make java 11 the minimum version for rudder 7.2 #2599

Merged
merged 1 commit into from
May 19, 2022
Merged

Fixes #21109: Make java 11 the minimum version for rudder 7.2 #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions rudder-server/SOURCES/rudder-jetty.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions rudder-server/SPECS/rudder-server.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,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
Expand All @@ -96,12 +96,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
Expand Down