debian/changelog

+ldapjdk (4.20.0+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Build depend on default-jdk instead of openjdk-8-jdk (Closes: #910698)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 30 Nov 2018 11:09:37 +0100
+
 ldapjdk (4.20.0+dfsg1-2) unstable; urgency=medium
 
   * Build with JDK8.

debian/control

@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 10),
  javahelper,
 Build-Depends-Indep:
- openjdk-8-jdk-headless,
+ default-jdk,
  libjss-java (>= 4.5.0~),
  liboro-java,
 Standards-Version: 4.1.2

debian/patches/01-java8-compatibility.patch

+Description: Ensure the compiled code remains compatible with Java 8
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/java-sdk/build.xml
++++ b/java-sdk/build.xml
+@@ -184,14 +184,17 @@
+     <target name="build-jdk" depends="init">
+         <!-- Compile the java jdk code from ${src} into ${dest} -->
+         <javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
++            release="8"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
+         />
+         <javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
++            release="8"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
+         />
+         <javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
++            release="8"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
+         />
+@@ -199,6 +202,7 @@
+ 
+     <target name="build-filter" depends="init,build-jdk">
+         <javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
++            release="8"
+             excludes="cvs/**"
+             classpath="${jdk.dist}:${jsselibs}"
+         />
+@@ -207,6 +211,7 @@
+     <target name="build-beans" depends="init">
+         <!-- Compile the java jdk bean code from ${src} into ${dest} -->
+         <javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
++            release="8"
+             excludes="cvs/**"
+             classpath="${jsselibs}"
+         />
+@@ -215,6 +220,7 @@
+     <target name="build-jndi" depends="init,build-jdk">
+         <!-- Compile the java code from ${src} into ${dest} -->
+         <javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
++            release="8"
+             excludes="cvs/**"
+             classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar"
+         />

debian/patches/series

 #placeholder
+01-java8-compatibility.patch

debian/rules

 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
 	dh $@ --with javahelper