[Git][java-team/lombok][master] 6 commits: Build delombok and other missing core classes

Emmanuel Bourg gitlab at salsa.debian.org
Thu Sep 20 00:34:42 BST 2018 

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lombok


Commits:
f16bf844 by Emmanuel Bourg at 2018-09-19T22:59:16Z
Build delombok and other missing core classes

- - - - -
1b7f6f44 by Emmanuel Bourg at 2018-09-19T23:01:22Z
Simplified debian/rules

- - - - -
81f526b1 by Emmanuel Bourg at 2018-09-19T23:06:30Z
Refreshed the Maven poms

- - - - -
59a7a98b by Emmanuel Bourg at 2018-09-19T23:09:09Z
Added a description to disable-java6-and-java7-support.patch

- - - - -
b4ab8bd1 by Emmanuel Bourg at 2018-09-19T23:31:50Z
Simplified build.patch

- - - - -
c855af77 by Emmanuel Bourg at 2018-09-19T23:32:49Z
Upload to unstable

- - - - -


11 changed files:

- debian/changelog
- + debian/clean
- debian/liblombok-java.poms
- debian/lombok-utils.pom.xml → debian/lombok-utils.pom
- debian/lombok-pom.xml → debian/lombok.pom
- debian/patches/build.patch
- − debian/patches/disable-delombok.patch
- debian/patches/disable-java6-and-java7-support.patch
- debian/patches/java9-compatibility.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+lombok (1.16.22-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build delombok and other missing core classes
+  * Refreshed the Maven poms
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Sep 2018 01:32:40 +0200
+
 lombok (1.16.22-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+dist/*.jar


=====================================
debian/liblombok-java.poms
=====================================
@@ -1,2 +1,2 @@
-debian/lombok-pom.xml --has-package-version --java-lib --artifact=dist/lombok.jar
-debian/lombok-utils.pom.xml --has-package-version --java-lib --artifact=dist/lombok-utils.jar
+debian/lombok.pom       --has-package-version --java-lib --artifact=dist/lombok.jar
+debian/lombok-utils.pom --has-package-version --java-lib --artifact=dist/lombok-utils.jar


=====================================
debian/lombok-utils.pom.xml → debian/lombok-utils.pom
=====================================
@@ -1,13 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.projectlombok</groupId>
 	<artifactId>lombok-utils</artifactId>
 	<packaging>jar</packaging>
-	<version>1.16.8</version>
+	<version>1.16.22</version>
 	<name>Project Lombok</name>
 	<url>https://projectlombok.org</url>
 	<description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description>
-	<dependencies/>
+	<dependencies></dependencies>
 	<licenses>
 		<license>
 			<name>The MIT License</name>
@@ -44,3 +45,4 @@
 		</developer>
 	</developers>
 </project>
+


=====================================
debian/lombok-pom.xml → debian/lombok.pom
=====================================
@@ -1,13 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.projectlombok</groupId>
 	<artifactId>lombok</artifactId>
 	<packaging>jar</packaging>
-	<version>1.16.8</version>
+	<version>1.16.22</version>
 	<name>Project Lombok</name>
 	<url>https://projectlombok.org</url>
 	<description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description>
-	<dependencies/>
+	<dependencies></dependencies>
 	<licenses>
 		<license>
 			<name>The MIT License</name>
@@ -44,3 +45,4 @@
 		</developer>
 	</developers>
 </project>
+


=====================================
debian/patches/build.patch
=====================================
@@ -1,11 +1,5 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 17 Apr 2018 15:45:55 +0200
-Subject: build
-
----
- build.xml | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
+Description: build
+Author: Markus Koschany <apo at debian.org>
 --- a/build.xml
 +++ b/build.xml
 @@ -37,6 +37,15 @@
@@ -24,12 +18,14 @@ Subject: build
  	</path>
  	
  	<path id="runtime.path">
-@@ -89,12 +98,12 @@
+@@ -87,14 +96,14 @@
+ 		<fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
+ 	</target>
  	
- 	<target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
+-	<target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
++	<target name="ensure-ipp" />
  	
--	<target name="config-ivy" depends="ensure-ipp" unless="ivy.config">
-+	<target name="config-ivy" depends="" unless="ivy.config">
+ 	<target name="config-ivy" depends="ensure-ipp" unless="ivy.config">
  		<ivy:configure file="buildScripts/ivysettings.xml" />
  		<property name="ivy.config" value="true" />
  	</target>
@@ -39,25 +35,16 @@ Subject: build
  	
  	<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" />
-@@ -131,7 +140,7 @@
- 		<ivy:retrieve />
+@@ -117,8 +126,6 @@
  	</target>
  	
--	<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" />
- 		<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 name="ensureRuntimeDeps" depends="config-ivy">
+-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="runtime" />
+-		<ivy:retrieve />
  	</target>
  	
--	<target name="-unpackLibs" depends="ensureRuntimeDeps">
-+	<target name="-unpackLibs" depends="">
- 		<ivy:cachedunjar dest="build/lombok" marker="build/unpackDeps.marker">
- 			<path refid="runtime.path" />
- 		</ivy:cachedunjar>
-@@ -176,7 +185,7 @@
+ 	<target name="ensureTestDeps" depends="config-ivy">
+@@ -176,7 +183,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>
  	
@@ -66,7 +53,15 @@ Subject: build
  		<!-- 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 @@
+@@ -280,6 +287,7 @@
+ 			<include name="lombok/javac/**" />
+ 			<include name="lombok/delombok/**" />
+ 			<classpath location="build/lombok" />
++			<classpath location="build/stubsstubs" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+ 		<delete dir="build/lombok-proc-result" quiet="true" />
+@@ -318,7 +326,7 @@
  		</ant>
  	</target>
  	


=====================================
debian/patches/disable-delombok.patch deleted
=====================================
@@ -1,21 +0,0 @@
-Description: Disables delombok (fails to build, never used in Debian)
-Author: Emmanuel Bourg <ebourg at 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
=====================================
@@ -1,3 +1,6 @@
+Description: Disables support for Java 6 and 7
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
 @@ -218,6 +218,8 @@


=====================================
debian/patches/java9-compatibility.patch
=====================================
@@ -1,8 +1,10 @@
-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.
+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.
+ * JavacAST.java accesses the multipleErrors field of com.sun.tools.javac.util.Log
+   but it was removed in JDK 9. The patch uses reflection to access the field instead.
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/utils/lombok/javac/PackageName.java
@@ -36,3 +38,25 @@ Forwarded: no
 +		return (pkg instanceof JCFieldAccess || pkg instanceof JCIdent) ? (JCTree) pkg : null;
  	}
  }
+--- a/src/core/lombok/javac/JavacAST.java
++++ b/src/core/lombok/javac/JavacAST.java
+@@ -530,13 +530,16 @@
+ 		}
+ 
+ 		@Override void error1(DiagnosticPosition pos, String message) {
+-			boolean prev = log.multipleErrors;
+-			log.multipleErrors = true;
++			try {
++			Field multipleErrorsField = log.getClass().getField("multipleErrors");
++			boolean prev = multipleErrorsField.getBoolean(log);
++			multipleErrorsField.setBoolean(log, true);
+ 			try {
+ 				log.error(pos, "proc.messager", message);
+ 			} finally {
+-				log.multipleErrors = prev;
++				multipleErrorsField.setBoolean(log, prev);
+ 			}
++			} catch (Throwable t) {}
+ 		}
+ 
+ 		@Override void warning1(DiagnosticPosition pos, String message) {


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
 build.patch
-disable-delombok.patch
 java9-compatibility.patch
 disable-java6-and-java7-support.patch


=====================================
debian/rules
=====================================
@@ -5,11 +5,6 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 %:
 	dh $@ --with javahelper,maven_repo_helper
 
-override_dh_clean:
-	dh_clean
-	$(RM) dist/*.jar
-	$(RM) -r doc/api
-
 override_dh_auto_build:
 	ant -Dbasedir=$(CURDIR) \
 		-Dlombok.version=1.16.22 \



View it on GitLab: https://salsa.debian.org/java-team/lombok/compare/2784cadf1ccb03deb99854de083f0aaf8be9e235...c855af77134c9e9eeef421cef99f9954e2581bbf

-- 
View it on GitLab: https://salsa.debian.org/java-team/lombok/compare/2784cadf1ccb03deb99854de083f0aaf8be9e235...c855af77134c9e9eeef421cef99f9954e2581bbf
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180919/4802764e/attachment.html>

More information about the pkg-java-commits mailing list