diff -Nru lombok-1.16.22/debian/changelog lombok-1.16.22/debian/changelog
--- lombok-1.16.22/debian/changelog	2019-01-22 15:46:16.000000000 +0000
+++ lombok-1.16.22/debian/changelog	2019-02-05 21:30:12.000000000 +0000
@@ -1,3 +1,10 @@
+lombok (1.16.22-7) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the build dependency on OpenJDK 8 (Closes: #920714)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 05 Feb 2019 22:30:12 +0100
+
 lombok (1.16.22-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru lombok-1.16.22/debian/control lombok-1.16.22/debian/control
--- lombok-1.16.22/debian/control	2019-01-22 15:46:07.000000000 +0000
+++ lombok-1.16.22/debian/control	2019-02-05 20:47:20.000000000 +0000
@@ -11,17 +11,17 @@
  cmdreader,
  debhelper (>= 11),
  default-jdk,
- ivyplusplus (>= 1.26),
+ ivyplusplus (>= 1.28-3~),
  javahelper,
  libasm-java,
  libeclipse-jdt-core-manipulation-java,
  libeclipse-jdt-ui-java,
+ libeclipse-jface-text-java,
  libjna-java,
  liblombok-patcher-java,
  libosgi-core-java,
  libspi-java,
- maven-repo-helper,
- openjdk-8-jdk
+ maven-repo-helper
 Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/lombok.git
 Vcs-Browser: https://salsa.debian.org/java-team/lombok
diff -Nru lombok-1.16.22/debian/patches/build.patch lombok-1.16.22/debian/patches/build.patch
--- lombok-1.16.22/debian/patches/build.patch	2019-01-22 15:42:37.000000000 +0000
+++ lombok-1.16.22/debian/patches/build.patch	2019-02-05 15:04:27.000000000 +0000
@@ -3,22 +3,24 @@
 Subject: build
 --- a/build.xml
 +++ b/build.xml
-@@ -37,6 +37,14 @@
+@@ -37,6 +37,16 @@
  		<fileset dir="lib/build">
  			<include name="*.jar" />
  		</fileset>
 +		<fileset dir="/usr/share/java">
++			<include name="eclipse-core-jobs.jar" />
 +			<include name="eclipse-core-runtime.jar" />
 +			<include name="eclipse-core-resources.jar" />
 +			<include name="eclipse-jdt-core.jar" />
 +			<include name="eclipse-jdt-core-manipulation.jar" />
 +			<include name="eclipse-jdt-ui.jar" />
++			<include name="eclipse-jface-text.jar" />
 +			<include name="equinox-common.jar" />
 +		</fileset>
  	</path>
  	
  	<path id="runtime.path">
-@@ -87,14 +95,14 @@
+@@ -87,14 +97,14 @@
  		<fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
  	</target>
  	
@@ -35,7 +37,7 @@
  	
  	<target name="contrib" depends="config-ivy" description="Downloads various non-crucial documentation, sources, etc that are useful when developing lombok.ast.">
  		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj7, ecj8, ecj9" />
-@@ -117,8 +125,6 @@
+@@ -117,8 +127,6 @@
  	</target>
  	
  	<target name="ensureRuntimeDeps" depends="config-ivy">
@@ -44,7 +46,7 @@
  	</target>
  	
  	<target name="ensureTestDeps" depends="config-ivy">
-@@ -155,7 +161,7 @@
+@@ -155,7 +163,7 @@
  		<echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo>
  	</target>
  	
@@ -53,7 +55,7 @@
  		<ivy:cachedunjar dest="build/lombok" marker="build/unpackDeps.marker">
  			<path refid="runtime.path" />
  		</ivy:cachedunjar>
-@@ -176,7 +182,7 @@
+@@ -176,7 +184,7 @@
  		<fail if="java.version.insufficient">To compile lombok, you need JDK9 or higher; lombok requires this version because it's rather difficult to produce lombok builds that are compatible on JDK9 without at least building with JDK9. Sorry about that.</fail>
  	</target>
  	
@@ -62,7 +64,7 @@
  		<!-- ant includes the destination dir on the classpath (and there are good reasons to do this), but that also means
  		 the bleeding edge lombok from the previous build is run, which means if there are bugs in it, you can't compile
  		anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
-@@ -280,6 +286,7 @@
+@@ -280,6 +288,7 @@
  			<include name="lombok/javac/**" />
  			<include name="lombok/delombok/**" />
  			<classpath location="build/lombok" />
@@ -70,7 +72,7 @@
  			<classpath refid="build.path" />
  		</ivy:compile>
  		<delete dir="build/lombok-proc-result" quiet="true" />
-@@ -318,7 +325,7 @@
+@@ -318,7 +327,7 @@
  		</ant>
  	</target>
  	
diff -Nru lombok-1.16.22/debian/patches/build-with-java11-only.patch lombok-1.16.22/debian/patches/build-with-java11-only.patch
--- lombok-1.16.22/debian/patches/build-with-java11-only.patch	1970-01-01 00:00:00.000000000 +0000
+++ lombok-1.16.22/debian/patches/build-with-java11-only.patch	2019-02-05 21:26:34.000000000 +0000
@@ -0,0 +1,111 @@
+Description: Build with Java 11, using the javac 'release' parameter to replace the bootclasspaths
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -141,8 +141,7 @@
+ 	
+ 	<target name="version" depends="ensure-ipp, ensureOpenJdk8Rt" description="Shows the version number." unless="lombok.version">
+ 		<mkdir dir="build/lombok" />
+-		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true">
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/lombok" release="8" ecj="false" nowarn="true">
+ 			<src path="src/core" />
+ 			<include name="lombok/core/Version.java" />
+ 		</ivy:compile>
+@@ -191,29 +190,26 @@
+ 		We re-create the file at the end of this target. -->
+ 		<delete file="build/lombok/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
+ 		<delete file="build/lombok/META-INF/services/org.mapstruct.ap.spi.AstModifyingAnnotationProcessor" quiet="true" />
+-		<ivy:compile destdir="build/stubsstubs" source="1.5" target="1.5" ecj="true" nowarn="true">
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/stubsstubs" release="6" nowarn="true">
+ 			<src path="src/stubsstubs" />
+ 			<classpath location="build/stubsstubs" />
+ 		</ivy:compile>
+-		<ivy:compile destdir="build/stubs" source="1.5" target="1.5" ecj="true" nowarn="true">
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/stubs" release="6" nowarn="true">
+ 			<src path="src/stubs" />
+ 			<src path="src/javac-only-stubs" />
+ 			<classpath location="build/stubsstubs" />
+ 			<classpath location="build/stubs" />
+ 		</ivy:compile>
+ 		
+-		<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+-			<bootclasspath location="build/stubs" />
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/lombok-utils" release="1.6" nowarn="true">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<src path="src/utils" />
+ 			<exclude name="lombok/javac/**" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+ 		
+-		<ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6">
+-			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}${rt-openjdk6}" />
++		<ivy:compile destdir="build/lombok-utils" release="1.6">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<compilerarg value="-Xlint:-options" />
+ 			<src path="src/utils" />
+ 			<include name="lombok/javac/**" />
+@@ -239,21 +235,18 @@
+ 			</filterchain>
+ 		</copy>
+ 		
+-		<ivy:compile destdir="build/lombok" source="1.4" target="1.4" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+-			<bootclasspath location="build/stubs" />
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/lombok" release="6" nowarn="true">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<src path="build/transformedSources" />
+ 		</ivy:compile>
+ 		
+-		<ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+-			<bootclasspath location="build/stubs" />
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/lombok/Class50" release="1.6" nowarn="true">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<src path="build/transformedSources" />
+ 		</ivy:compile>
+ 		
+-		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+-			<bootclasspath location="build/stubs" />
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/lombok" release="1.6" nowarn="true">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<src path="src/launch" />
+ 			<src path="src/core" />
+ 			<src path="src/installer" />
+@@ -270,17 +263,16 @@
+ 			<src path="src/core9" />
+ 		</ivy:compile>
+ 		
+-		<ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+-			<bootclasspath location="build/stubs" />
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/lombok/Class50" release="1.6" nowarn="true">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<src path="src/eclipseAgent" />
+ 			<include name="lombok/launch/PatchFixesHider.java" />
+ 			<classpath location="build/lombok" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+ 		
+-		<ivy:compile destdir="build/lombok" source="1.6" target="1.6">
+-			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}${rt-openjdk6}" />
++		<ivy:compile destdir="build/lombok" release="6">
++			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+ 			<compilerarg value="-Xlint:-options" />
+ 			<src path="src/core" />
+ 			<src path="src/delombok" />
+@@ -550,8 +542,7 @@
+ 	
+ 	<target name="-test-compile" depends="ensureTestDeps, compile" unless="skipTests">
+ 		<mkdir dir="build/tests" />
+-		<ivy:compile destdir="build/tests" source="1.5" target="1.5" ecj="true" nowarn="true">
+-			<bootclasspath path="${rt-openjdk8}" />
++		<ivy:compile destdir="build/tests" release="1.6" nowarn="true">
+ 			<classpath refid="test.path" />
+ 			<classpath refid="build.path" />
+ 			<classpath path="build/lombok" />
diff -Nru lombok-1.16.22/debian/patches/series lombok-1.16.22/debian/patches/series
--- lombok-1.16.22/debian/patches/series	2018-11-22 21:42:48.000000000 +0000
+++ lombok-1.16.22/debian/patches/series	2019-02-05 14:50:00.000000000 +0000
@@ -3,3 +3,4 @@
 disable-java6-and-java7-support.patch
 remove-j9stub.patch
 java11-log-error.patch
+build-with-java11-only.patch
diff -Nru lombok-1.16.22/debian/rules lombok-1.16.22/debian/rules
--- lombok-1.16.22/debian/rules	2018-09-19 23:07:34.000000000 +0000
+++ lombok-1.16.22/debian/rules	2019-02-05 15:27:46.000000000 +0000
@@ -8,8 +8,8 @@
 override_dh_auto_build:
 	ant -Dbasedir=$(CURDIR) \
 		-Dlombok.version=1.16.22 \
-		-Drt-openjdk6=/usr/lib/jvm/java-8-openjdk-${DEB_BUILD_ARCH}/jre/lib/rt.jar \
-		-Drt-openjdk8=/usr/lib/jvm/java-8-openjdk-${DEB_BUILD_ARCH}/jre/lib/rt.jar \
+	        -Drt-openjdk6.available=true \
+	        -Drt-openjdk8.available=true \
 		dist dist-utils
 
 override_jh_linkjars: