[Git][java-team/libcommons-jexl2-java][master] 3 commits: Standards-Version updated to 4.6.1

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libcommons-jexl2-java


Commits:
8486078e by Emmanuel Bourg at 2022-05-20T15:58:21+02:00
Standards-Version updated to 4.6.1

- - - - -
db3fbcc8 by Emmanuel Bourg at 2022-05-20T16:01:38+02:00
Build with javacc5 instead of javacc

- - - - -
3de1a3c2 by Emmanuel Bourg at 2022-05-20T16:04:43+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- + debian/patches/003-javacc-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libcommons-jexl2-java (2.1.1-6) unstable; urgency=medium
+
+  * Build with javacc5 instead of javacc
+  * Standards-Version updated to 4.6.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 May 2022 16:03:56 +0200
+
 libcommons-jexl2-java (2.1.1-5) unstable; urgency=medium
 
   * Removed the -java-doc package


=====================================
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-jexl2-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libcommons-jexl2-java
 Homepage: https://commons.apache.org/jexl


=====================================
debian/maven.rules
=====================================
@@ -3,3 +3,4 @@ junit junit jar s/4\..*/4.x/ * *
 org.apache.commons commons-jexl jar s/.*/debian/ * *
 org.apache.commons commons-parent pom s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
+net.java.dev.javacc javacc * s/.*/5.x/ * *


=====================================
debian/patches/003-javacc-compatibility.patch
=====================================
@@ -0,0 +1,26 @@
+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
+@@ -175,6 +175,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>
+@@ -282,4 +289,4 @@
+             </plugin>
+         </plugins>
+     </reporting>
+-</project>
+\ No newline at end of file
++</project>


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 001-Fix-tests.patch
 002-java9-compatibility.patch
+003-javacc-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/libcommons-jexl2-java/-/compare/58a022ad1a0ed21ad935b5000c93ded9260d40fc...3de1a3c2aa1433830066f885500a0c6f4f181c90

-- 
View it on GitLab: https://salsa.debian.org/java-team/libcommons-jexl2-java/-/compare/58a022ad1a0ed21ad935b5000c93ded9260d40fc...3de1a3c2aa1433830066f885500a0c6f4f181c90
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/e913441f/attachment.htm>