This is an automated email from the git hooks/post-receive script. tjaalton-guest pushed a commit to branch master in repository xsom.
commit 7d686f854c07a20b4536b4ab70bf6a7b4f4a1cbe Author: Timo Aaltonen <[email protected]> Date: Wed Feb 26 19:25:30 2014 +0200 update pom mangling patch --- debian/patches/01-disable-license-ant-task.patch | 38 ++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/debian/patches/01-disable-license-ant-task.patch b/debian/patches/01-disable-license-ant-task.patch index 6f2e5c5..4d8f890 100644 --- a/debian/patches/01-disable-license-ant-task.patch +++ b/debian/patches/01-disable-license-ant-task.patch @@ -1,32 +1,40 @@ -Description: Disables the license Ant tasks +Description: Drop the license Ant tasks, and don't depend on jvnet-parent Author: Timo Aaltonen <[email protected]> Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -146,12 +146,13 @@ +@@ -49,11 +49,6 @@ + <url>http://xsom.java.net/</url> + <version>20110809</version> + <packaging>jar</packaging> +- <parent> +- <groupId>net.java</groupId> +- <artifactId>jvnet-parent</artifactId> +- <version>1</version> +- </parent> + <licenses> + <license> + <name>CDDL v1.1 / GPL v2 dual license</name> +@@ -146,12 +141,6 @@ <phase>generate-sources</phase> <configuration> <tasks> -+<!-- - <taskdef name="licence" classname="com.sun.tools.LicenceTask"> - <classpath> - <pathelement path="lib/lic.jar" /> - </classpath> - </taskdef> +- <taskdef name="licence" classname="com.sun.tools.LicenceTask"> +- <classpath> +- <pathelement path="lib/lic.jar" /> +- </classpath> +- </taskdef> - -+--> <mkdir dir="build/automata" /> <!-- delete old files to avoid corruption --> -@@ -164,9 +165,11 @@ +@@ -164,9 +153,6 @@ <arg path="build/src/com/sun/xml/xsom/impl/parser/state" /> <arg path="src/xmlschema.rng" /> </java> -+<!-- - <licence licence="licenceheader.txt"> - <fileset dir="build/src/" includes="com/sun/xml/xsom/impl/parser/state/*.java" /> - </licence> -+--> +- <licence licence="licenceheader.txt"> +- <fileset dir="build/src/" includes="com/sun/xml/xsom/impl/parser/state/*.java" /> +- </licence> </tasks> </configuration> <goals> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xsom.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
