.gitignore

@@ -20,3 +20,4 @@
 /eclipse.location
 /.apt_generated/
 /out
+/website/lombokSupporters

AUTHORS

 Lombok contributors in alphabetical order:
 
 Bulgakov Alexander <buls@yandex.ru>
+Christian Nüssgens <christian@nuessgens.com>
 Christian Sterzl <christian.sterzl@gmail.com>
 DaveLaw <project.lombok@apconsult.de>
 Dave Brosius <dbrosius@mebigfatguy.com>
 Dawid Rusin <dawidrusin90@gmail.com>
 Enrique da Costa Cambio <enrique.dacostacambio@gmail.com>
 Jappe van der Hel <jappe.vanderhel@gmail.com>
+Kevin Chirls <kchirls@users.noreply.github.com>
 Liu DongMiao <liudongmiao@gmail.com>
 Luan Nico <luannico27@gmail.com>
 Maarten Mulders <mthmulders@users.noreply.github.com>
 Mart Hagenaars <marthagenaars@gmail.com>
+Mateusz Matela <mateusz.matela@gmail.com>
+Michiel Verheul <cheelio@gmail.com>
+Pascal Bihler <pascal@qfs.de>
 Peter Grant <petercgrant@users.noreply.github.com>
 Philipp Eichhorn <peichhor@web.de>
 Rabea Gransberger <rgra@users.noreply.github.com>
@@ -20,7 +25,9 @@ Roel Spilker <r.spilker@gmail.com>
 Sander Koning <askoning@gmail.com>
 Szymon Pacanowski <spacanowski@gmail.com>
 Taiki Sugawara <buzz.taiki@gmail.com>
+Takuya Murakami <tmurakam@tmurakam.org>
 Thomas Darimont <thomas.darimont@gmail.com>
+Victor Williams Stafusa da Silva <victorwssilva@gmail.com>
 Yun Zhi Lin <yun@yunspace.com>
 
 By adding your name to this list, you grant full and irrevocable copyright and patent indemnity to Project Lombok and all use of Project Lombok, and you certify that you have the right to do so for all commits you add to Project Lombok.

buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.22.xml → buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.24.xml

 <ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.22" publication="20161107000000">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.24" publication="20171128000000">
 		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
 		<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
 		<ivyauthor name="rspilker" url="http://github.com/rspilker" />
@@ -9,6 +9,6 @@
 		<conf name="default" />
 	</configurations>
 	<publications>
-		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.22.jar" />
+		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.24.jar" />
 	</publications>
 </ivy-module>

buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.26.xml

+<ivy-module version="2.0">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.26" publication="20180528200000">
+		<license name="MIT License" url="https://www.opensource.org/licenses/mit-license.php" />
+		<ivyauthor name="rzwitserloot" url="https://github.com/rzwitserloot" />
+		<ivyauthor name="rspilker" url="https://github.com/rspilker" />
+		<description homepage="https://projectlombok.org/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.26.jar" />
+	</publications>
+</ivy-module>

buildScripts/ivy.xml

@@ -11,11 +11,13 @@
 		<conf name="contrib" />
 		<conf name="ecj7" />
 		<conf name="ecj8" />
+		<conf name="ecj9" />
 		<conf name="javac6" />
 		<conf name="javac7" />
+		<conf name="supporters" />
 	</configurations>
 	<dependencies>
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.22" conf="buildBase->default; runtime->default" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.26" conf="buildBase->default; runtime->default" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" />
 		
 		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
@@ -31,8 +33,7 @@
 		
 		<dependency org="org.apache.ant" name="ant" rev="1.8.1" conf="buildBase->default; contrib->sources" />
 		<dependency org="projectlombok.org" name="spi" rev="0.2.7" conf="buildBase->build" />
-		<dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="buildBase->default" />
-		<dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="buildBase->build" />
+		<dependency org="com.hierynomus" name="sshj" rev="0.23.0" conf="buildBase->default" />
 		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="buildBase->build" />
 		<dependency org="de.java2html" name="java2html" rev="5.0" conf="buildBase->default" />
 		<dependency org="org.freemarker" name="freemarker" rev="2.3.25-incubating" conf="buildBase->default" />
@@ -40,7 +41,9 @@
 		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime; contrib->sources" />
 		<dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="ecj" rev="4.3.1" conf="ecj7->default; contrib->sources" />
-		<dependency org="org.eclipse.custom" name="ecj" rev="I20140430" conf="ecj8->default; contrib->sources; eclipseBuild->default" />
+		<dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.6.1" conf="ecj8->default; contrib->sources" />
+		<dependency org="org.eclipse.tycho" name="org.eclipse.jdt.core" rev="3.13.50.v20171007-0855" conf="ecj9->default; eclipseBuild->default" />
+		<dependency org="org.eclipse.tycho" name="org.eclipse.jdt.compiler.apt" rev="1.3.50.v20170920-0950" conf="ecj9->default; eclipseBuild->default" />
 		
 		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" />
@@ -54,5 +57,11 @@
 		<dependency org="org.eclipse.custom" name="osgi" rev="3.9.0" conf="eclipseBuild->default; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="core.resources" rev="3.8.100" conf="eclipseBuild->default; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="core.jobs" rev="3.5.300" conf="eclipseBuild->default; contrib->sources" />
+		
+		<dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" rev="4.11.0.201803080745-r" conf="supporters->default" />
+		<dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="4.11.0.201803080745-r" conf="supporters->default" />
+		<dependency org="com.jcraft" name="jsch" rev="0.1.54" conf="supporters->default" />
+		<dependency org="com.rimerosolutions.ant" name="ant-git-tasks" rev="1.3.2" conf="supporters->default" />
+		<dependency org="org.slf4j" name="slf4j-simple" rev="1.6.1" conf="supporters->default" />
 	</dependencies>
 </ivy-module>

buildScripts/supporters.ant.xml

+<!--
+  Copyright (C) 2010-2017 The Project Lombok Authors.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+<project name="lombok-supporters" default="updateRepo" basedir=".." xmlns:ivy="antlib:com.zwitserloot.ivyplusplus" xmlns:git="antlib:com.rimerosolutions.ant.git">
+	<description>
+This buildfile is part of projectlombok.org. It is responsible for updating/maintaining the separate git repository
+containing the status of lombok's supporters.
+	</description>
+	
+	<path id="supporters.path">
+		<fileset dir="lib/supporters">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<taskdef uri="antlib:com.rimerosolutions.ant.git" resource="com/rimerosolutions/ant/git/jgit-ant-lib.xml" classpathref="supporters.path" />
+	
+	<target name="checkIfRepoExists">
+		<available file="website/lombokSupporters/.git/HEAD" property="supportersrepo.exists" />
+	</target>
+	
+	<target name="initRepo" depends="checkIfRepoExists" unless="supportersrepo.exists">
+		<git:git directory="website/lombokSupporters">
+			<git:clone uri="escudo2:/data/git/lombokSupporters.git" />
+		</git:git>
+	</target>
+	
+	<target name="updateRepo" depends="initRepo" unless="noUpdateRepo">
+		<git:git directory="website/lombokSupporters">
+			<git:pull />
+		</git:git>
+	</target>
+	
+	<target name="deployToWebsiteBuild" depends="updateRepo">
+		<copy todir="build/website/files" overwrite="true" failonerror="false" quiet="true">
+			<fileset dir="website/lombokSupporters" />
+		</copy>
+	</target>
+</project>

buildScripts/website.ant.xml

@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 -->
-<project name="lombok-website" basedir=".." default="website">
+<project name="lombok-website" basedir=".." default="website" xmlns:ivy="antlib:com.zwitserloot.ivyplusplus">
 	<description>
 This buildfile is part of projectlombok.org. It is responsible for building the website and all website-related aspects,
 such as applying the templates to produce the website, converting the changelog into HTML, and creating javadoc.
@@ -37,12 +37,46 @@ such as applying the templates to produce the website, converting the changelog
 		<delete dir="build/website" quiet="true" />
 	</target>
 	
-	<target name="website" description="Prepares the website for distribution" depends="-website-main, -website-dist" />
+	<target name="website-only" description="Prepares the website for distribution using the lombok version currently 'live'." depends="-fetch-version-from-site, -show-version, -ensure-version, -website-main, -delete-edge-page" />
+	
+	<target name="-delete-edge-page">
+		<delete file="build/website/download-edge.html" />
+	</target>
+	
+	<target name="website" description="Prepares the website for distribution" depends="javadoc, -website-main" />
+	
+	<target name="website-supporters" description="Updates website supporters store and adds it to the website build.">
+		<ant antfile="buildScripts/supporters.ant.xml" target="deployToWebsiteBuild" inheritAll="false" />
+	</target>
+	
+	<target name="-fetch-version-from-site" depends="-compile-webclasses">
+		<fail if="lombok.version">lombok.version already set.</fail>
+		<fail if="lombok.fullversion">lombok.fullversion already set.</fail>
+		<java classname="lombok.website.FetchCurrentVersion" outputproperty="lombok.version" failonerror="true">
+			<classpath>
+				<path refid="build.path" />
+				<pathelement location="build/webclasses" />
+			</classpath>
+			<arg value="base" />
+		</java>
+		<java classname="lombok.website.FetchCurrentVersion" outputproperty="lombok.fullversion" failonerror="true">
+			<classpath>
+				<path refid="build.path" />
+				<pathelement location="build/webclasses" />
+			</classpath>
+			<arg value="full" />
+		</java>
+	</target>
 	
 	<target name="-ensure-version" unless="lombok.version">
 		<fail>Supply lombok.version</fail>
 	</target>
 	
+	<target name="-show-version">
+		<echo>Version: ${lombok.version}</echo>
+		<echo>Full: ${lombok.fullversion}</echo>
+	</target>
+		
 	<target name="-ensure-fullversion" unless="lombok.fullversion">
 		<fail>Supply lombok.fullversion</fail>
 	</target>
@@ -50,6 +84,8 @@ such as applying the templates to produce the website, converting the changelog
 	<target name="-compile-webclasses">
 		<mkdir dir="build/webclasses" />
 		<javac includeDestClasses="false" includeantruntime="false" destdir="build/webclasses" debug="on" source="1.8" target="1.8">
+			<compilerarg value="-proc:none" />
+			<compilerarg value="-Xlint:-options" />
 			<classpath refid="build.path" />
 			<src path="src/website" />
 		</javac>
@@ -68,7 +104,7 @@ such as applying the templates to produce the website, converting the changelog
 		</java>
 	</target>
 	
-	<target name="-website-main" depends="-ensure-version, -ensure-fullversion, -website-clean, -compile-webclasses, javadoc, changelogToHtml">
+	<target name="-website-main" depends="-ensure-version, -ensure-fullversion, -website-clean, -compile-webclasses, changelogToHtml">
 		<mkdir dir="build/website" />
 		<copy todir="build/website">
 			<fileset dir="website/resources" />
@@ -95,19 +131,29 @@ such as applying the templates to produce the website, converting the changelog
 		</tar>
 	</target>
 	
-	<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
-	<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
-	<target name="website-publish" depends="website, -requires-ssh">
-		<scp
-			localFile="dist/website.tar.bz2"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org"
+	<target name="-website-only-dist">
+		<mkdir dir="dist" />
+		<tar destfile="dist/website.tar.bz2" compression="bzip2">
+			<tarfileset dir="build/website" />
+		</tar>
+	</target>
+	
+	<target name="website-publish" depends="website, website-supporters, -website-dist, -send-site-to-remote" />
+	<target name="website-only-publish" depends="website-only, website-supporters, -website-only-dist, -send-site-to-remote" />
+	<target name="-send-site-to-remote" depends="-requires-ssh">
+		<ivy:scpUpload
+			from="dist/website.tar.bz2"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
 			username="${ssh.username}"
-			keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/deployWebsite" />
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/deployWebsite"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
 	</target>
 	
 	<target name="latestChanges" depends="-compile-webclasses, -ensure-version, -ensure-fullversion">
@@ -150,17 +196,22 @@ such as applying the templates to produce the website, converting the changelog
 	</target>
 
 	<target name="edgeRelease" depends="-requires-ssh, edgeRelease-build">
-		<scp
-			localFile="dist/website-edge.tar.bz2"
-			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-			keyfile="${ssh.keyfile}" passphrase=""
-			sftp="false" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org" username="${ssh.username}" keyfile="${ssh.keyfile}" passphrase=""
-			trust="true" command="/data/lombok/stagingCmd/deployEdge" />
+		<ivy:scpUpload
+			from="dist/website-edge.tar.bz2"
+			to="/data/lombok/staging"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
+		<ivy:sshExec
+			cmd="/data/lombok/stagingCmd/deployEdge"
+			server="projectlombok.org"
+			username="${ssh.username}"
+			keyfile="${ssh.keyfile}"
+			knownHosts="ssh.knownHosts" />
 	</target>
 	
-	<target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion">
+	<target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion" unless="skip.javadoc">
 		<delete dir="build/api" quiet="true" />
 		<delete dir="doc/api" quiet="true" />
 		<mkdir dir="build/api" />
@@ -178,7 +229,7 @@ such as applying the templates to produce the website, converting the changelog
 			<classpath refid="build.path" />
 			<classpath location="build/lombok" />
 			<header><![CDATA[<a href='https://projectlombok.org/' target='_blank'>Lombok</a> - ]]>v${lombok.version}</header>
-			<bottom><![CDATA[<i>Copyright &copy; 2009-2015 The Project Lombok Authors, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php' target='_blank'>MIT licence</a>.]]></bottom>
+			<bottom><![CDATA[<i>Copyright &copy; 2009-2018 The Project Lombok Authors, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php' target='_blank'>MIT licence</a>.]]></bottom>
 		</javadoc>
 		<!-- bugfix for boneheaded javadoc bug where ?is-external=true is inserted before an anchor ref, breaking the anchor ref.
 		is-external=true doesn't actually do anything, so, we'll just get rid of it. -->

debian/changelog

+lombok (1.16.22-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Markus Koschany ]
+  * Drop the liblombok-java-doc package
+  * New upstream version 1.16.20+ds
+
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Build with default-jdk but keep the dependency on OpenJDK 8
+      to build part of the code (Closes: #893312)
+    - Depend on ivyplusplus (>= 1.26)
+    - Refreshed the patches
+    - Disabled delombok (fails to build, never used in Debian)
+    - Fixed the compatibility of PackageName.java with Java 9
+    - Dropped support for Java 6 & 7
+  * Removed the +ds suffix
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 19 Sep 2018 13:48:16 +0200
+
 lombok (1.16.18+ds-3) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -10,22 +10,23 @@ Build-Depends:
  ant-optional,
  cmdreader,
  debhelper (>= 11),
- openjdk-8-jdk,
+ default-jdk,
  eclipse-jdt,
  eclipse-platform-data,
- ivyplusplus,
+ ivyplusplus (>= 1.26),
  javahelper,
  libasm-java,
  libecj-java,
  libjna-java,
  liblombok-patcher-java,
- libspi-java,
  libosgi-core-java,
- maven-repo-helper
-Standards-Version: 4.1.5
+ libspi-java,
+ maven-repo-helper,
+ openjdk-8-jdk
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/lombok.git
+Vcs-Browser: https://salsa.debian.org/java-team/lombok
 Homepage: https://projectlombok.org
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/lombok.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/lombok.git
 
 Package: liblombok-java
 Architecture: all
@@ -41,21 +42,3 @@ Description: Reduce boilerplate code in Java projects
  exacerbated by limitations in the language itself. Project Lombok
  aims to reduce the prevalence of some of the worst offenders by
  replacing them with a simple set of annotations.
-
-Package: liblombok-java-doc
-Architecture: all
-Section: doc
-Depends:
- ${java:Depends},
- ${misc:Depends}
-Description: Reduce boilerplate code in Java projects (documentation)
- "Boilerplate" is a term used to describe code that is repeated in
- many parts of an application with little alteration. One of the most
- frequently voiced criticisms of the Java language is the volume of
- this type of code that is found in most projects. This problem is
- frequently a result of design decisions in various libraries, but is
- exacerbated by limitations in the language itself. Project Lombok
- aims to reduce the prevalence of some of the worst offenders by
- replacing them with a simple set of annotations.
- .
- This package contains the generated API documentation.

debian/liblombok-java-doc.doc-base

-Document: lombok
-Title: lombok API
-Author: The Project Lombok Authors
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/liblombok-java/api/index.html
-Files: /usr/share/doc/liblombok-java/api/*.html

debian/liblombok-java-doc.install

-doc/api usr/share/doc/liblombok-java

debian/patches/Javac.patch

-From: Markus Koschany <apo@debian.org>
-Date: Sat, 13 Feb 2016 21:55:08 +0100
-Subject: Javac
-
-Fix compilation error with OpenJDK 8.
-
-Forwarded: no
-Debian-Bug: https://bugs.debian.org/814764
----
- src/utils/lombok/javac/Javac.java | 20 ++++++++++++++------
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
---- a/src/utils/lombok/javac/Javac.java
-+++ b/src/utils/lombok/javac/Javac.java
-@@ -42,6 +42,7 @@
- import com.sun.tools.javac.code.Source;
- import com.sun.tools.javac.code.Symtab;
- import com.sun.tools.javac.code.Type;
-+import com.sun.tools.javac.code.Symbol.TypeSymbol;
- import com.sun.tools.javac.main.JavaCompiler;
- import com.sun.tools.javac.tree.JCTree;
- import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-@@ -52,6 +53,8 @@
- import com.sun.tools.javac.tree.JCTree.JCLiteral;
- import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
- 
-+import java.lang.UnsupportedOperationException;
-+
- /**
-  * Container for static utility methods relevant to lombok's operation on javac.
-  */
-@@ -326,7 +329,7 @@
- 		} catch (IllegalAccessException ignore) {}
- 		
- 		if (Javac.getJavaCompilerVersion() < 8) {
--			return new JCNoType(((Integer) tag.value).intValue());
-+			return null;
- 		} else {
- 			try {
- 				if (CTC_VOID.equals(tag)) {
-@@ -343,14 +346,19 @@
- 	}
- 	
- 	private static class JCNoType extends Type implements NoType {
--		public JCNoType(int tag) {
--			super(tag, null);
-+		public JCNoType(TypeSymbol tag) {
-+			super(tag);
- 		}
--		
-+        @Override
-+        public com.sun.tools.javac.code.TypeTag getTag(){
-+            throw new UnsupportedOperationException();
-+        }
-+
- 		@Override
- 		public TypeKind getKind() {
--			if (tag == ((Integer) CTC_VOID.value).intValue()) return TypeKind.VOID;
--			if (tag == ((Integer) CTC_NONE.value).intValue()) return TypeKind.NONE;
-+            TypeSymbol tag = null;
-+			if (tag == CTC_VOID.value) return TypeKind.VOID;
-+			if (tag == CTC_NONE.value) return TypeKind.NONE;
- 			throw new AssertionError("Unexpected tag: " + tag);
- 		}
- 		

debian/patches/build.patch

 From: Markus Koschany <apo@debian.org>
-Date: Sat, 13 Feb 2016 20:59:19 +0100
+Date: Tue, 17 Apr 2018 15:45:55 +0200
 Subject: build
 
-Ensure that nothing gets downloaded from the web and make all
-build-dependencies available in lib/build.
-
-Forwarded: not-needed
 ---
- build.xml | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
+ build.xml | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
 
 --- a/build.xml
 +++ b/build.xml
-@@ -33,6 +33,18 @@
+@@ -37,6 +37,15 @@
  		<fileset dir="lib/build">
  			<include name="*.jar" />
  		</fileset>
@@ -24,14 +20,11 @@ Forwarded: not-needed
 +        </fileset>
 +        <fileset dir="/usr/lib/eclipse/plugins/">
 +            <include name="*.jar" />
-+        </fileset>
-+        <fileset dir="/usr/lib/jvm/">
-+            <include name="**/tools.jar" />
 +        </fileset>
  	</path>
  	
  	<path id="runtime.path">
-@@ -90,12 +102,12 @@
+@@ -89,12 +98,12 @@
  	
  	<target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
  	
@@ -42,20 +35,20 @@ Forwarded: not-needed
  	</target>
  	
 -	<target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps, contrib" description="Downloads all dependencies." />
-+	<target name="deps" depends="" description="Do not download anything." />
++	<target name="deps" depends="" description="Do not download anything" />
  	
  	<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" />
-@@ -119,7 +131,7 @@
+ 		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj7, ecj8, ecj9" />
+@@ -131,7 +140,7 @@
  		<ivy:retrieve />
  	</target>
  	
--	<target name="version" depends="ensure-ipp" description="Shows the version number." unless="lombok.version">
-+	<target name="version" depends="" description="Shows the version number." unless="lombok.version">
+-	<target name="version" depends="ensure-ipp, ensureOpenJdk8Rt" description="Shows the version number." unless="lombok.version">
++	<target name="version" depends="ensureOpenJdk8Rt" description="Shows the version number." unless="lombok.version">
  		<mkdir dir="build/lombok" />
- 		<javac includeDestClasses="false" srcdir="src/core" debug="on" destdir="build/lombok" source="1.5" target="1.5" includes="lombok/core/Version.java" includeantruntime="false" />
- 		<java
-@@ -139,13 +151,13 @@
+ 		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true">
+ 			<bootclasspath path="${rt-openjdk8}" />
+@@ -155,7 +164,7 @@
  		<echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo>
  	</target>
  	
@@ -64,10 +57,21 @@ Forwarded: not-needed
  		<ivy:cachedunjar dest="build/lombok" marker="build/unpackDeps.marker">
  			<path refid="runtime.path" />
  		</ivy:cachedunjar>
+@@ -176,7 +185,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>
  	
--	<target name="compile" depends="version, ensureBuildDeps, -unpackLibs" description="Compiles the code.">
-+	<target name="compile" depends="version, -unpackLibs" description="Compiles the code.">
+-	<target name="compile" depends="version, ensureBuildDeps, -unpackLibs, -ensureJdk9" description="Compiles the code.">
++	<target name="compile" depends="-ensureJdk9" description="Compiles the code.">
  		<!-- 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.
+@@ -318,7 +327,7 @@
+ 		</ant>
+ 	</target>
+ 	
+-	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile, -latestChanges">
++	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile">
+ 		<mkdir dir="dist" />
+ 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
+ 		<tstamp>

debian/patches/disable-delombok.patch

+Description: Disables delombok (fails to build, never used in Debian)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -281,6 +281,7 @@
+ 			<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}" />
+ 			<compilerarg value="-Xlint:-options" />
+@@ -291,6 +292,7 @@
+ 			<classpath location="build/lombok" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
++-->
+ 		<delete dir="build/lombok-proc-result" quiet="true" />
+ 		<ivy:compile destdir="build/lombok-proc-result" source="1.6" target="1.6" nowarn="true">
+ 			<compilerarg value="-Xbootclasspath/p:build/stubs" />

debian/patches/disable-java6-and-java7-support.patch

+--- a/build.xml
++++ b/build.xml
+@@ -218,6 +218,8 @@
+ 			<compilerarg value="-Xlint:-options" />
+ 			<src path="src/utils" />
+ 			<include name="lombok/javac/**" />
++			<exclude name="lombok/javac/**/java6/**" />
++			<exclude name="lombok/javac/**/java7/**" />
+ 			<classpath location="build/lombok-utils" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+--- a/src/utils/lombok/javac/Javac.java
++++ b/src/utils/lombok/javac/Javac.java
+@@ -332,7 +332,7 @@
+ 		} catch (IllegalAccessException ignore) {}
+ 		
+ 		if (Javac.getJavaCompilerVersion() < 8) {
+-			return new JCNoType(((Integer) tag.value).intValue());
++			throw new UnsupportedOperationException("Java before version 8 isn't supported in Debian, please use Lombok binaries from upstream");
+ 		} else {
+ 			try {
+ 				if (CTC_VOID.equals(tag)) {
+@@ -348,24 +348,6 @@
+ 		}
+ 	}
+ 	
+-	private static class JCNoType extends Type implements NoType {
+-		public JCNoType(int tag) {
+-			super(tag, null);
+-		}
+-		
+-		@Override
+-		public TypeKind getKind() {
+-			if (tag == ((Integer) CTC_VOID.value).intValue()) return TypeKind.VOID;
+-			if (tag == ((Integer) CTC_NONE.value).intValue()) return TypeKind.NONE;
+-			throw new AssertionError("Unexpected tag: " + tag);
+-		}
+-		
+-		@Override
+-		public <R, P> R accept(TypeVisitor<R, P> v, P p) {
+-			return v.visitNoType(this, p);
+-		}
+-	}
+-	
+ 	private static final Field JCCOMPILATIONUNIT_ENDPOSITIONS, JCCOMPILATIONUNIT_DOCCOMMENTS;
+ 	static {
+ 		Field f = null;

debian/patches/java9-compatibility.patch

+Description: Fixes the incompatibilities with Java 9. Upstream compiles
+ PackageName.java against the JDK 6 API which isn't available in Debian.
+ The public field JCCompilationUnit.ui was replaced in JDK 9 and this
+ patch uses the equivalent getPackageName() method instead which is
+ available since JDK 6 at least.
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/src/utils/lombok/javac/PackageName.java
++++ b/src/utils/lombok/javac/PackageName.java
+@@ -30,15 +30,6 @@
+ 
+ // Supports JDK6-9
+ public class PackageName {
+-	private static final Method packageNameMethod = getPackageNameMethod();
+-	
+-	private static Method getPackageNameMethod() {
+-		try {
+-			return JCCompilationUnit.class.getDeclaredMethod("getPackageName");
+-		} catch (Exception e) {
+-			return null;
+-		}
+-	}
+ 	
+ 	public static String getPackageName(JCCompilationUnit cu) {
+ 		JCTree t = getPackageNode(cu);
+@@ -46,10 +37,7 @@
+ 	}
+ 	
+ 	public static JCTree getPackageNode(JCCompilationUnit cu) {
+-		if (packageNameMethod != null) try {
+-			Object pkg = packageNameMethod.invoke(cu);
+-			return (pkg instanceof JCFieldAccess || pkg instanceof JCIdent) ? (JCTree) pkg : null;
+-		} catch (Exception e) {}
+-		return cu.pid instanceof JCFieldAccess || cu.pid instanceof JCIdent ? cu.pid : null;
++		Object pkg = cu.getPackageName();
++		return (pkg instanceof JCFieldAccess || pkg instanceof JCIdent) ? (JCTree) pkg : null;
+ 	}
+ }

debian/patches/javadoc.patch

-From: Markus Koschany <apo@debian.org>
-Date: Mon, 15 Feb 2016 16:58:02 +0100
-Subject: javadoc
-
-Fix compilation error when building the javadoc. Those classes are not
-available.
-
-Forwarded: not-needed
----
- buildScripts/website.ant.xml | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/buildScripts/website.ant.xml
-+++ b/buildScripts/website.ant.xml
-@@ -48,14 +48,17 @@
- 	</target>
- 	
- 	<target name="-compile-webclasses">
-+<!--
- 		<mkdir dir="build/webclasses" />
- 		<javac includeDestClasses="false" includeantruntime="false" destdir="build/webclasses" debug="on" source="1.8" target="1.8">
- 			<classpath refid="build.path" />
- 			<src path="src/website" />
- 		</javac>
-+-->
- 	</target>
- 	
- 	<target name="changelogToHtml" depends="-compile-webclasses">
-+<!--
- 		<mkdir dir="build/website" />
- 		<java classname="lombok.website.WebsiteMaker" failonerror="true">
- 			<classpath>
-@@ -66,9 +69,11 @@
- 			<arg value="${lombok.fullversion}" />
- 			<arg value="changelog" />
- 		</java>
-+-->
- 	</target>
- 	
- 	<target name="-website-main" depends="-ensure-version, -ensure-fullversion, -website-clean, -compile-webclasses, javadoc, changelogToHtml">
-+<!--
- 		<mkdir dir="build/website" />
- 		<copy todir="build/website">
- 			<fileset dir="website/resources" />
-@@ -85,19 +90,21 @@
- 			<arg value="${lombok.fullversion}" />
- 			<arg value="all" />
- 		</java>
-+-->
- 	</target>
- 	
- 	<target name="-website-dist">
-+<!--
- 		<mkdir dir="dist" />
- 		<tar destfile="dist/website.tar.bz2" compression="bzip2">
- 			<tarfileset dir="build/website" />
- 			<tarfileset dir="doc/api" prefix="api" />
- 		</tar>
-+-->
- 	</target>
- 	
--	<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
--	<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
- 	<target name="website-publish" depends="website, -requires-ssh">
-+<!--
- 		<scp
- 			localFile="dist/website.tar.bz2"
- 			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-@@ -108,9 +115,11 @@
- 			username="${ssh.username}"
- 			keyfile="${ssh.keyfile}" passphrase=""
- 			trust="true" command="/data/lombok/stagingCmd/deployWebsite" />
-+-->
- 	</target>
- 	
- 	<target name="latestChanges" depends="-compile-webclasses, -ensure-version, -ensure-fullversion">
-+<!--
- 		<mkdir dir="build/website" />
- 		<java classname="lombok.website.WebsiteMaker" failonerror="true">
- 			<classpath>
-@@ -123,9 +132,11 @@
- 			<arg value="website" />
- 			<arg value="build/latestchanges.html" />
- 		</java>
-+-->
- 	</target>
- 	
- 	<target name="edgeRelease-build" depends="-compile-webclasses, -ensure-version, -ensure-fullversion">
-+<!--
- 		<mkdir dir="build/website-edge" />
- 		<java classname="lombok.website.WebsiteMaker" failonerror="true">
- 			<classpath>
-@@ -143,13 +154,17 @@
- 		<tar destfile="dist/website-edge.tar.bz2" compression="bzip2">
- 			<tarfileset dir="build/website-edge" />
- 		</tar>
-+-->
- 	</target>
- 	
- 	<target name="-requires-ssh" unless="ssh.username">
-+<!--
- 		<fail>ssh.username and ssh.keyfile should be set.</fail>
-+-->
- 	</target>
- 
- 	<target name="edgeRelease" depends="-requires-ssh, edgeRelease-build">
-+<!--
- 		<scp
- 			localFile="dist/website-edge.tar.bz2"
- 			todir="${ssh.username}@projectlombok.org:/data/lombok/staging"
-@@ -158,6 +173,7 @@
- 		<sshexec
- 			host="projectlombok.org" username="${ssh.username}" keyfile="${ssh.keyfile}" passphrase=""
- 			trust="true" command="/data/lombok/stagingCmd/deployEdge" />
-+-->
- 	</target>
- 	
- 	<target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion">
-@@ -171,10 +187,10 @@
- 			check the <a href="lombok/package-summary.html">lombok</a> package.&nbsp;If you're trying to extend lombok or
- 			write your own plugins, the other packages are what you're looking for.</body></html>
- 		]]></echo>
--		<javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
--			<package name="lombok" />
-+		<javadoc sourcepath="src/core" locale="en" encoding="UTF-8" additionalparam="-notimestamp" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
-+<!--			<package name="lombok" />
- 			<package name="lombok.experimental" />
--			<package name="lombok.extern.*" />
-+			<package name="lombok.extern.*" /> -->
- 			<classpath refid="build.path" />
- 			<classpath location="build/lombok" />
- 			<header><![CDATA[<a href='https://projectlombok.org/' target='_blank'>Lombok</a> - ]]>v${lombok.version}</header>

debian/patches/series

 build.patch
-Javac.patch
-javadoc.patch
+disable-delombok.patch
+java9-compatibility.patch
+disable-java6-and-java7-support.patch

debian/rules

 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
 	dh $@ --with javahelper,maven_repo_helper
@@ -12,8 +12,10 @@ override_dh_clean:
 
 override_dh_auto_build:
 	ant -Dbasedir=$(CURDIR) \
-		-Dlombok.version=1.16.18 \
-		dist dist-utils javadoc
+		-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 \
+		dist dist-utils
 
 override_jh_linkjars:
 	jh_linkjars
@@ -26,6 +28,3 @@ override_jh_linkjars:
 		lib/runtime/maven* \
 		lib/runtime/ecj* \
 		lib/runtime/eclipse-ecj*
-
-get-orig-source:
-	uscan --download-current-version --force-download --repack --compression xz