[pkg-java] r19012 - in trunk/ca-certificates-java: . debian

[Benjamin Drung]

Author: bdrung
Date: 2016-03-21 13:14:06 +0000 (Mon, 21 Mar 2016)
New Revision: 19012

Modified:
   trunk/ca-certificates-java/debian/control
   trunk/ca-certificates-java/debian/jks-keystore.hook.in
   trunk/ca-certificates-java/debian/postinst.in
   trunk/ca-certificates-java/debian/rules
   trunk/ca-certificates-java/pom.xml
Log:
Drop support for obsolete Java 6 (Closes: #776897)


Modified: trunk/ca-certificates-java/debian/control
===================================================================
--- trunk/ca-certificates-java/debian/control	2016-03-21 09:17:39 UTC (rev 19011)
+++ trunk/ca-certificates-java/debian/control	2016-03-21 13:14:06 UTC (rev 19012)
@@ -15,7 +15,7 @@
 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).

Modified: trunk/ca-certificates-java/debian/jks-keystore.hook.in
===================================================================
--- trunk/ca-certificates-java/debian/jks-keystore.hook.in	2016-03-21 09:17:39 UTC (rev 19011)
+++ trunk/ca-certificates-java/debian/jks-keystore.hook.in	2016-03-21 13:14:06 UTC (rev 19012)
@@ -35,8 +35,7 @@
     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

Modified: trunk/ca-certificates-java/debian/postinst.in
===================================================================
--- trunk/ca-certificates-java/debian/postinst.in	2016-03-21 09:17:39 UTC (rev 19011)
+++ trunk/ca-certificates-java/debian/postinst.in	2016-03-21 13:14:06 UTC (rev 19012)
@@ -26,8 +26,7 @@
 
 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

Modified: trunk/ca-certificates-java/debian/rules
===================================================================
--- trunk/ca-certificates-java/debian/rules	2016-03-21 09:17:39 UTC (rev 19011)
+++ trunk/ca-certificates-java/debian/rules	2016-03-21 13:14:06 UTC (rev 19012)
@@ -10,13 +10,13 @@
 	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 @@
 	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

Modified: trunk/ca-certificates-java/pom.xml
===================================================================
--- trunk/ca-certificates-java/pom.xml	2016-03-21 09:17:39 UTC (rev 19011)
+++ trunk/ca-certificates-java/pom.xml	2016-03-21 13:14:06 UTC (rev 19012)
@@ -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>