diff -Nru ca-certificates-java-20180516/debian/changelog ca-certificates-java-20180516ubuntu1/debian/changelog
--- ca-certificates-java-20180516/debian/changelog	2018-05-16 18:00:38.000000000 -0300
+++ ca-certificates-java-20180516ubuntu1/debian/changelog	2018-05-17 10:03:29.000000000 -0300
@@ -1,3 +1,15 @@
+ca-certificates-java (20180516ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: Bump javahelper build dependency.
+    - debian/rules:
+      + Explicitly depend on openjdk-11-jre-headless, needed to configure.
+      + Replace javac arguments '-source 1.7 -target 1.7' with '--release 7'
+        as, per JEP-247, it also takes care of setting the right -bootclasspath
+        argument.
+
+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>  Thu, 17 May 2018 13:03:29 +0000
+
 ca-certificates-java (20180516) unstable; urgency=medium
 
   * Team upload.
@@ -20,6 +32,21 @@
 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 16 May 2018 23:00:38 +0200
 
+ca-certificates-java (20180413ubuntu1) cosmic; urgency=medium
+
+  * Merge from debian unstable. Remaining changes: (LP: #1769013,
+    LP: #1739631)
+    + debian/control: Bump javahelper build dependency.
+    + debian/rules:
+      - Explicitly depend on openjdk-11-jre-headless, needed to configure.
+      - Replace javac arguments '-source 1.7 -target 1.7' with '--release 7'
+        as, per JEP-247, it also takes care of setting the right -bootclasspath
+        argument.
+  * debian/jks-keystore.hook.in: don't create a jvm-*.cfg file, a default file
+    with the right configuration is already supplied by the openjdk packages.
+
+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>  Fri, 04 May 2018 01:31:24 +0000
+
 ca-certificates-java (20180413) unstable; urgency=medium
 
   * Team upload.
@@ -32,6 +59,25 @@
 
  -- Emmanuel Bourg <ebourg@apache.org>  Fri, 13 Apr 2018 14:15:39 +0200
 
+ca-certificates-java (20170930ubuntu1) bionic; urgency=medium
+
+  [ Tiago Stürmer Daitx ]
+  * debian/rules:
+    - depend on default-jre-headless 2:1.9 or newer instead of
+     openjdk-8-jre-headless.
+    - replace javac arguments '-source 1.7 -target 1.7' with '--release 7'
+      as, per JEP-247, it also takes care of setting the right -bootclasspath
+      argument.
+  * debian/postinst.in:
+    - add and give preference to default-java if it exists.
+    - add openjdk-11 to the jre/jdk setup path.
+
+  [ Matthias Klose ]
+  * Explicitly depend on openjdk-11-jre-headless, needed to configure.
+  * Bump javahelper build dependency.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 08 Apr 2018 13:19:21 +0200
+
 ca-certificates-java (20170930) unstable; urgency=medium
 
   * Team upload.
diff -Nru ca-certificates-java-20180516/debian/control ca-certificates-java-20180516ubuntu1/debian/control
--- ca-certificates-java-20180516/debian/control	2018-05-16 18:00:30.000000000 -0300
+++ ca-certificates-java-20180516ubuntu1/debian/control	2018-05-17 00:44:44.000000000 -0300
@@ -1,10 +1,11 @@
 Source: ca-certificates-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko@ubuntu.com>,
            James Page <james.page@ubuntu.com>
-Build-Depends: debhelper (>= 11), default-jdk, javahelper, junit4
+Build-Depends: debhelper (>= 11), default-jdk, javahelper (>= 0.63ubuntu1), junit4
 Standards-Version: 4.1.4
 Vcs-Git: https://salsa.debian.org/java-team/ca-certificates-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/ca-certificates-java
diff -Nru ca-certificates-java-20180516/debian/rules ca-certificates-java-20180516ubuntu1/debian/rules
--- ca-certificates-java-20180516/debian/rules	2018-05-16 17:59:06.000000000 -0300
+++ ca-certificates-java-20180516ubuntu1/debian/rules	2018-05-17 00:44:44.000000000 -0300
@@ -16,7 +16,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 export JAVA_HOME
-OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.7 -target 1.7"
+OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="--release 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.7 -target 1.7 -cp target/ca-certificates-java.jar:${CLASSPATH}" \
+	jh_build --no-javadoc --javacopts="--release 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