This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libfreemarker-java.
commit 6775301108489a8c9fd0142a910613efc4cc9347 Author: Emmanuel Bourg <[email protected]> Date: Thu Apr 30 15:25:17 2015 +0200 Rereshed the patches --- debian/changelog | 7 ++- debian/control | 5 +- debian/patches/def-jdk-doc.patch | 25 ++++++--- debian/patches/disable-test-coverage.patch | 37 ------------- debian/patches/dtd_location.diff | 63 +++++++++------------ debian/patches/exclude-avalon-logger.patch | 20 +++++-- debian/patches/fix-tests-classpath.patch | 16 +++--- debian/patches/fix-unmappable-character.patch | 2 +- debian/patches/ivy-configuration.patch | 79 +++++++++++++++------------ debian/patches/javacc.diff | 6 +- debian/patches/javarebel.diff | 45 ++++++--------- debian/patches/jdom1.diff | 16 +++--- debian/patches/jsp_api.diff | 13 ++--- debian/patches/jython-compatibility.patch | 13 +++-- debian/patches/series | 1 - 15 files changed, 159 insertions(+), 189 deletions(-) diff --git a/debian/changelog b/debian/changelog index 05102c5..3033a71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -libfreemarker-java (2.3.20-5) UNRELEASED; urgency=medium +libfreemarker-java (2.3.22-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches + - Removed the dependency on liblog4j1.2-java + - New dependencies on findbugs, libcommons-io-java, libjetty8-java + and liblogback-java * Moved the package to Git -- Emmanuel Bourg <[email protected]> Thu, 30 Apr 2015 10:33:48 +0200 diff --git a/debian/control b/debian/control index 2fb1051..e945d0f 100644 --- a/debian/control +++ b/debian/control @@ -13,12 +13,14 @@ Build-Depends: ant, debhelper (>= 9), default-jdk, default-jdk-doc, + findbugs, ivy, javacc, jruby, junit, jython, jython-doc, + libcommons-io-java, libcommons-jxpath-java, libcommons-jxpath-java-doc, libcommons-logging-java, @@ -29,7 +31,8 @@ Build-Depends: ant, libjaxen-java-doc, libjdom1-java, libjdom1-java-doc, - liblog4j1.2-java, + libjetty8-java, + liblogback-java, librhino-java, librhino-java-doc, libservlet2.5-java, diff --git a/debian/patches/def-jdk-doc.patch b/debian/patches/def-jdk-doc.patch index 7077ca8..e467e2e 100644 --- a/debian/patches/def-jdk-doc.patch +++ b/debian/patches/def-jdk-doc.patch @@ -3,13 +3,17 @@ Author: Niels Thykier <[email protected]> --- a/build.xml +++ b/build.xml -@@ -534,8 +534,19 @@ - author="true" +@@ -466,17 +466,27 @@ windowtitle="FreeMarker ${version} API" classpath="build/classes" -- classpathref="ivy.dep" -- /> -+ classpathref="ivy.dep"> + classpathref="ivy.dep" +- failonerror="true" ++ failonerror="false" + charset="UTF-8" + docencoding="UTF-8" + locale="en_US" + > +- <link href="http://docs.oracle.com/javase/8/docs/api/"/> + <link href="/usr/share/doc/default-jdk-doc/api/" /> + <link href="/usr/share/doc/libdom4j-java-doc/apidocs/" /> + <link href="/usr/share/doc/rhino/api/" /> @@ -21,7 +25,12 @@ Author: Niels Thykier <[email protected]> + <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" /> + <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" /> + <link href="/usr/share/doc/libxalan2-java/api/" /> -+ </javadoc> + </javadoc> <delete dir="build/javadoc-sources" /> - - <available file="build/api/resources/titlebar.gif" property="titlebar.found"/> + </target> + +- <target name="javadoc" depends="_rawJavadoc, _fixJDK8JavadocCSS" description="Build the JavaDocs" /> ++ <target name="javadoc" depends="_rawJavadoc" description="Build the JavaDocs" /> + + <target name="_fixJDK8JavadocCSS" depends="_rawJavadoc" if="atLeastJDK8"> + <property name="file" value="build/api/stylesheet.css" /> diff --git a/debian/patches/disable-test-coverage.patch b/debian/patches/disable-test-coverage.patch deleted file mode 100644 index 3802445..0000000 --- a/debian/patches/disable-test-coverage.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: Disables the test coverage with Emma -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -391,23 +391,11 @@ - <!-- ================================================================= --> - - <target name="test" depends="compileTest" description="Run test cases"> -- <ivy:cachepath conf="emma" pathid="ivy.dep.emma" /> -- <taskdef -- resource="emma_ant.properties" classpathref="ivy.dep.emma" -- uri="http://emma.sourceforge.net/emma"; -- /> - - <property name="coverage.dir" location="build/coverage" /> - <property name="coverage.classes.dir" location="build/coverage/classes" /> - <mkdir dir="${coverage.classes.dir}" /> - <property name="coverage.instrumentationfile" location="${coverage.dir}/instrumentation" /> -- <emma:emma enabled="true"> -- <instr -- instrpath="build/classes" outdir="${coverage.classes.dir}" -- outfile="${coverage.instrumentationfile}" mode="copy"> -- <filter excludes="*_Stub" /> -- </instr> -- </emma:emma> - <copy todir="${coverage.classes.dir}" overwrite="false"> - <fileset dir="build/classes" /> - <fileset dir="build/test-classes" /> -@@ -420,7 +408,6 @@ - <sysproperty key="emma.coverage.out.file" value="${coverage.outfile}" /> - <classpath> - <pathelement path="${coverage.classes.dir}" /> -- <path refid="ivy.dep.emma" /> - <path refid="ivy.dep.test" /> - </classpath> - <formatter type="plain" /> diff --git a/debian/patches/dtd_location.diff b/debian/patches/dtd_location.diff index fec0525..f7b78ec 100644 --- a/debian/patches/dtd_location.diff +++ b/debian/patches/dtd_location.diff @@ -7,42 +7,29 @@ Last-Update: 2011-09-22 Forwarded: no --- a/src/main/java/freemarker/ext/jsp/TaglibFactory.java +++ b/src/main/java/freemarker/ext/jsp/TaglibFactory.java -@@ -687,25 +687,26 @@ - static - { - // JSP taglib 2.1 -- dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd";, "web-jsptaglibrary_2_1.xsd"); -+ dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd"); - // JSP taglib 2.0 -- dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";, "web-jsptaglibrary_2_0.xsd"); -+ dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd"); - // JSP taglib 1.2 -- dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "web-jsptaglibrary_1_2.dtd"); -- dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";, "web-jsptaglibrary_1_2.dtd"); -+ dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd"); -+ dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd"); - // JSP taglib 1.1 -- dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "web-jsptaglibrary_1_1.dtd"); -- dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";, "web-jsptaglibrary_1_1.dtd"); -+ dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd"); -+ dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd"); -+ dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd"); - // Servlet 2.5 -- dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd";, "web-app_2_5.xsd"); -+ dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd";, "/javax/servlet/resources/web-app_2_5.xsd"); - // Servlet 2.4 -- dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";, "web-app_2_4.xsd"); -+ dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";, "/javax/servlet/resources/web-app_2_4.xsd"); - // Servlet 2.3 -- dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "web-app_2_3.dtd"); -- dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd";, "web-app_2_3.dtd"); -+ dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "/javax/servlet/resources/web-app_2_3.dtd"); -+ dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd";, "/javax/servlet/resources/web-app_2_3.dtd"); - // Servlet 2.2 -- dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "web-app_2_2.dtd"); -- dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";, "web-app_2_2.dtd"); -+ dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "/javax/servlet/resources/web-app_2_2.dtd"); -+ dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";, "/javax/servlet/resources/web-app_2_2.dtd"); - } - private static final class LocalTaglibDtds implements EntityResolver { +@@ -1870,17 +1870,17 @@ + static + { + // JSP taglib 1.2 +- DTDS.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "web-jsptaglibrary_1_2.dtd"); +- DTDS.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";, "web-jsptaglibrary_1_2.dtd"); ++ DTDS.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd"); ++ DTDS.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd"); + // JSP taglib 1.1 +- DTDS.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "web-jsptaglibrary_1_1.dtd"); +- DTDS.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";, "web-jsptaglibrary_1_1.dtd"); ++ DTDS.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd"); ++ DTDS.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";, "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd"); + // Servlet 2.3 +- DTDS.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "web-app_2_3.dtd"); +- DTDS.put("http://java.sun.com/dtd/web-app_2_3.dtd";, "web-app_2_3.dtd"); ++ DTDS.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "/javax/servlet/resources/web-app_2_3.dtd"); ++ DTDS.put("http://java.sun.com/dtd/web-app_2_3.dtd";, "/javax/servlet/resources/web-app_2_3.dtd"); + // Servlet 2.2 +- DTDS.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "web-app_2_2.dtd"); +- DTDS.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";, "web-app_2_2.dtd"); ++ DTDS.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "/javax/servlet/resources/web-app_2_2.dtd"); ++ DTDS.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";, "/javax/servlet/resources/web-app_2_2.dtd"); + } + public InputSource resolveEntity(String publicId, String systemId) diff --git a/debian/patches/exclude-avalon-logger.patch b/debian/patches/exclude-avalon-logger.patch index c77ad24..5669b49 100644 --- a/debian/patches/exclude-avalon-logger.patch +++ b/debian/patches/exclude-avalon-logger.patch @@ -3,11 +3,21 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -221,6 +221,7 @@ +@@ -205,6 +205,7 @@ classpathref="ivy.dep" - bootclasspath="${boot.classpath.j2se1.2}" + bootclasspath="${boot.classpath.j2se1.4}" excludes=" + freemarker/log/_AvalonLoggerFactory.java, - freemarker/log/_JDK14LoggerFactory.java, - freemarker/core/_RegexBuiltins.java, - freemarker/template/utility/J2SE14TimeZoneOffsetCalculator.java, + freemarker/ext/beans/_EnumModels.java, + freemarker/ext/beans/JRebelClassChangeNotifier.java, + freemarker/ext/dom/SunInternalXalanXPathSupport.java, +--- a/ivy.xml ++++ b/ivy.xml +@@ -108,7 +108,6 @@ + <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" /> + <dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" /> + +- <dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" /> + <dependency org="org.slf4j" name="slf4j-api" rev="&slf4j.version;" conf="build.base->default" /> + <dependency org="org.slf4j" name="log4j-over-slf4j" rev="&slf4j.version;" conf="build.base->default" /> + <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" /> diff --git a/debian/patches/fix-tests-classpath.patch b/debian/patches/fix-tests-classpath.patch index 7b1eb2d..124fdac 100644 --- a/debian/patches/fix-tests-classpath.patch +++ b/debian/patches/fix-tests-classpath.patch @@ -3,16 +3,18 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/ivy.xml +++ b/ivy.xml -@@ -119,6 +119,12 @@ - - <!-- Note: Ant doesn't contain junit.jar anymore, so we add it to conf "test" too. --> - <dependency org="junit" name="junit" rev="3.7" conf="build.test->default; test->default" /> -+ <dependency org="com.google.guava" name="guava" rev="15.0" conf="build.test->default; test->default" /> +@@ -95,6 +95,14 @@ + <!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: --> + <exclude org="xml-apis" module="xml-apis" /> + </dependency> ++ + <dependency org="org.jruby.extras" name="constantine" rev="0.7" conf="build.test->default; test->default" /> + <dependency org="org.jruby" name="jruby" rev="1.7.11" conf="build.test->default; test->default" /> + <dependency org="org.antlr" name="antlr3" rev="3.2" conf="build.test->default; test->default" /> + <dependency org="org.antlr" name="antlr3-runtime" rev="3.2" conf="build.test->default; test->default" /> + <dependency org="asm" name="asm3-all" rev="3.3" conf="build.test->default; test->default" /> ++ <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.test->default; test->default" /> ++ <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.test->default; test->default" /> - <!-- parser --> - + <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.0->default; example.struts-webapp->default" /> + <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.0->default; example.servlet->default" /> diff --git a/debian/patches/fix-unmappable-character.patch b/debian/patches/fix-unmappable-character.patch index a41e64e..ca2fd71 100644 --- a/debian/patches/fix-unmappable-character.patch +++ b/debian/patches/fix-unmappable-character.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/src/main/java/freemarker/template/LocalizedString.java +++ b/src/main/java/freemarker/template/LocalizedString.java -@@ -14,7 +14,7 @@ +@@ -30,7 +30,7 @@ * if "fr".equals(lang) * return "oui"; * else if "de".equals(lang) diff --git a/debian/patches/ivy-configuration.patch b/debian/patches/ivy-configuration.patch index 1f9d553..cbf27c9 100644 --- a/debian/patches/ivy-configuration.patch +++ b/debian/patches/ivy-configuration.patch @@ -46,23 +46,14 @@ Forwarded: not-needed </ivysettings> --- a/ivy.xml +++ b/ivy.xml -@@ -20,7 +20,7 @@ - <conf name="build.base" extends="default" visibility="private" - description="for building FreeMarker without dependencies that has multiple versions" - /> -- <conf name="build" extends="build.jsp2.0" -+ <conf name="build" extends="build.jsp2.1" - description="for building FreeMarker with default dependencies" - /> - -@@ -86,25 +86,21 @@ +@@ -84,25 +84,23 @@ + <!-- build --> - <dependency org="xml-apis" name="xml-apis" rev="1.3.04" conf="build.base->default" /> <!-- as it wasn't part of J2SE 1.2 --> <dependency org="jaxen" name="jaxen" rev="1.0-FCS" conf="build.base->default" /> - <dependency org="saxpath" name="saxpath" rev="1.0-FCS" conf="build.base->default" /> - <dependency org="xalan" name="xalan" rev="2.7.0" conf="build.base->default"> + <dependency org="xalan" name="xalan2" rev="2.7.0" conf="build.base->default"> - <!-- The lowerst supported xml-apis version is an explicit dependency; prevent eviction: --> + <!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: --> <exclude org="xml-apis" module="xml-apis" /> </dependency> <dependency org="dom4j" name="dom4j" rev="1.3" conf="build.base->default" /> <!-- legacy --> @@ -70,7 +61,7 @@ Forwarded: not-needed + <dependency org="org.jdom" name="jdom1" rev="1.0-beta8-dev" conf="build.base->default" /> <!-- legacy --> <dependency org="ant" name="ant" rev="1.6.5" conf="build.base->default"> - <!-- The lowerst supported xml-apis version is an explicit dependency; prevent eviction: --> + <!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: --> <exclude org="xml-apis" module="xml-apis" /> </dependency> @@ -80,44 +71,60 @@ Forwarded: not-needed - <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default; example.servlet->default" /> - <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" /> - <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" /> ++ <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.0->default; example.struts-webapp->default" /> ++ <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.0->default; example.servlet->default" /> + <dependency org="javax.el" name="el-api-2.1" rev="2.1" conf="build.jsp2.1->default" /> + <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.1->default" /> + <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.1->default" /> <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" /> -@@ -112,13 +108,10 @@ - <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" /> - <dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" /> - -- <dependency org="log4j" name="log4j" rev="1.2.6" conf="build.base->default" /> -- <dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" /> -+ <dependency org="log4j" name="log4j-1.2" rev="1.2.6" conf="build.base->default" /> - <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="build.base->default" /> +@@ -116,7 +114,7 @@ + <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" /> <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" /> -- <dependency org="org.zeroturnaround" name="javarebel-sdk" rev="1.2.2" conf="build.base->default" /> -- +- <dependency org="com.google.code.findbugs" name="annotations" rev="3.0.0" conf="build.base->default" /> ++ <dependency org="com.google.code.findbugs" name="findbugs-annotations" rev="3.0.0" conf="build.base->default" /> + <!--dependency org="javax.script" name="script-api" rev="1.0" conf="build.base->default" /--> <!--dependency org="org.visigoths" name="cavalry" rev="1.0" conf="build.base->default" /--> +@@ -124,29 +122,18 @@ + <!-- test --> -@@ -127,15 +120,6 @@ - <!-- Note: Ant doesn't contain junit.jar anymore, so we add it to conf "test" too. --> - <dependency org="junit" name="junit" rev="3.7" conf="build.test->default; test->default" /> - -- <!-- docs --> -- -- <dependency org="org.freemarker" name="docgen" rev="1.0-branch-head" conf="manual->default" changing="true" /> + <!-- Note: Ant doesn't contain junit.jar any more --> +- <dependency org="junit" name="junit" rev="4.12" conf="test->default" /> ++ <dependency org="junit" name="junit4" rev="4.12" conf="test->default" /> + <dependency org="org.hamcrest" name="hamcrest-library" rev="1.3" conf="test->default" /> + + <dependency org="ch.qos.logback" name="logback-classic" rev="1.1.2" conf="test->default" /> + + <dependency org="commons-io" name="commons-io" rev="2.2" conf="test->default" /> +- <dependency org="com.google.guava" name="guava-jdk5" rev="17.0" conf="test->default" /> ++ <dependency org="com.google.guava" name="guava" rev="17.0" conf="test->default" /> + +- <dependency org="org.eclipse.jetty" name="jetty-server" rev="&jetty.version;" conf="test->default" /> +- <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="&jetty.version;" conf="test->default" /> +- <dependency org="org.eclipse.jetty" name="jetty-jsp" rev="&jetty.version;" conf="test->default" /> +- <dependency org="org.eclipse.jetty" name="jetty-util" rev="&jetty.version;" conf="test->default" /> - -- <!-- EMMA --> +- <dependency org="displaytag" name="displaytag" rev="1.2" conf="test->default"> +- <exclude org="com.lowagie" name="itext" /> +- <exclude org="org.slf4j" name="slf4j-log4j12" /> +- <exclude org="org.slf4j" name="jcl104-over-slf4j" /> +- <exclude org="log4j" name="log4j" /> +- </dependency> - -- <dependency org="emma" name="emma" rev="2.0.5312" conf="emma->default" /> -- <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="emma->default" /> +- <!-- docs --> - +- <dependency org="org.freemarker" name="docgen" rev="1.0-branch-head" conf="manual->default" changing="true" /> ++ <dependency org="org.eclipse.jetty" name="jetty8-server" rev="&jetty.version;" conf="test->default" /> ++ <dependency org="org.eclipse.jetty" name="jetty8-webapp" rev="&jetty.version;" conf="test->default" /> ++ <dependency org="org.eclipse.jetty" name="jetty8-jsp" rev="&jetty.version;" conf="test->default" /> ++ <dependency org="org.eclipse.jetty" name="jetty8-util" rev="&jetty.version;" conf="test->default" /> + <!-- parser --> - <dependency org="net.java.dev.javacc" name="javacc" rev="3.2" conf="parser->default" /> -@@ -154,4 +138,4 @@ +@@ -164,4 +151,4 @@ <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" /> </dependencies> @@ -126,7 +133,7 @@ Forwarded: not-needed +</ivy-module> --- a/build.xml +++ b/build.xml -@@ -946,29 +946,11 @@ +@@ -997,29 +997,11 @@ > <echo>Getting dependencies...</echo> <echo>-------------------------------------------------------</echo> diff --git a/debian/patches/javacc.diff b/debian/patches/javacc.diff index b66fbff..c2863c9 100644 --- a/debian/patches/javacc.diff +++ b/debian/patches/javacc.diff @@ -4,7 +4,7 @@ Author: Damien Raude-Morvan <[email protected]> Last-Update: 2009-09-27 --- a/build.xml +++ b/build.xml -@@ -132,7 +132,6 @@ +@@ -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/"; @@ -12,7 +12,7 @@ Last-Update: 2009-09-27 /> <property name="_javaccOutputDir" -@@ -144,7 +143,7 @@ +@@ -135,7 +134,7 @@ <javacc:generate target="src/main/javacc/FTL.jj" outputdirectory="${_javaccOutputDir}" @@ -21,7 +21,7 @@ Last-Update: 2009-09-27 /> <delete dir="build/javacc-home.tmp" /> -@@ -166,7 +165,7 @@ +@@ -157,7 +156,7 @@ <replace file="${_javaccOutputDir}/Token.java" token="public class Token" diff --git a/debian/patches/javarebel.diff b/debian/patches/javarebel.diff index e3845f6..84c3a8e 100644 --- a/debian/patches/javarebel.diff +++ b/debian/patches/javarebel.diff @@ -3,37 +3,24 @@ Description: Forwarded: no Author: Damien Raude-Morvan <[email protected]> Last-Update: 2009-09-27 ---- a/src/main/java/freemarker/ext/beans/BeansWrapper.java -+++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java -@@ -251,7 +251,6 @@ - */ - public BeansWrapper() { - if(javaRebelAvailable) { -- JavaRebelIntegration.registerWrapper(this); - } - } - -@@ -1780,13 +1779,7 @@ - - - private static boolean isJavaRebelAvailable() { -- try { -- JavaRebelIntegration.testAvailability(); -- return true; -- } -- catch(NoClassDefFoundError e) { - return false; -- } - } - - /** --- a/build.xml +++ b/build.xml -@@ -227,6 +227,7 @@ - freemarker/template/utility/J2SE14TimeZoneOffsetCalculator.java, - +@@ -207,6 +207,7 @@ + bootclasspath="${boot.classpath.j2se1.4}" + excludes=" freemarker/ext/beans/_EnumModels.java, -+ freemarker/ext/beans/JavaRebelIntegration.java, ++ freemarker/ext/beans/JRebelClassChangeNotifier.java, freemarker/ext/dom/SunInternalXalanXPathSupport.java, - freemarker/ext/jsp/TaglibFactory.java, + freemarker/ext/jsp/**, +--- a/ivy.xml ++++ b/ivy.xml +@@ -116,8 +116,6 @@ + <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" /> + <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" /> + +- <dependency org="org.zeroturnaround" name="javarebel-sdk" rev="1.2.2" conf="build.base->default" /> +- + <dependency org="com.google.code.findbugs" name="annotations" rev="3.0.0" conf="build.base->default" /> + + <!--dependency org="javax.script" name="script-api" rev="1.0" conf="build.base->default" /--> diff --git a/debian/patches/jdom1.diff b/debian/patches/jdom1.diff index 89d0b6d..c2babdc 100644 --- a/debian/patches/jdom1.diff +++ b/debian/patches/jdom1.diff @@ -4,7 +4,7 @@ Author: Damien Raude-Morvan <[email protected]> Last-Update: 2009-09-27 --- a/src/main/java/freemarker/ext/jdom/NodeListModel.java +++ b/src/main/java/freemarker/ext/jdom/NodeListModel.java -@@ -734,7 +734,7 @@ +@@ -696,7 +696,7 @@ else if ("data".equals(localName)) attr = new Attribute("data", pi.getData()); else @@ -13,7 +13,7 @@ Last-Update: 2009-09-27 } else if (node instanceof DocType) { DocType doctype = (DocType)node; if ("publicId".equals(localName)) -@@ -844,17 +844,17 @@ +@@ -806,17 +806,17 @@ private static final Element getParent(Object node) { if (node instanceof Element) @@ -36,7 +36,7 @@ Last-Update: 2009-09-27 else // With 2.1 semantics it makes more sense to just return a null and let the core // throw an InvalidReferenceException and the template writer can use ?exists etcetera. (JR) -@@ -878,7 +878,7 @@ +@@ -840,7 +840,7 @@ LinkedList list = new LinkedList(); do { list.addFirst(parent); @@ -45,7 +45,7 @@ Last-Update: 2009-09-27 } while (parent != null); return list; -@@ -894,7 +894,7 @@ +@@ -856,7 +856,7 @@ list.addFirst(node); do { list.addFirst(parent); @@ -54,7 +54,7 @@ Last-Update: 2009-09-27 } while (parent != null); return list; -@@ -953,7 +953,7 @@ +@@ -915,7 +915,7 @@ Element parent = ((Attribute)node).getParent(); doc = parent == null ? null : parent.getDocument(); } else if (node instanceof Text) { @@ -65,7 +65,7 @@ Last-Update: 2009-09-27 doc = (Document)node; --- a/src/main/java/freemarker/ext/xml/_JdomNavigator.java +++ b/src/main/java/freemarker/ext/xml/_JdomNavigator.java -@@ -171,7 +171,7 @@ +@@ -133,7 +133,7 @@ result.add(new Attribute("data", pi.getData())); } else { @@ -74,7 +74,7 @@ Last-Update: 2009-09-27 } } else if (node instanceof DocType) { DocType doctype = (DocType)node; -@@ -208,22 +208,22 @@ +@@ -170,22 +170,22 @@ Object getParent(Object node) { if (node instanceof Element) { @@ -102,7 +102,7 @@ Last-Update: 2009-09-27 } return null; } -@@ -237,7 +237,7 @@ +@@ -199,7 +199,7 @@ return parent == null ? null : parent.getDocument(); } else if (node instanceof Text) { diff --git a/debian/patches/jsp_api.diff b/debian/patches/jsp_api.diff index b012736..887d2e0 100644 --- a/debian/patches/jsp_api.diff +++ b/debian/patches/jsp_api.diff @@ -4,26 +4,23 @@ Author: Damien Raude-Morvan <[email protected]> Last-Update: 2009-09-27 --- a/build.xml +++ b/build.xml -@@ -231,7 +231,9 @@ - +@@ -253,22 +253,13 @@ + excludes=" freemarker/ext/jsp/TaglibFactory.java, freemarker/ext/jsp/_FreeMarkerPageContext1.java, + freemarker/ext/jsp/_FreeMarkerPageContext2.java, freemarker/ext/jsp/_FreeMarkerPageContext21.java, + freemarker/ext/jsp/FreeMarkerJspFactory2.java, freemarker/ext/jsp/FreeMarkerJspFactory21.java, - freemarker/ext/jsp/FreeMarkerJspApplicationContext.java, - -@@ -274,17 +276,6 @@ - freemarker/ext/dom/SunInternalXalanXPathSupport.java" + freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" /> - <ivy:cachepath conf="build.jsp1.2" pathid="ivy.dep.jsp1.2" /> - <javac srcdir="src/main/java" destdir="build/classes" deprecation="off" -- debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8" +- debug="on" optimize="off" target="1.4" source="1.4" encoding="utf-8" - includeantruntime="false" - classpathref="ivy.dep.jsp1.2" -- bootclasspath="${boot.classpath.j2se1.2}" +- bootclasspath="${boot.classpath.j2se1.4}" - includes=" - freemarker/ext/jsp/TaglibFactory.java, - freemarker/ext/jsp/_FreeMarkerPageContext1.java" diff --git a/debian/patches/jython-compatibility.patch b/debian/patches/jython-compatibility.patch index 6456def..4e172e3 100644 --- a/debian/patches/jython-compatibility.patch +++ b/debian/patches/jython-compatibility.patch @@ -3,17 +3,18 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -291,41 +291,21 @@ +@@ -275,41 +275,21 @@ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" /> - <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" /> + <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" /> <javac srcdir="src/main/java" destdir="build/classes" deprecation="off" - debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8" +- debug="on" optimize="off" target="1.4" source="1.4" encoding="utf-8" ++ debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" includeantruntime="false" - classpathref="ivy.dep.jython2.0" -- bootclasspath="${boot.classpath.j2se1.2}" +- bootclasspath="${boot.classpath.j2se1.4}" + classpathref="ivy.dep.jython2.5" + bootclasspath="${boot.classpath.j2se1.5}" includes=" @@ -27,10 +28,10 @@ Forwarded: not-needed - - <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" /> - <javac srcdir="src/main/java" destdir="build/classes" deprecation="off" -- debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8" +- debug="on" optimize="off" target="1.4" source="1.4" encoding="utf-8" - includeantruntime="false" - classpathref="ivy.dep.jython2.2" -- bootclasspath="${boot.classpath.j2se1.2}" +- bootclasspath="${boot.classpath.j2se1.4}" - includes=" + freemarker/ext/jython/_Jython20And21VersionAdapter.java, freemarker/ext/jython/_Jython22VersionAdapter.java" @@ -38,7 +39,7 @@ Forwarded: not-needed - <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" /> - <javac srcdir="src/main/java" destdir="build/classes" deprecation="off" -- debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8" +- debug="on" optimize="off" target="1.4" source="1.4" encoding="utf-8" - includeantruntime="false" - classpathref="ivy.dep.jython2.5" - bootclasspath="${boot.classpath.j2se1.5}" diff --git a/debian/patches/series b/debian/patches/series index 72b6b90..fa10740 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,5 +8,4 @@ fix-unmappable-character.patch ivy-configuration.patch exclude-avalon-logger.patch jython-compatibility.patch -disable-test-coverage.patch fix-tests-classpath.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libfreemarker-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
