[Git][java-team/libfreemarker-java][master] 3 commits: Build with javacc5

[Emmanuel Bourg (@ebourg)]

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


Commits:
64abafa8 by Emmanuel Bourg at 2022-05-15T22:31:13+02:00
Build with javacc5

- - - - -
17e10c96 by Emmanuel Bourg at 2022-05-15T22:31:22+02:00
Standards-Version updated to 4.6.1

- - - - -
e63ca201 by Emmanuel Bourg at 2022-05-15T22:32:26+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- debian/patches/javacc.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libfreemarker-java (2.3.23-12) unstable; urgency=medium
+
+  * Build with javacc5
+  * Standards-Version updated to 4.6.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 15 May 2022 22:32:00 +0200
+
 libfreemarker-java (2.3.23-11) unstable; urgency=medium
 
   * Fixed the build failure with OpenJDK 17 (Closes: #982003)


=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
  default-jdk-doc,
  ivy,
  ivy-debian-helper,
- javacc,
+ javacc5,
  junit,
  jython (>= 2.5.3-10~),
  jython-doc,
@@ -45,7 +45,7 @@ Build-Depends:
  libxerces2-java,
  libxerces2-java-doc,
  maven-repo-helper
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/libfreemarker-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libfreemarker-java
 Homepage: https://github.com/apache/freemarker


=====================================
debian/maven.rules
=====================================
@@ -11,3 +11,4 @@ org.eclipse.jetty * * s/.*/9.x/ * *
 org.eclipse.jetty s/jetty-jsp/apache-jsp/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ ant * s/.*/debian/ * *
 s/biz.aQute/biz.aQute.bnd/ bnd * s/.*/debian/ * *
+net.java.dev.javacc javacc * s/.*/5.x/ * *


=====================================
debian/patches/javacc.diff
=====================================
@@ -4,23 +4,6 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2009-09-27
 --- a/build.xml
 +++ b/build.xml
-@@ -123,7 +123,6 @@
-     <ivy:cachepath conf="parser" pathid="ivy.dep" />
-     <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
-       uri="http://javacc.dev.java.net/"
--      classpathref="ivy.dep"
-     />
-     
-     <property name="_javaccOutputDir"
-@@ -135,7 +134,7 @@
-     <javacc:generate
-       target="src/main/javacc/FTL.jj"
-       outputdirectory="${_javaccOutputDir}"
--      javacchome="build/javacc-home.tmp"
-+      javacchome="/usr/share/java/" jdkversion="1.3"
-     />
-     <delete dir="build/javacc-home.tmp" />
-     
 @@ -157,7 +156,7 @@
      <replace
        file="${_javaccOutputDir}/Token.java"



View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/cabcf72dce45f1cc137a712c438b375b6d0c087f...e63ca201397425536b7094b12b44115cc4cf89d3

-- 
View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/cabcf72dce45f1cc137a712c438b375b6d0c087f...e63ca201397425536b7094b12b44115cc4cf89d3
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/20220515/2836d94b/attachment.htm>