Emmanuel Bourg pushed to branch master at Debian Java Maintainers / sitemesh
Commits: 0790cb6c by Emmanuel Bourg at 2018-10-17T14:42:07Z Fixed the build failure with Java 11 (Closes: #911181) - - - - - c93af655 by Emmanuel Bourg at 2018-10-17T14:42:35Z Standards-Version updated to 4.2.1 - - - - - 6f42e162 by Emmanuel Bourg at 2018-10-17T14:42:54Z Switch to debhelper level 11 - - - - - 3460ace6 by Emmanuel Bourg at 2018-10-17T14:43:00Z Use salsa.debian.org Vcs-* URLs - - - - - 25997e8f by Emmanuel Bourg at 2018-10-17T14:45:38Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - + debian/patches/java11-compatibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,13 +1,20 @@ -sitemesh (2.4.1+dfsg-7) UNRELEASED; urgency=medium +sitemesh (2.4.1+dfsg-7) unstable; urgency=medium * Team upload. + + [ Miguel Landaeta ] * Remove myself from uploaders list. (Closes: #871886) - * Bump DH compat level to 10. * Fix typo in Vcs-Browser field. * Wrap and sort dependencies lists. * Update copyright info. - -- Miguel Landaeta <[email protected]> Wed, 09 Aug 2017 23:15:19 +0100 + [ Emmanuel Bourg ] + * Fixed the build failure with Java 11 (Closes: #911181) + * Standards-Version updated to 4.2.1 + * Switch to debhelper level 11 + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg <[email protected]> Wed, 17 Oct 2018 16:45:27 +0200 sitemesh (2.4.1+dfsg-6) unstable; urgency=medium ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: ant, ant-optional, - debhelper (>= 10~), + debhelper (>= 11), default-jdk, default-jdk-doc, javahelper, @@ -16,9 +16,9 @@ Build-Depends: libservlet3.1-java, libvelocity-tools-java, velocity -Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/sitemesh.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sitemesh.git +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/java-team/sitemesh.git +Vcs-Browser: https://salsa.debian.org/java-team/sitemesh Homepage: http://www.sitemesh.org Package: libsitemesh-java ===================================== debian/patches/java11-compatibility.patch ===================================== @@ -0,0 +1,24 @@ +Description: Fixes the build failure with Java 11 +Author: Emmanuel Bourg <[email protected]> +Bug: https://github.com/sitemesh/sitemesh2/pull/36 +--- a/src/java/com/opensymphony/module/sitemesh/Factory.java ++++ b/src/java/com/opensymphony/module/sitemesh/Factory.java +@@ -14,7 +14,6 @@ + import com.opensymphony.module.sitemesh.util.Container; + + import javax.naming.InitialContext; +-import javax.rmi.PortableRemoteObject; + import java.lang.reflect.Constructor; + import java.lang.reflect.InvocationTargetException; + +@@ -89,9 +88,8 @@ + if (Container.get() != Container.JRUN) { + // TODO: JRun really isn't happy with this + InitialContext ctx = new InitialContext(); +- Object o = ctx.lookup("java:comp/env/" + envEntry); ++ result = (String) ctx.lookup("java:comp/env/" + envEntry); + ctx.close(); +- result = (String)PortableRemoteObject.narrow(o, String.class); // rmi-iiop friendly. + } + } + catch (Exception e) { } // failed - don't moan, just return default. ===================================== debian/patches/series ===================================== @@ -7,3 +7,4 @@ add_compatability_with_servlet_2.4.diff 625764.diff link_javadocs_to_system.diff add_compatability_with_servlet_3.1.diff +java11-compatibility.patch ===================================== debian/rules ===================================== @@ -16,6 +16,3 @@ override_dh_auto_test: override_dh_auto_clean: ant clean rm -f docs/api.css - -get-orig-source: - uscan --verbose --no-symlink --download-current-version --force-download View it on GitLab: https://salsa.debian.org/java-team/sitemesh/compare/3ad5cfb0f06eee82c78122894a62816af97255ea...25997e8f9cc4eda2ecc0559dffacab80f18125d8 -- View it on GitLab: https://salsa.debian.org/java-team/sitemesh/compare/3ad5cfb0f06eee82c78122894a62816af97255ea...25997e8f9cc4eda2ecc0559dffacab80f18125d8 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
