Tony Mancill pushed to branch master at Debian Java Maintainers / ognl
Commits: 59b281b9 by Vladimir Petko at 2024-01-30T12:28:33+13:00 d/p/01_build_xml.diff: fork java command for javacc in order to avoid System.exit() (Closes: #1057528). - - - - - 60642911 by Vladimir Petko at 2024-01-30T12:28:46+13:00 changelog - - - - - 7d19d519 by Tony Mancill at 2024-01-30T04:35:59+00:00 Merge branch 'master' into 'master' Resolve Java 21 ftbfs See merge request java-team/ognl!2 - - - - - 2 changed files: - debian/changelog - debian/patches/01_build_xml.diff Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +ognl (2.7.3-8) UNRELEASED; urgency=medium + + * d/p/01_build_xml.diff: javacc calls System.exit() and it is no + longer intercepted due to SecurityManager changes in Java 21. + Rollback changes to build.xml so that javacc command is forked and + does not abort the ant process (Closes: #1057528). + + -- Vladimir Petko <vladimir.pe...@canonical.com> Tue, 30 Jan 2024 12:23:31 +1300 + ognl (2.7.3-7) unstable; urgency=medium * Team upload. ===================================== debian/patches/01_build_xml.diff ===================================== @@ -1,5 +1,4 @@ Description: - - build.xml: Don't fork javacc-generate (use Ant Classpath) - docbook.xml: Use Xalan2 as XSLT processor - docbook.xml: Fix classpath inclusion of fop.jar Origin: Damien Raude-Morvan <draz...@debian.org> @@ -52,21 +51,7 @@ Origin: Damien Raude-Morvan <draz...@debian.org> <target name="docbook-pdf-doc" depends="docbook-init"> --- a/build.xml +++ b/build.xml -@@ -59,19 +59,19 @@ - </target> - - <target name="javacc-generate"> -- <java classname="org.javacc.jjtree.Main" classpathref="cp" fork="true"> -+ <java classname="org.javacc.jjtree.Main" fork="false"> - <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/> - <arg value="${src.java}/ognl/ognl.jjt"/> - </java> - -- <java classname="org.javacc.parser.Main" classpathref="cp" fork="true"> -+ <java classname="org.javacc.parser.Main" fork="false"> - <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/> - <arg value="${src.java}/ognl/ognl.jj"/> - </java> +@@ -71,7 +71,7 @@ </target> <target name="docs.impl"> View it on GitLab: https://salsa.debian.org/java-team/ognl/-/compare/5c026d821c22d6a16e8171c572025f2659d13e88...7d19d519819d6abb89488ba0fb0f4b5c433fb3ca -- View it on GitLab: https://salsa.debian.org/java-team/ognl/-/compare/5c026d821c22d6a16e8171c572025f2659d13e88...7d19d519819d6abb89488ba0fb0f4b5c433fb3ca You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits