Project

General

Profile

« Previous | Next » 

Revision afe81614

Added by Benoît PECCATTE over 7 years ago

Fixes #9917: Requires Java8 (jdk8) for Rudder 4.1

View differences:

packages.makefile
JAVAREQUIRES := $(shell grep -s "JAVA" SOURCES/.dependencies | cut -d ':' -f2)
# Original URL: http://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html#javasejdk
JDKURL := http://www.normation.com/tarball/java/jdk-7u80-linux-i586.rpm
JDKURL := http://www.normation.com/tarball/java/jdk-8u101-linux-i586.rpm
ifeq ($(ARCHI),x86_64)
JDKURL := http://www.normation.com/tarball/java/jdk-7u80-linux-x64.rpm
JDKURL := http://www.normation.com/tarball/java/jdk-8u101-linux-x86_64.rpm
endif
rudder-inventory-endpoint/SOURCES/.dependencies
RHEL6:java7-devel
RHEL7:java-devel
FEDORA18:java-devel
FEDORA20:java-devel
RHEL6:java-1.8.0-openjdk-devel
RHEL7:java-1.8.0-openjdk-devel
JAVA:jdk
rudder-inventory-endpoint/SPECS/rudder-inventory-endpoint.spec
##
## 1 - RHEL
%if 0%{?rhel} && 0%{?rhel} == 6
BuildRequires: java7-devel
%endif
%if 0%{?rhel} && 0%{?rhel} >= 7
BuildRequires: java-devel
%if 0%{?rhel}
BuildRequires: java-1.8.0-openjdk-devel
%endif
%if 0%{?rhel}
Requires: jetty-eclipse
%endif
## 2 - Fedora
%if 0%{?fedora}
# Cf. https://fedoraproject.org/wiki/Packaging:Java for details
BuildRequires: java-devel
Requires: jetty-server
%endif
## 3 - SLES
## No Jetty provided by SLES... Use our own.
%if 0%{?suse_version}
BuildRequires: jdk >= 1.7
BuildRequires: jdk >= 1.8
Requires: rudder-jetty = %{real_epoch}:%{real_version}
%endif
rudder-inventory-endpoint/debian/control
Section: web
Priority: extra
Maintainer: Rudder packaging team <rudder-packaging@rudder-project.org>
Build-Depends: debhelper (>= 7), openjdk-7-jdk | openjdk-8-jdk
Build-Depends: debhelper (>= 7), openjdk-8-jdk
Standards-Version: 3.8.0
Homepage: http://www.rudder-project.org
Package: rudder-inventory-endpoint
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, rudder-jetty (= ${binary:Version}) | jetty | jetty8, rudder-inventory-ldap (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, rudder-jetty (= ${binary:Version}) | jetty | jetty8, rudder-inventory-ldap (= ${binary:Version}), java8-runtime | openjdk-8-jre
Description: Configuration management and audit tool - service to receive inventory data
Rudder is an open source configuration management and audit solution.
.
rudder-jetty/SOURCES/rudder-jetty.conf
if [ -z "${JAVA_HOME}" ]
then
## We support OpenJDK 7 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-[78]-openjdk-*' | sort -r | head -n1); fi
## 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/java ]; then JAVA_HOME=/usr/java/latest; fi
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.7` ]; then
echo "Rudder requires Java 7 or later. Your version of Java (detected as ${JAVA}) is ${JAVA_MAJOR_VERSION}."
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}."
echo "Please install a more recent JVM."
exit 1
fi
......
-Dlogback.configurationFile=/opt/rudder/etc/logback.xml
-Drun.mode=production"
# These options were deprecated as of Java 1.8, so only use them if we're on an older version
if [ `ver ${JAVA_MAJOR_VERSION}` -lt `ver 1.8` ]; then
JAVA_OPTIONS="$JAVA_OPTIONS -XX:PermSize=128m -XX:MaxPermSize=${JAVA_MAXPERMSIZE}m"
fi
# Jetty settings
JETTY_HOME="/opt/rudder/jetty7/"
JETTY_RUN="/var/rudder/run"
rudder-jetty/SPECS/rudder-jetty.spec
# in RPM yet...
%if 0%{?rhel} && 0%{?rhel} > 6
Requires: jre >= 1.7
Requires: jre >= 1.8
%endif
%if 0%{?rhel} && 0%{?rhel} == 6
Requires: java-1.7.0-openjdk
%endif
%if 0%{!?rhel}
Requires: jre >= 1.6
Requires: java-1.8.0-openjdk
%endif
# We are providing Jetty, but the name of the provided element depends of the
......
# Java VM location
#
#JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
#JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
#JAVA=java
# Source variables from /opt/rudder/etc/rudder-jetty.conf
rudder-jetty/debian/control
Package: rudder-jetty
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre (>=6) | java7-runtime-headless
Depends: ${shlibs:Depends}, ${misc:Depends}, java8-runtime | openjdk-8-jre
Conflicts: java9-runtime-headless, java9-runtime
Description: Configuration management and audit tool - Jetty application server
Rudder is an open source configuration management and audit solution.
rudder-jetty/debian/postinst
# Java VM location
#
#JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
#JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
#JAVA=java
# Source variables from /opt/rudder/etc/rudder-jetty.conf
rudder-reports/SOURCES/.dependencies
JAVA:jdk
rudder-webapp/SOURCES/.dependencies
RHEL6:java7-devel selinux-policy
RHEL7:java-devel selinux-policy-devel
FEDORA18:java-devel selinux-policy-devel
FEDORA20:java-devel selinux-policy-devel
RHEL6:java-1.8.0-openjdk-devel selinux-policy
RHEL7:java-1.8.0-openjdk-devel selinux-policy-devel
JAVA:jdk
rudder-webapp/SPECS/rudder-webapp.spec
## 1 - RHEL
%if 0%{?rhel} && 0%{?rhel} == 6
BuildRequires: java7-devel selinux-policy
BuildRequires: java-1.8.0-openjdk-devel selinux-policy
%endif
%if 0%{?rhel} && 0%{?rhel} >= 7
BuildRequires: java-devel selinux-policy-devel
BuildRequires: java-1.8.0-openjdk-devel selinux-policy-devel
%endif
%if 0%{?rhel}
Requires: mod_ssl jetty-eclipse
%endif
## 2 - Fedora
%if 0%{?fedora}
# Cf. https://fedoraproject.org/wiki/Packaging:Java for details
BuildRequires: java-devel selinux-policy-devel
Requires: jetty-server
%endif
## 3 - SLES
## No Jetty provided by SLES... Use our own.
%if 0%{?suse_version}
BuildRequires: jdk >= 1.7
BuildRequires: jdk >= 1.8
Requires: rudder-jetty = %{real_epoch}:%{real_version}
%endif
rudder-webapp/debian/control
Section: web
Priority: extra
Maintainer: Rudder packaging team <rudder-packaging@rudder-project.org>
Build-Depends: debhelper (>= 7), openjdk-7-jdk | openjdk-8-jdk
Build-Depends: debhelper (>= 7), openjdk-8-jdk
Standards-Version: 3.8.0
Homepage: http://www.rudder-project.org
Package: rudder-webapp
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, rudder-jetty | jetty | jetty8, rudder-techniques (= ${binary:Version}), rudder-server-relay (= ${binary:Version}), apache2, apache2-utils, ncf, git-core, rsync, lsb-release, openssl, ldap-utils, postgresql-client (>=8.4), ncf-api-virtualenv
Depends: ${shlibs:Depends}, ${misc:Depends}, rudder-jetty | jetty | jetty8, rudder-techniques (= ${binary:Version}), rudder-server-relay (= ${binary:Version}), apache2, apache2-utils, ncf, git-core, rsync, lsb-release, openssl, ldap-utils, postgresql-client (>=8.4), ncf-api-virtualenv, java8-runtime | openjdk-8-jre
Description: Configuration management and audit tool - webapp
Rudder is an open source configuration management and audit solution.
.

Also available in: Unified diff