[tomcat8] 01/01: Require Java 8 or higher (Closes: #848612)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit aecf5a667d62a9d26f851f88ec20d40d574b4197
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Dec 18 23:56:49 2016 +0100

    Require Java 8 or higher (Closes: #848612)
---
 debian/changelog    | 7 +++++++
 debian/control      | 2 +-
 debian/tomcat8.init | 5 +----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5b7c74..9d64fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.5.9-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Require Java 8 or higher (Closes: #848612)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Dec 2016 23:52:21 +0100
+
 tomcat8 (8.5.9-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 4a13778..9ec398f 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Homepage: http://tomcat.apache.org
 
 Package: tomcat8-common
 Architecture: all
-Depends: default-jre-headless | java7-runtime-headless | java7-runtime,
+Depends: default-jre-headless | java8-runtime-headless | java8-runtime,
          libtomcat8-java (>= ${source:Version}),
          ${misc:Depends}
 Description: Apache Tomcat 8 - Servlet and JSP engine -- common files
diff --git a/debian/tomcat8.init b/debian/tomcat8.init
index 4fe223a..44fa6be 100644
--- a/debian/tomcat8.init
+++ b/debian/tomcat8.init
@@ -58,7 +58,7 @@ TOMCAT8_GROUP=tomcat8
 # this function sets the variable JDK_DIRS
 find_jdks()
 {
-    for java_version in 9 8 7
+    for java_version in 9 8
     do
         for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
                       /usr/lib/jvm/jdk-${java_version}-oracle-* \
@@ -71,9 +71,6 @@ find_jdks()
             fi
         done
     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"
 }
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git