[jetty9] 115/135: Require Java 7 or higher
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 17 14:53:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jetty9.
commit 2b3ad6ea3178445d2505c05af928d2afd8fe35aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 2 00:35:06 2015 +0100
Require Java 7 or higher
---
debian/control | 2 +-
debian/jetty9.init | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 0932ee6..4caa43b 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,7 @@ Package: jetty9
Architecture: all
Depends: adduser,
apache2-utils,
- default-jre-headless | java6-runtime-headless,
+ default-jre-headless | java7-runtime-headless,
libjetty9-java (>= ${source:Version}),
libjetty9-extra-java (>= ${source:Version}),
${misc:Depends}
diff --git a/debian/jetty9.init b/debian/jetty9.init
index e80e79f..02435ea 100644
--- a/debian/jetty9.init
+++ b/debian/jetty9.init
@@ -120,14 +120,14 @@ JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true"
# This function sets the variable JDK_DIRS
find_jdks()
{
- for java_version in 9 8 7 6
+ for java_version in 9 8 7
do
for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
/usr/lib/jvm/jdk-${java_version}-oracle-* \
/usr/lib/jvm/jre-${java_version}-oracle-* \
/usr/lib/jvm/java-${java_version}-oracle
do
- if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-${java_version}-openjdk-common" ]
+ if [ -d "${jvmdir}" ]
then
JDK_DIRS="${JDK_DIRS} ${jvmdir}"
fi
@@ -135,7 +135,7 @@ find_jdks()
done
# Add the paths for the JVMs packaged by the older versions of java-package (<< 0.52 as in Wheezy and Trusty)
- JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/j2re1.7-oracle /usr/lib/jvm/j2sdk1.7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
+ JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/j2re1.7-oracle /usr/lib/jvm/j2sdk1.7-oracle"
}
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
@@ -210,7 +210,7 @@ ROTATELOGS=/usr/sbin/rotatelogs
##################################################
if [ -z "$JAVA_HOME" ]; then
log_failure_msg "Could not start $DESC because no Java Runtime Environment (JRE)"
- log_failure_msg "was found. Please download and install Java 6 or higher and set"
+ log_failure_msg "was found. Please download and install Java 7 or higher and set"
log_failure_msg "JAVA_HOME in /etc/default/jetty$VERSION to the JDK's installation directory."
exit 0
fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list