[pkg-java] r17873 - in trunk/libfreemarker-java/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Mar 12 19:23:12 UTC 2014
Author: ebourg-guest
Date: 2014-03-12 19:23:11 +0000 (Wed, 12 Mar 2014)
New Revision: 17873
Added:
trunk/libfreemarker-java/debian/patches/disable-test-coverage.patch
trunk/libfreemarker-java/debian/patches/exclude-avalon-logger.patch
trunk/libfreemarker-java/debian/patches/ivy-configuration.patch
trunk/libfreemarker-java/debian/patches/jython-compatibility.patch
Removed:
trunk/libfreemarker-java/debian/ant.properties
trunk/libfreemarker-java/debian/patches/fix-classpath.patch
Modified:
trunk/libfreemarker-java/debian/changelog
trunk/libfreemarker-java/debian/control
trunk/libfreemarker-java/debian/orig-tar.exclude
trunk/libfreemarker-java/debian/orig-tar.sh
trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
trunk/libfreemarker-java/debian/patches/dtd_location.diff
trunk/libfreemarker-java/debian/patches/fix-unmappable-character.patch
trunk/libfreemarker-java/debian/patches/javacc.diff
trunk/libfreemarker-java/debian/patches/javarebel.diff
trunk/libfreemarker-java/debian/patches/jdom1.diff
trunk/libfreemarker-java/debian/patches/jsp_api.diff
trunk/libfreemarker-java/debian/patches/series
trunk/libfreemarker-java/debian/pom.xml
trunk/libfreemarker-java/debian/rules
Log:
New upstream release (2.3.20)
Refreshed the patches
Updated debian/pom.xml
New build dependencies on ivy, bnd and liblog4j1.2-java
Added a patch changing the ivy settings to use the Debian jars
Added a patch to ignore the code related to avalon-logger
Added a patch disabling the code coverage report
Updated debian/orig-tar.sh for the new source layout
Use XZ compression for the upstream tarball
Deleted: trunk/libfreemarker-java/debian/ant.properties
===================================================================
--- trunk/libfreemarker-java/debian/ant.properties 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/ant.properties 2014-03-12 19:23:11 UTC (rev 17873)
@@ -1,6 +0,0 @@
-all.libs.present=true
-project.name=freemarker
-class.dir=classes
-source.dir=src
-javadoc.dir=docs/api
-jar.name=freemarker.jar
Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/changelog 2014-03-12 19:23:11 UTC (rev 17873)
@@ -1,9 +1,19 @@
-libfreemarker-java (2.3.19-2) UNRELEASED; urgency=medium
+libfreemarker-java (2.3.20-1) UNRELEASED; urgency=medium
+ * New upstream release
+ - Refreshed the patches
+ - Updated debian/pom.xml
+ - New build dependencies on ivy, bnd and liblog4j1.2-java
+ - Added a patch changing the ivy settings to use the Debian jars
+ - Added a patch to ignore the code related to avalon-logger
+ - Added a patch disabling the code coverage report
* Fixed an unmappable character in LocalizedString.java preventing
the generation of the Javadoc.
* Switch to debhelper level 9
* Standards-Version updated to 3.9.5 (no changes)
+ * debian/orig-tar.sh:
+ - Updated for the new source layout
+ - Use XZ compression for the upstream tarball
-- Emmanuel Bourg <ebourg at apache.org> Wed, 12 Mar 2014 10:32:32 +0100
Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/control 2014-03-12 19:23:11 UTC (rev 17873)
@@ -8,10 +8,12 @@
Emmanuel Bourg <ebourg at apache.org>
Build-Depends: ant,
ant-optional,
+ bnd,
cdbs,
debhelper (>= 9),
default-jdk,
default-jdk-doc,
+ ivy,
javacc,
junit,
jython,
@@ -26,6 +28,7 @@
libjaxen-java-doc,
libjdom1-java,
libjdom1-java-doc,
+ liblog4j1.2-java,
librhino-java,
librhino-java-doc,
libservlet2.5-java,
Modified: trunk/libfreemarker-java/debian/orig-tar.exclude
===================================================================
--- trunk/libfreemarker-java/debian/orig-tar.exclude 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/orig-tar.exclude 2014-03-12 19:23:11 UTC (rev 17873)
@@ -2,3 +2,6 @@
*/docs*
*/src/freemarker/ext/jsp/*.dtd
*/src/freemarker/ext/jsp/*.xsd
+.settings
+.project
+.classpath
Modified: trunk/libfreemarker-java/debian/orig-tar.sh
===================================================================
--- trunk/libfreemarker-java/debian/orig-tar.sh 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/orig-tar.sh 2014-03-12 19:23:11 UTC (rev 17873)
@@ -2,13 +2,16 @@
# called by uscan with '--upstream-version' <version> <file>
-DIR=libfreemarker-java-$2.orig
+VERSION=$2
+TAR=../libfreemarker-java_$VERSION.orig.tar.xz
+DIR=freemarker-$VERSION
# clean up the upstream tarball
-tar -x -z -f $3
-mv freemarker-$2 $DIR
-tar -c -z -f $3 -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
+mkdir $DIR
+tar -x -C $DIR -f $3
+mv $DIR/source $DIR/$DIR
+XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude -C $DIR $DIR
+rm -rf $DIR $3
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
@@ -16,4 +19,3 @@
mv $3 $origDir
echo "moved $3 to $origDir"
fi
-
Modified: trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -3,21 +3,25 @@
--- a/build.xml
+++ b/build.xml
-@@ -461,6 +461,17 @@
- windowtitle="FreeMarker ${version} API"
- classpathref="compile.classpath.javadoc"
- use="${javadoc.use}">
-+ <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/" />
-+ <link href="/usr/share/doc/jython-doc/api-html/" />
-+ <link href="/usr/share/doc/liblog4j1.2-java/api/" />
-+ <link href="/usr/share/doc/libjaxen-java/api/" />
-+ <link href="/usr/share/doc/libjdom1-java/api/" />
-+ <link href="/usr/share/doc/libxerces2-java-doc/api/" />
-+ <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>
- </target>
-
+@@ -533,8 +533,19 @@
+ author="true"
+ windowtitle="FreeMarker ${version} API"
+ classpath="build/classes"
+- classpathref="ivy.dep"
+- />
++ classpathref="ivy.dep">
++ <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/" />
++ <link href="/usr/share/doc/jython-doc/api-html/" />
++ <link href="/usr/share/doc/liblog4j1.2-java/api/" />
++ <link href="/usr/share/doc/libjaxen-java/api/" />
++ <link href="/usr/share/doc/libjdom1-java/api/" />
++ <link href="/usr/share/doc/libxerces2-java-doc/api/" />
++ <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>
+ <delete dir="build/javadoc-sources" />
+
+ <available file="build/api/resources/titlebar.gif" property="titlebar.found"/>
Added: trunk/libfreemarker-java/debian/patches/disable-test-coverage.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/disable-test-coverage.patch (rev 0)
+++ trunk/libfreemarker-java/debian/patches/disable-test-coverage.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -0,0 +1,37 @@
+Description: Disables the test coverage with Emma
+Author: Emmanuel Bourg <ebourg at apache.org>
+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" />
Modified: trunk/libfreemarker-java/debian/patches/dtd_location.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/dtd_location.diff 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/dtd_location.diff 2014-03-12 19:23:11 UTC (rev 17873)
@@ -5,11 +5,9 @@
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2011-09-22
Forwarded: no
-Index: b/src/freemarker/ext/jsp/TaglibFactory.java
-===================================================================
---- a/src/freemarker/ext/jsp/TaglibFactory.java
-+++ b/src/freemarker/ext/jsp/TaglibFactory.java
-@@ -688,25 +688,26 @@
+--- 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
Added: trunk/libfreemarker-java/debian/patches/exclude-avalon-logger.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/exclude-avalon-logger.patch (rev 0)
+++ trunk/libfreemarker-java/debian/patches/exclude-avalon-logger.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -0,0 +1,13 @@
+Description: Excludes the Avalon Logger support (not in Debian and obsolete)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -221,6 +221,7 @@
+ classpathref="ivy.dep"
+ bootclasspath="${boot.classpath.j2se1.2}"
+ excludes="
++ freemarker/log/_AvalonLoggerFactory.java,
+ freemarker/log/_JDK14LoggerFactory.java,
+ freemarker/core/_RegexBuiltins.java,
+ freemarker/template/utility/J2SE14TimeZoneOffsetCalculator.java,
Deleted: trunk/libfreemarker-java/debian/patches/fix-classpath.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/fix-classpath.patch 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/fix-classpath.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -1,24 +0,0 @@
-Description: This patch sets the classpath for building the javadoc and compiling
- the tests. For some reason the classpath set by CDBS is ignored, please remove
- this patch if you figure out why.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -459,7 +459,7 @@
- sourcepath="${src.dir}"
- version="true"
- windowtitle="FreeMarker ${version} API"
-- classpathref="compile.classpath.javadoc"
-+ classpathref="compile.classpath"
- use="${javadoc.use}">
- <link href="/usr/share/doc/default-jdk-doc/api/" />
- <link href="/usr/share/doc/libdom4j-java-doc/apidocs/" />
-@@ -789,6 +789,7 @@
-
- <javac deprecation="on" destdir="${testcase.dir}" debug="on" optimize="off" includeantruntime="false">
- <src path="${src.dir}"/>
-+ <classpath refid="compile.classpath"/>
- <classpath refid="compile.classpath.testcases"/>
- <patternset refid="freemarker.compile.testcases"/>
- </javac>
Modified: trunk/libfreemarker-java/debian/patches/fix-unmappable-character.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/fix-unmappable-character.patch 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/fix-unmappable-character.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -1,14 +1,14 @@
Description: Fixes an unmappable character for encoding UTF8 that breaks the generation of the Javadoc
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/src/freemarker/template/LocalizedString.java
-+++ b/src/freemarker/template/LocalizedString.java
-@@ -13,7 +13,7 @@
- * if "fr".equals(lang)
- * return "oui";
- * else if "de".equals(lang)
-- * return "sí";
-+ * return "ya";
- * else
- * return "yes";
- * }
+--- a/src/main/java/freemarker/template/LocalizedString.java
++++ b/src/main/java/freemarker/template/LocalizedString.java
+@@ -14,7 +14,7 @@
+ * if "fr".equals(lang)
+ * return "oui";
+ * else if "de".equals(lang)
+- * return "sÃ";
++ * return "ja";
+ * else
+ * return "yes";
+ * }
Added: trunk/libfreemarker-java/debian/patches/ivy-configuration.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/ivy-configuration.patch (rev 0)
+++ trunk/libfreemarker-java/debian/patches/ivy-configuration.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -0,0 +1,161 @@
+Description: Modifies the ivy configuration to use the jars in /usr/share/java
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/ivysettings.xml
++++ b/ivysettings.xml
+@@ -1,35 +1,12 @@
+ <ivysettings>
+- <!-- Prevent IvyDE error: -->
+- <property name="server.ivy.repo.root" value="${ivy.project.dir}/NOT_SET" override="false" />
+-
+- <caches defaultCacheDir="${ivy.project.dir}/.ivy/cache">
+- <cache name="cacheForPrivate" useOrigin="true" defaultTTL="1s" />
+-
+- <!--
+- Rather don't use useOrigin="true" here, as deleting from the target repo breaks the cache then.
+- -->
+- <cache name="cacheForLocalOverride"
+- basedir="${user.home}/.ivy2/freemarker-devel-local-override-cache"
+- defaultTTL="1s" lockStrategy="artifact-lock"
+- />
+- </caches>
++ <settings defaultResolver="debian" />
+ <resolvers>
+- <chain name="freemarker-devel-local" returnFirst="true">
+- <filesystem name="freemarker-devel-local-override" cache="cacheForLocalOverride">
+- <ivy pattern="${user.home}/.ivy2/freemarker-devel-local-override/[organisation]/[module]/ivy-[revision].xml" />
+- <artifact pattern="${user.home}/.ivy2/freemarker-devel-local-override/[organisation]/[module]/[artifact]-[revision].[ext]" />
+- </filesystem>
+- <filesystem name="project-private" cache="cacheForPrivate">
+- <ivy pattern="${ivy.project.dir}/.ivy/repo/[organisation]/[module]/ivy-[revision].xml" />
+- <artifact pattern="${ivy.project.dir}/.ivy/repo/[organisation]/[module]/[artifact]-[revision].[ext]" />
+- </filesystem>
+- </chain>
+- <filesystem name="server-publishing-target">
+- <ivy pattern="${server.ivy.repo.root}/[organisation]/[module]/ivy-[revision].xml" />
+- <artifact pattern="${server.ivy.repo.root}/[organisation]/[module]/[artifact]-[revision].[ext]" />
++ <filesystem name="debian">
++<!-- <ivy pattern="${user.home}/.ivy2/debian/[organisation]/[module]/ivy-[revision].xml" />-->
++ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ </filesystem>
+ </resolvers>
+ <modules>
+- <module organisation="*" resolver="freemarker-devel-local" />
++ <module organisation="*" resolver="debian" />
+ </modules>
+ </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 @@
+
+ <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: -->
+ <exclude org="xml-apis" module="xml-apis" />
+ </dependency>
+ <dependency org="dom4j" name="dom4j" rev="1.3" conf="build.base->default" /> <!-- legacy -->
+- <dependency org="org.jdom" name="jdom" rev="1.0-beta8-dev" conf="build.base->default" /> <!-- legacy -->
++ <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: -->
+ <exclude org="xml-apis" module="xml-apis" />
+ </dependency>
+
+- <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
+- <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />
+- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default; example.struts-webapp->default" />
+- <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.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" />
+ <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="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" /-->
+
+@@ -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" />
+-
+- <!-- EMMA -->
+-
+- <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" />
+-
+ <!-- parser -->
+
+ <dependency org="net.java.dev.javacc" name="javacc" rev="3.2" conf="parser->default" />
+@@ -154,4 +138,4 @@
+ <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
+
+ </dependencies>
+-</ivy-module>
+\ No newline at end of file
++</ivy-module>
+--- a/build.xml
++++ b/build.xml
+@@ -946,29 +946,11 @@
+ >
+ <echo>Getting dependencies...</echo>
+ <echo>-------------------------------------------------------</echo>
+- <ivy:settings id="remote" url="http://freemarker.org/repos/ivy/ivysettings-remote.xml" />
+ <!-- Build an own repository that will serve us even offline: -->
+- <ivy:retrieve settingsRef="remote" sync="true"
+- ivypattern=".ivy.part/repo/[organisation]/[module]/ivy-[revision].xml"
+- pattern=".ivy.part/repo/[organisation]/[module]/[artifact]-[revision].[ext]"
++ <ivy:retrieve sync="true"
++ ivypattern=".ivy/repo/[organisation]/[module]/ivy-[revision].xml"
++ pattern=".ivy/repo/[organisation]/[module]/[artifact]-[revision].[ext]"
+ />
+- <echo>-------------------------------------------------------</echo>
+- <echo>*** Successfully acquired dependencies from the Web ***</echo>
+- <echo>Eclipse users: Now right-click on ivy.xml and Resolve! </echo>
+- <echo>-------------------------------------------------------</echo>
+- <!-- Only now that we got all the dependencies will we delete anything. -->
+- <!-- Thus a net or repo outage doesn't left us without the dependencies. -->
+-
+- <!-- Save the resolution cache from the soon coming <delete>: -->
+- <move todir=".ivy.part/update-deps-reso-cache">
+- <fileset dir=".ivy/update-deps-reso-cache" />
+- </move>
+- <!-- Drop all the old stuff: -->
+- <delete dir=".ivy" />
+- <!-- And use the new stuff instead: -->
+- <move todir=".ivy">
+- <fileset dir=".ivy.part" />
+- </move>
+ </target>
+
+ <!-- Do NOT call this from 'clean'; offline guys would stuck after that. -->
Modified: trunk/libfreemarker-java/debian/patches/javacc.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc.diff 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/javacc.diff 2014-03-12 19:23:11 UTC (rev 17873)
@@ -4,27 +4,29 @@
Last-Update: 2009-09-27
--- a/build.xml
+++ b/build.xml
-@@ -481,13 +481,12 @@
- description="Build the JavaCC parser from its grammar file">
- <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
- uri="http://javacc.dev.java.net/"
-- classpath="lib/javacc.jar"
- />
-
- <javacc:generate
- target="${src.dir}/freemarker/core/FMParser.jj"
- outputdirectory="src/freemarker/core"
-- javacchome="lib"
-+ javacchome="/usr/share/java/" jdkversion="1.3"
- />
- <replace
- file="src/freemarker/core/FMParser.java"
-@@ -507,7 +506,7 @@
- <replace
- file="src/freemarker/core/Token.java"
- token="public class Token"
-- value="class Token implements java.io.Serializable"
-+ value="class Token"
- />
- <replace
- file="src/freemarker/core/SimpleCharStream.java"
+@@ -132,7 +132,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"
+@@ -144,7 +143,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" />
+
+@@ -166,7 +165,7 @@
+ <replace
+ file="${_javaccOutputDir}/Token.java"
+ token="public class Token"
+- value="class Token implements java.io.Serializable"
++ value="class Token"
+ />
+ <replace
+ file="${_javaccOutputDir}/SimpleCharStream.java"
Modified: trunk/libfreemarker-java/debian/patches/javarebel.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javarebel.diff 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/javarebel.diff 2014-03-12 19:23:11 UTC (rev 17873)
@@ -3,19 +3,9 @@
Forwarded: no
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2009-09-27
---- a/build.xml
-+++ b/build.xml
-@@ -158,6 +158,7 @@
- <exclude name="freemarker/core/RegexBuiltins.java"/>
- <exclude name="freemarker/ext/ant/**"/>
- <exclude name="freemarker/ext/beans/EnumModels.java"/>
-+ <exclude name="freemarker/ext/beans/JavaRebelIntegration.java"/>
- <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/>
- <exclude name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
- <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/>
---- a/src/freemarker/ext/beans/BeansWrapper.java
-+++ b/src/freemarker/ext/beans/BeansWrapper.java
-@@ -232,7 +232,6 @@
+--- 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) {
@@ -23,7 +13,7 @@
}
}
-@@ -1672,13 +1671,7 @@
+@@ -1780,13 +1779,7 @@
private static boolean isJavaRebelAvailable() {
@@ -37,3 +27,13 @@
}
/**
+--- a/build.xml
++++ b/build.xml
+@@ -227,6 +227,7 @@
+ freemarker/template/utility/J2SE14TimeZoneOffsetCalculator.java,
+
+ freemarker/ext/beans/_EnumModels.java,
++ freemarker/ext/beans/JavaRebelIntegration.java,
+ freemarker/ext/dom/SunInternalXalanXPathSupport.java,
+
+ freemarker/ext/jsp/TaglibFactory.java,
Modified: trunk/libfreemarker-java/debian/patches/jdom1.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jdom1.diff 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/jdom1.diff 2014-03-12 19:23:11 UTC (rev 17873)
@@ -2,8 +2,8 @@
Forwarded: no
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2009-09-27
---- a/src/freemarker/ext/jdom/NodeListModel.java
-+++ b/src/freemarker/ext/jdom/NodeListModel.java
+--- a/src/main/java/freemarker/ext/jdom/NodeListModel.java
++++ b/src/main/java/freemarker/ext/jdom/NodeListModel.java
@@ -734,7 +734,7 @@
else if ("data".equals(localName))
attr = new Attribute("data", pi.getData());
@@ -63,9 +63,9 @@
doc = parent == null ? null : parent.getDocument();
} else if (node instanceof Document)
doc = (Document)node;
---- a/src/freemarker/ext/xml/JdomNavigator.java
-+++ b/src/freemarker/ext/xml/JdomNavigator.java
-@@ -169,7 +169,7 @@
+--- a/src/main/java/freemarker/ext/xml/_JdomNavigator.java
++++ b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
+@@ -171,7 +171,7 @@
result.add(new Attribute("data", pi.getData()));
}
else {
@@ -74,7 +74,7 @@
}
} else if (node instanceof DocType) {
DocType doctype = (DocType)node;
-@@ -206,22 +206,22 @@
+@@ -208,22 +208,22 @@
Object getParent(Object node) {
if (node instanceof Element) {
@@ -102,7 +102,7 @@
}
return null;
}
-@@ -235,7 +235,7 @@
+@@ -237,7 +237,7 @@
return parent == null ? null : parent.getDocument();
}
else if (node instanceof Text) {
Modified: trunk/libfreemarker-java/debian/patches/jsp_api.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp_api.diff 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/jsp_api.diff 2014-03-12 19:23:11 UTC (rev 17873)
@@ -4,29 +4,31 @@
Last-Update: 2009-09-27
--- a/build.xml
+++ b/build.xml
-@@ -89,8 +89,6 @@
- </path>
-
- <path id="compile.jsp1.classpath">
-- <path refid="compile.nomultiversion.classpath"/>
-- <pathelement path="${lib.jsp12}"/>
- </path>
-
- <path id="compile.jsp2.classpath">
-@@ -250,7 +248,6 @@
-
- <patternset id="freemarker.compile.jsp1">
- <include name="freemarker/ext/jsp/TaglibFactory.java"/>
-- <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
- </patternset>
-
- <patternset id="freemarker.compile.jsp2">
-@@ -561,8 +558,6 @@
- <antcall target="compile-commons-logging"/>
- <antcall target="compile-jdk14"/>
- <antcall target="compile-jdk15"/>
-- <antcall target="compile-jsp1"/>
-- <antcall target="compile-jsp2"/>
- <antcall target="compile-jython20"/>
- <antcall target="compile-jython22"/>
- <antcall target="compile-jython25"/>
+@@ -231,7 +231,9 @@
+
+ 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"
+ />
+
+- <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"
+- includeantruntime="false"
+- classpathref="ivy.dep.jsp1.2"
+- bootclasspath="${boot.classpath.j2se1.2}"
+- includes="
+- freemarker/ext/jsp/TaglibFactory.java,
+- freemarker/ext/jsp/_FreeMarkerPageContext1.java"
+- />
+-
+ <!-- There's no build.jsp2.0, as those classes are part of the common build subset. -->
+
+ <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" />
Added: trunk/libfreemarker-java/debian/patches/jython-compatibility.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/jython-compatibility.patch (rev 0)
+++ trunk/libfreemarker-java/debian/patches/jython-compatibility.patch 2014-03-12 19:23:11 UTC (rev 17873)
@@ -0,0 +1,51 @@
+Description: Compile only the classes compatible with the version of jython in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -291,41 +291,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"
+ includeantruntime="false"
+- classpathref="ivy.dep.jython2.0"
+- bootclasspath="${boot.classpath.j2se1.2}"
++ classpathref="ivy.dep.jython2.5"
++ bootclasspath="${boot.classpath.j2se1.5}"
+ includes="
+ freemarker/ext/ant/**,
+ freemarker/template/utility/JythonRuntime.java,
+ freemarker/ext/jython/**"
+ excludes="
+- freemarker/ext/jython/_Jython22VersionAdapter.java,
+- freemarker/ext/jython/_Jython25VersionAdapter.java"
+- />
+-
+- <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"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.2"
+- bootclasspath="${boot.classpath.j2se1.2}"
+- includes="
++ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
+ freemarker/ext/jython/_Jython22VersionAdapter.java"
+ />
+
+- <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"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.5"
+- bootclasspath="${boot.classpath.j2se1.5}"
+- includes="
+- freemarker/ext/jython/_Jython25VersionAdapter.java"
+- />
+-
+ <rmic base="build/classes" classpathref="ivy.dep"
+ includes="src/main/java/freemarker/debug/impl/Rmi*Impl.class"
+ verify="yes" stubversion="1.2"
Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/patches/series 2014-03-12 19:23:11 UTC (rev 17873)
@@ -4,5 +4,8 @@
jsp_api.diff
def-jdk-doc.patch
dtd_location.diff
-fix-classpath.patch
fix-unmappable-character.patch
+ivy-configuration.patch
+exclude-avalon-logger.patch
+jython-compatibility.patch
+disable-test-coverage.patch
Modified: trunk/libfreemarker-java/debian/pom.xml
===================================================================
--- trunk/libfreemarker-java/debian/pom.xml 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/pom.xml 2014-03-12 19:23:11 UTC (rev 17873)
@@ -1,29 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
- <project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.19</version>
- <packaging>jar</packaging>
- <name>FreeMarker</name>
- <description>
- FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
- </description>
- <url>http://freemarker.org</url>
- <licenses>
- <license>
- <name>BSD-style license</name>
- <url>http://freemarker.org/LICENSE.txt</url>
- </license>
- </licenses>
- <scm>
- <url>http://freemarker.svn.sourceforge.net/viewvc/freemarker/</url>
- <connection>scm:svn:https://freemarker.svn.sourceforge.net/svnroot/freemarker</connection>
- </scm>
- <dependencies>
- <!-- no required dependencies -->
- </dependencies>
- </project>
-
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.20</version>
+
+ <packaging>jar</packaging>
+
+ <name>FreeMarker</name>
+ <description>
+ FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
+ </description>
+ <url>http://freemarker.org/</url>
+ <licenses>
+ <license>
+ <name>BSD-style license</name>
+ <url>http://freemarker.org/LICENSE.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git at github.com:freemarker/freemarker.git</connection>
+ <developerConnection>scm:git:git at github.com:freemarker/freemarker.git</developerConnection>
+ <url>git at github.com:freemarker/freemarker.git</url>
+ </scm>
+ <developers>
+ <developer>
+ <name>Attila Szegedi</name>
+ </developer>
+ <developer>
+ <name>Daniel Dekany</name>
+ <email>ddekany at freemail.hu</email>
+ </developer>
+ <developer>
+ <name>Jonathan Revusky</name>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <!-- no required dependencies -->
+ </dependencies>
+</project>
Modified: trunk/libfreemarker-java/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2014-03-12 16:40:31 UTC (rev 17872)
+++ trunk/libfreemarker-java/debian/rules 2014-03-12 19:23:11 UTC (rev 17873)
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-POM_VERSION := 2.3.19
+POM_VERSION := 2.3.20
MAVEN_REPO := http://repo1.maven.org/maven2/
JAVA_HOME := /usr/lib/jvm/default-java
@@ -11,15 +11,15 @@
DEB_ANT_BUILD_TARGET := javacc jar javadoc
DEB_ANT_CHECK_TARGET := test
-DEB_JARS := ant-nodeps dom4j servlet-api-2.5 el-api-2.1 jsp-api-2.1 jaxen jdom1 js junit \
- jython commons-logging slf4j-api xercesImpl xalan2 commons-jxpath ant-junit
+DEB_JARS := ant-nodeps junit ant-junit ivy
install/libfreemarker-java::
mh_installpoms -plibfreemarker-java
- mh_installjar -plibfreemarker-java -l debian/pom.xml lib/freemarker.jar
+ mh_installjar -plibfreemarker-java -l debian/pom.xml build/freemarker.jar
clean::
mh_clean
+ rm -Rf .ivy
get-orig-source:
uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
More information about the pkg-java-commits
mailing list