[Git][java-team/lombok][master] Fixed the build failure with eclipse-jdt 4.29 (Closes: #1081870)

[Emmanuel Bourg (@ebourg)]

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


Commits:
7ee5bb50 by Emmanuel Bourg at 2024-09-30T10:10:01+02:00
Fixed the build failure with eclipse-jdt 4.29 (Closes: #1081870)

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/ivy-configuration.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+lombok (1.18.34-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with eclipse-jdt 4.29 (Closes: #1081870)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 30 Sep 2024 10:09:14 +0200
+
 lombok (1.18.34-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
  ivy-debian-helper,
- ivyplusplus (>= 1.40),
+ ivyplusplus (>= 1.42-4~),
  libasm-java,
  libeclipse-jdt-core-manipulation-java,
  libeclipse-jdt-ui-java,


=====================================
debian/patches/ivy-configuration.patch
=====================================
@@ -32,10 +32,17 @@ Forwarded: not-needed
  		<dependency org="de.java2html" name="java2html" rev="5.0" conf="buildtools->default" />
  		<dependency org="org.freemarker" name="freemarker" rev="2.3.28" conf="buildtools->default" />
  		<dependency org="com.sparkjava" name="spark-core" rev="2.9.2" conf="buildtools->default" />
-@@ -88,6 +88,7 @@
+@@ -83,11 +83,14 @@
+ 		<!-- until oct 2016, ecj was released under org 'org.eclipse.jdt.core.compiler', and the versioning followed eclipse's versions. -->
+ 		<!-- after that, it switched to group 'org.eclipse.jdt', and follows its own version. That means 3.16.0 is a later release than 4.6.1 on the old group! -->
+ 		<dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.4.2" conf="ecj8->master" />
++		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core.compiler.batch" rev="debian" conf="ecj8->master" />
+ 		
+ 		<!-- eclipses -->
  		
  		<dependency org="org.eclipse.platform" name="org.eclipse.core.runtime" rev="3.13.0" conf="eclipse-oxygen->default" transitive="false" />
  		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core" rev="3.13.102" conf="eclipse-oxygen->default" transitive="false" />
++		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core.compiler.batch" rev="debian" conf="eclipse-oxygen->default" transitive="false" />
 +		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core.manipulation" rev="debian" conf="eclipse-oxygen->default" />
  		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.ui" rev="3.13.100" conf="eclipse-oxygen->default" transitive="false" />
  		<dependency org="org.eclipse.platform" name="org.eclipse.equinox.common" rev="3.9.0" conf="eclipse-oxygen->default" transitive="false" />



View it on GitLab: https://salsa.debian.org/java-team/lombok/-/commit/7ee5bb50d8db87d1baa235da47841b226bddca56

-- 
View it on GitLab: https://salsa.debian.org/java-team/lombok/-/commit/7ee5bb50d8db87d1baa235da47841b226bddca56
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/20240930/a5bbca67/attachment.htm>