[ca-certificates-java] 46/58: Drop support for obsolete Java 6 (Closes: #776897)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository ca-certificates-java.

commit 95b7bf4bf63d0686ecf138102ca076ef188f6e1f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Mar 21 13:14:06 2016 +0000

    Drop support for obsolete Java 6 (Closes: #776897)
---
 debian/control              | 2 +-
 debian/jks-keystore.hook.in | 3 +--
 debian/postinst.in          | 3 +--
 debian/rules                | 6 +++---
 pom.xml                     | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 35d3b38..a3d7044 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: ca-certificates-java
 Architecture: all
 Multi-Arch: foreign
 Depends: ca-certificates (>= 20121114),
-         ${jre:Depends} | java6-runtime-headless,
+         ${jre:Depends} | java7-runtime-headless,
          ${misc:Depends},
          ${nss:Depends}
 # We need a versioned Depends due to multiarch changes (bug #635571).
diff --git a/debian/jks-keystore.hook.in b/debian/jks-keystore.hook.in
index bc4a7f9..423966d 100644
--- a/debian/jks-keystore.hook.in
+++ b/debian/jks-keystore.hook.in
@@ -35,8 +35,7 @@ if ! mountpoint -q /proc; then
     exit 1
 fi
 
-for jvm in java-6-openjdk-$arch java-6-openjdk \
-           java-7-openjdk-$arch java-7-openjdk java-6-sun; do
+for jvm in java-7-openjdk-$arch java-7-openjdk; do
 if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
     	break
 fi
diff --git a/debian/postinst.in b/debian/postinst.in
index d799ccb..44c96e0 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -26,8 +26,7 @@ nsslib_name()
 
 setup_path()
 {
-    for jvm in java-6-openjdk-$arch java-6-openjdk \
-               java-7-openjdk-$arch java-7-openjdk java-6-sun; do
+    for jvm in java-7-openjdk-$arch java-7-openjdk; do
     if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
         break
         fi
diff --git a/debian/rules b/debian/rules
index 4b1f487..1a40115 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,13 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	nss_lib = libnss3
 else
 	SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \
-				-Vjre:Depends="openjdk-6-jre-headless (>= 6b16-1.6.1-2)"
+				-Vjre:Depends="openjdk-7-jre-headless"
 	nss_lib = libnss3
 endif
 
 JAVA_HOME := /usr/lib/jvm/default-java
 export JAVA_HOME
-OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.6 -target 1.6"
+OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.7 -target 1.7"
 CLASSPATH := /usr/share/java/junit4.jar
 export CLASSPATH
 
@@ -32,7 +32,7 @@ build-stamp:
 	mkdir target
 	jh_build $(OPTS) target/ca-certificates-java.jar src/main/java
 ifeq ($(do_junit),yes)
-	jh_build --no-javadoc --javacopts="-source 1.6 -target 1.6 -cp target/ca-certificates-java.jar:${CLASSPATH}" \
+	jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7 -cp target/ca-certificates-java.jar:${CLASSPATH}" \
 	         target/ca-certificates-java-tests.jar src/test/java
 	mkdir target/test-classes
 	cp -R src/test/resources/* target/test-classes
diff --git a/pom.xml b/pom.xml
index d021598..72656dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>

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