Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libfreemarker-java
Commits: 54ecb522 by Emmanuel Bourg at 2021-02-08T00:55:31+01:00 Build depend on libservlet-api-java instead of libservlet3.1-java - - - - - a946d61a by Emmanuel Bourg at 2021-02-08T01:12:08+01:00 Fixed the build failure with OpenJDK 17 (Closes: #982003) - - - - - cabcf72d by Emmanuel Bourg at 2021-02-08T01:12:32+01:00 Upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - debian/maven.rules - + debian/patches/disable-rmic.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,14 @@ +libfreemarker-java (2.3.23-11) unstable; urgency=medium + + * Fixed the build failure with OpenJDK 17 (Closes: #982003) + * Build depend on libservlet-api-java instead of libservlet3.1-java + + -- Emmanuel Bourg <[email protected]> Mon, 08 Feb 2021 01:12:24 +0100 + libfreemarker-java (2.3.23-10) unstable; urgency=medium * Team upload. + * d/control: remove jruby from the build-deps. (Closes: #979745) * d/control: use dh-compat and update to dh13. * d/control: Standards-Version update to 4.5.1. Add Rules-Requires-Root. ===================================== debian/control ===================================== @@ -37,7 +37,7 @@ Build-Depends: liblogback-java, librhino-java, librhino-java-doc, - libservlet3.1-java, + libservlet-api-java, libslf4j-java, libtomcat9-java, libxalan2-java, ===================================== debian/maven.rules ===================================== @@ -4,8 +4,7 @@ com.google.guava s/guava-jdk5/guava/ * s/.*/debian/ * * javax.el javax.el-api * s/.*/3.0/ * * javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * * javax.servlet jstl * * * * -javax.servlet javax.servlet-api * s/.*/3.1/ * * -javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * * junit junit * s/.*/4.x/ * * org.antlr * * s/.*/3.x/ * * org.eclipse.jetty * * s/.*/9.x/ * * ===================================== debian/patches/disable-rmic.patch ===================================== @@ -0,0 +1,29 @@ +Description: No longer call rmic to build with OpenJDK 15 and later +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -211,11 +211,6 @@ + </src> + </javac> + +- <rmic +- base="build/classes" includes="freemarker/debug/impl/Rmi*Impl.class" +- classpathref="ivy.dep" +- verify="yes" stubversion="1.2" +- /> + + <ivy:cachepath conf="build.j2se1.5" pathid="ivy.dep.j2se1.5" /> + <javac srcdir="src/main/java" destdir="build/classes" deprecation="off" +@@ -277,11 +272,6 @@ + freemarker/ext/jython/_Jython22VersionAdapter.java" + /> + +- <rmic base="build/classes" classpathref="ivy.dep" +- includes="src/main/java/freemarker/debug/impl/Rmi*Impl.class" +- verify="yes" stubversion="1.2" +- /> +- + <!-- We don't have this file in 2.4.X... yet? + <copy + file="build/classes/freemarker/core/SecureRendererImpl.class" ===================================== debian/patches/series ===================================== @@ -10,3 +10,4 @@ exclude-avalon-logger.patch jython-compatibility.patch fix-tests-classpath.patch java9.patch +disable-rmic.patch View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/a3e443734d75032528fe38b8a12787c565bb2751...cabcf72dce45f1cc137a712c438b375b6d0c087f -- View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/a3e443734d75032528fe38b8a12787c565bb2751...cabcf72dce45f1cc137a712c438b375b6d0c087f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
