[Git][java-team/libcommons-jexl3-java][master] 4 commits: Standards-Version updated to 4.6.1
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Fri May 20 14:07:45 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libcommons-jexl3-java
Commits:
0f078f81 by Emmanuel Bourg at 2022-05-18T10:04:27+02:00
Standards-Version updated to 4.6.1
- - - - -
1457c578 by Emmanuel Bourg at 2022-05-20T15:04:03+02:00
Build with javacc5 instead of javacc
- - - - -
04d2a4f5 by Emmanuel Bourg at 2022-05-20T15:05:30+02:00
Use --add-opens instead of --illegal-access=permit to build with OpenJDK 17 (Closes: #981986)
- - - - -
aa2a7380 by Emmanuel Bourg at 2022-05-20T15:05:44+02:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/maven.properties
- debian/maven.rules
- + debian/patches/003-javacc-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libcommons-jexl3-java (3.1-3) unstable; urgency=medium
+
+ * Build with javacc5 instead of javacc
+ * Use --add-opens instead of --illegal-access=permit to build with OpenJDK 17
+ (Closes: #981986)
+ * Standards-Version updated to 4.6.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 20 May 2022 15:05:38 +0200
+
libcommons-jexl3-java (3.1-2) unstable; urgency=medium
* Fixed the build failure with OpenJDK 17 (Closes: #981986)
=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
debhelper-compat (= 13),
default-jdk,
+ javacc5,
javahelper,
junit4,
libbuild-helper-maven-plugin-java,
@@ -15,7 +16,7 @@ Build-Depends:
libmaven-bundle-plugin-java,
libmaven-javadoc-plugin-java,
maven-debian-helper (>= 2.0.2~)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/libcommons-jexl3-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libcommons-jexl3-java
Homepage: https://commons.apache.org/jexl
=====================================
debian/maven.properties
=====================================
@@ -2,4 +2,4 @@ maven.compiler.source = 8
maven.compiler.target = 8
maven.compiler.release = 8
-argLine=--illegal-access=permit
+argLine=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED
=====================================
debian/maven.rules
=====================================
@@ -1,3 +1,4 @@
junit junit jar s/4\..*/4.x/ * *
org.apache.commons commons-parent pom s/.*/debian/ * *
+net.java.dev.javacc javacc * s/.*/5.x/ * *
=====================================
debian/patches/003-javacc-compatibility.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Use JavaCC 5 instead of the latest release
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -180,6 +180,13 @@
+ </goals>
+ </execution>
+ </executions>
++ <dependencies>
++ <dependency>
++ <groupId>net.java.dev.javacc</groupId>
++ <artifactId>javacc</artifactId>
++ <version>5.x</version>
++ </dependency>
++ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
002-java9-compatibility.patch
+003-javacc-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/libcommons-jexl3-java/-/compare/daf49741a585232c6ec31f738a2bf859a2a9a758...aa2a7380e9c9843d2621e3c3f0817043ccacf6a4
--
View it on GitLab: https://salsa.debian.org/java-team/libcommons-jexl3-java/-/compare/daf49741a585232c6ec31f738a2bf859a2a9a758...aa2a7380e9c9843d2621e3c3f0817043ccacf6a4
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/20220520/2b91325b/attachment.htm>
More information about the pkg-java-commits
mailing list