The following commit has been merged in the master branch: commit 3e93bd126716a53af08c80743af489f713b9f1db Author: Emmanuel Bourg <ebo...@apache.org> Date: Tue Apr 16 15:45:19 2013 +0200
Removed the dependency on backport-util-concurrent Update Standards-Version: 3.9.4 (no changes) Enabled XSD support by adding a dependency on libmsv-java Updated debian/copyright to comply with the Machine-readable format 1.0 diff --git a/debian/README.Debian b/debian/README.Debian index 1e6697b..4ef3b93 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,8 +5,3 @@ This package contains the Jenkins branch of dom4j; please use the standard distribution of dom4j instead of this package. -- James Page <james.p...@canonical.com> Wed, 08 Jun 2011 09:56:08 +0100 - -dom4j for debian is currently built without support for XSD and xsd because of -license issues. - - -- Marcus Better <mar...@better.se>, Tue, 19 May 2009 09:49:14 +0200 diff --git a/debian/README.source b/debian/README.source index ee6c9b8..59c4395 100644 --- a/debian/README.source +++ b/debian/README.source @@ -8,7 +8,7 @@ for DFSG compliance: * `src/java/org/dom4j/tree/ConcurrentReaderHashMap.java' which comes from Sun Microsystems and cannot be legally distributed. It is - replaced by the classes from the backport-util-concurrent package. + replaced by java.util.concurrent.ConcurrentHashMap. Notes about Jenkins/Hudson fork =============================== diff --git a/debian/changelog b/debian/changelog index 33b75da..df4eb22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +jenkins-dom4j (1.6.1-hudson-3-2) experimental; urgency=low + + * Team upload. + * Removed the dependency on backport-util-concurrent + * Update Standards-Version: 3.9.4 (no changes) + * Enabled XSD support by adding a dependency on libmsv-java + * Updated debian/copyright to comply with the Machine-readable format 1.0 + + -- Emmanuel Bourg <ebo...@apache.org> Tue, 16 Apr 2013 15:22:50 +0200 + jenkins-dom4j (1.6.1-hudson-3-1) unstable; urgency=low * Initial Debian release (Closes: #634632) diff --git a/debian/control b/debian/control index 2d6c394..753553b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: jenkins-dom4j Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> -Uploaders: James Page <james.p...@ubuntu.com> +Uploaders: James Page <james.p...@ubuntu.com>, Emmanuel Bourg <ebo...@apache.org> Build-Depends: ant-optional, cdbs, @@ -13,15 +13,16 @@ Build-Depends: Build-Depends-Indep: antlr, junit, - libbackport-util-concurrent-java, libjaxen-java, libjaxme-java, libjunitperf-java, + libmsv-java, + librelaxng-datatype-java, libxalan2-java (>= 2.7.0), libxerces2-java, libxpp2-java, libxpp3-java -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://github.com/jenkinsci/dom4j Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-dom4j.git Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-dom4j.git @@ -29,9 +30,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-dom4j.git Package: libjenkins-dom4j-java Architecture: all Depends: - libbackport-util-concurrent-java, libjaxen-java, libjaxme-java, + libmsv-java, libxpp2-java, libxpp3-java, ${misc:Depends} diff --git a/debian/copyright b/debian/copyright index a7de2b9..8a9d430 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,15 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Hudson/Jenkins branch of dom4j -Maintainer: jenkinsci-...@googlegroups.com +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Hudson/Jenkins branch of dom4j +Upstream-Contact: jenkinsci-...@googlegroups.com Source: http://github.com/jenkinsci/dom4j/ +Files: * Copyright: 2001-2005, MetaStuff, Ltd. License: DOM4J Files: debian/* Copyright: 2006-2009, Marcus Better, - 2011, Canonical Ltd (http://www.canonical.com) + 2011, Canonical Ltd (http://www.canonical.com) License: DOM4J License: DOM4J diff --git a/debian/patches/backport-util.patch b/debian/patches/backport-util.patch index a679aed..58bb390 100644 --- a/debian/patches/backport-util.patch +++ b/debian/patches/backport-util.patch @@ -3,78 +3,70 @@ Description: Use backport-utils-concurrent instead of bundled Author: Marcus Better <mar...@better.se> Forwarded: not-needed -Index: hudson-dom4j/src/java/org/dom4j/tree/NamespaceCache.java -=================================================================== ---- hudson-dom4j.orig/src/java/org/dom4j/tree/NamespaceCache.java 2011-05-31 10:00:42.550297000 +0100 -+++ hudson-dom4j/src/java/org/dom4j/tree/NamespaceCache.java 2011-06-08 10:20:38.983014964 +0100 -@@ -26,42 +26,46 @@ +--- a/src/java/org/dom4j/tree/NamespaceCache.java ++++ b/src/java/org/dom4j/tree/NamespaceCache.java +@@ -10,6 +10,7 @@ + import java.lang.ref.WeakReference; + import java.lang.reflect.Constructor; + import java.util.Map; ++import java.util.concurrent.ConcurrentHashMap; + + import org.dom4j.Namespace; + +@@ -26,45 +27,17 @@ * @version $Revision: 1.15 $ */ public class NamespaceCache { - private static final String CONCURRENTREADERHASHMAP_CLASS - = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap"; -+ private static final String BACKPORT_CONCURRENTHASHMAP_CLASS -+ = "edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap"; -+ private static final String OSWEGO_CONCURRENTHASHMAP_CLASS -+ = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap"; - +- /** * Cache of {@link Map}instances indexed by URI which contain caches of * {@link Namespace}for each prefix */ - protected static Map cache; -+ protected static Map cache = newConcurrentHashMap(); ++ protected static Map cache = new ConcurrentHashMap(); /** * Cache of {@link Namespace}instances indexed by URI for default * namespaces with no prefixes */ - protected static Map noPrefixCache; -+ protected static Map noPrefixCache = newConcurrentHashMap(); - +- - static { -+ protected static Map newConcurrentHashMap() -+ { - /* Try the java.util.concurrent.ConcurrentHashMap first. */ - try { - Class clazz = Class - .forName("java.util.concurrent.ConcurrentHashMap"); - Constructor construct = clazz.getConstructor(new Class[] { - Integer.TYPE, Float.TYPE, Integer.TYPE }); +- /* Try the java.util.concurrent.ConcurrentHashMap first. */ +- try { +- Class clazz = Class +- .forName("java.util.concurrent.ConcurrentHashMap"); +- Constructor construct = clazz.getConstructor(new Class[] { +- Integer.TYPE, Float.TYPE, Integer.TYPE }); - cache = (Map) construct.newInstance(new Object[] {new Integer(11), -+ return (Map) construct.newInstance(new Object[] {new Integer(11), - new Float(0.75f), new Integer(1) }); +- new Float(0.75f), new Integer(1) }); - noPrefixCache = (Map) construct.newInstance(new Object[] { - new Integer(11), new Float(0.75f), new Integer(1) }); - } catch (Throwable t1) { +- } catch (Throwable t1) { - /* Try to use the util.concurrent library (if in classpath) */ - try { +- try { - Class clazz = Class.forName(CONCURRENTREADERHASHMAP_CLASS); - cache = (Map) clazz.newInstance(); - noPrefixCache = (Map) clazz.newInstance(); -+ /* Try to use the backport-util-concurrent library */ -+ Class clazz = Class.forName(BACKPORT_CONCURRENTHASHMAP_CLASS); -+ return (Map) clazz.newInstance(); - } catch (Throwable t2) { +- } catch (Throwable t2) { - /* If previous implementations fail, use internal one */ - cache = new ConcurrentReaderHashMap(); - noPrefixCache = new ConcurrentReaderHashMap(); -+ try { -+ /* Try to use the oswego concurrent library */ -+ Class clazz = Class.forName(OSWEGO_CONCURRENTHASHMAP_CLASS); -+ return (Map) clazz.newInstance(); -+ } catch (Throwable t3) { -+ return null; -+ } - } - } - } -@@ -154,7 +158,7 @@ +- } +- } +- } ++ protected static Map noPrefixCache = new ConcurrentHashMap(); + + /** + * DOCUMENT ME! +@@ -154,7 +127,7 @@ answer = (Map) cache.get(uri); if (answer == null) { - answer = new ConcurrentReaderHashMap(); -+ answer = newConcurrentHashMap(); ++ answer = new ConcurrentHashMap(); cache.put(uri, answer); } } diff --git a/debian/patches/build.patch b/debian/patches/build.patch index f9c54f4..49bba3f 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -2,11 +2,18 @@ Description: Debianisation of build.xml to use system libraries Author: Marcus Better <mar...@better.se> Forwarded: not-needed -Index: hudson-dom4j/build.xml -=================================================================== ---- hudson-dom4j.orig/build.xml 2011-05-31 10:00:42.550297000 +0100 -+++ hudson-dom4j/build.xml 2011-06-08 10:21:21.763014994 +0100 -@@ -16,13 +16,13 @@ +--- a/build.xml ++++ b/build.xml +@@ -1,7 +1,7 @@ + <project default="usage" basedir="."> + + <path id="compile.classpath"> +- <fileset dir="./lib/endorsed"> ++ <fileset dir="./lib/endorsed" erroronmissingdir="false"> + <include name="*.jar" /> + </fileset> + <fileset dir="./lib"> +@@ -16,13 +16,14 @@ </path> <path id="test.classpath"> @@ -18,37 +25,26 @@ Index: hudson-dom4j/build.xml - <include name="xalan*.jar" /> - <include name="xerces*.jar" /> + <fileset dir="/usr/share/java"> -+ <include name="backport-util-concurrent.jar" /> + <include name="jaxen.jar" /> + <include name="junitperf.jar" /> ++ <include name="relaxngDatatype.jar" /> + <include name="xalan2.jar" /> + <include name="xercesImpl.jar" /> + <include name="xpp3.jar" /> ++ <include name="xsdlib.jar" /> </fileset> </path> -@@ -146,8 +146,9 @@ +@@ -146,8 +147,6 @@ source="1.3" deprecation="${deprecation}" classpathref="compile.classpath"> - <exclude name="**/jaxb/*" /> - <exclude name="**/dom/*" /> -+ <exclude name="org/dom4j/datatype/**"/> -+ <exclude name="org/dom4j/io/STAXEventReader.java"/> -+ <exclude name="org/dom4j/io/STAXEventWriter.java"/> - </javac> - </target> - -@@ -161,6 +162,8 @@ - optimize="${optimize}" - deprecation="${deprecation}" - classpathref="test.classpath"> -+ <exclude name="org/dom4j/datatype/**"/> -+ <exclude name="org/dom4j/io/StaxTest.java"/> </javac> </target> -@@ -223,8 +226,7 @@ +@@ -223,8 +222,7 @@ doctitle="${Name}" bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />" stylesheetfile="${doc.dir}/style/javadoc.css"> @@ -58,7 +54,7 @@ Index: hudson-dom4j/build.xml </javadoc> <mkdir dir="${build.apidocs}"/> -@@ -240,8 +242,7 @@ +@@ -240,8 +238,7 @@ doctitle="${Name}" bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />" stylesheetfile="${doc.dir}/style/javadoc.css"> @@ -68,7 +64,7 @@ Index: hudson-dom4j/build.xml <link href="${build.javadocs}"/> </javadoc> </target> -@@ -274,7 +275,7 @@ +@@ -274,7 +271,7 @@ <!-- =================================================================== --> <target name="test" depends="compile-test"> <mkdir dir="${build.dir}/test-results/xml"/> @@ -77,29 +73,8 @@ Index: hudson-dom4j/build.xml <formatter type="xml"/> <classpath> -@@ -282,10 +283,17 @@ - <path refid="test.classpath" /> - </classpath> - -+ <sysproperty key="org.xml.sax.driver" -+ value="org.apache.xerces.parsers.SAXParser"/> -+ - <batchtest fork="yes" todir="${build.dir}/test-results/xml"> - <fileset dir="${test.dir}"> - <include name="**/*Test.java" /> -- <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" /> -+ <exclude name="**/AllTests.java" /> -+ <exclude name="**/Abstract*.java" /> -+ <exclude name="**/TestCase.java" /> -+ <exclude name="**/StaxTest.java" /> -+ <exclude name="**/datatype/*Test.java" /> - </fileset> - </batchtest> - </junit> -Index: hudson-dom4j/xml/bean/gui.xml -=================================================================== ---- hudson-dom4j.orig/xml/bean/gui.xml 2011-05-31 10:00:42.550297000 +0100 -+++ hudson-dom4j/xml/bean/gui.xml 2011-06-08 10:20:38.983014964 +0100 +--- a/xml/bean/gui.xml ++++ b/xml/bean/gui.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <widgets> diff --git a/debian/rules b/debian/rules index c8dbf07..ed7ea84 100755 --- a/debian/rules +++ b/debian/rules @@ -4,17 +4,20 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/default-java PACKAGE := jenkins-dom4j DEB_ANT_BUILD_TARGET := package release-javadoc DEB_ANT_CHECK_TARGET := test DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \ - xalan2 xercesImpl ant-junit junit junitperf + xalan2 xercesImpl ant-junit junit junitperf xsdlib binary-post-install/lib$(PACKAGE)-java:: mh_installpoms -plib$(PACKAGE)-java mh_installjar -plib$(PACKAGE)-java pom.xml -l build/dom4j.jar --usj-name=$(PACKAGE) +clean:: + mh_clean + get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- jenkins-dom4j packaging _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits