This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository dom4j.
commit 7d7c2d3bad0b2cecc7e8426b0f85e40abbfb3e6b
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Wed Oct 25 09:13:06 2017 +0200
Build with Gradle instead of Ant
---
debian/ant.properties | 1 -
debian/changelog | 4 +-
debian/control | 3 +-
debian/libdom4j-java-doc.install | 1 +
debian/libdom4j-java.poms | 1 +
debian/maven.rules | 2 +
debian/patches/01_build-tweaks.patch | 58 --
debian/patches/02_disable-matrix-concat-test.patch | 18 -
debian/patches/03_remove-non-free-map.patch | 69 --
debian/patches/04_headless-test.patch | 14 +-
debian/patches/05_java7-compat.patch | 59 --
debian/patches/06_dom-level3-support.patch | 958 ---------------------
debian/patches/series | 5 -
debian/pom.xml | 270 ++----
debian/rules | 21 +-
15 files changed, 74 insertions(+), 1410 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index a1d8f2a..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-java.awt.headless=true
diff --git a/debian/changelog b/debian/changelog
index 63480de..5b6272f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-dom4j (1.6.1+dfsg.3-3) UNRELEASED; urgency=medium
+dom4j (2.1.0-1) UNRELEASED; urgency=medium
+ * New upstream release
+ - Build with Gradle instead of Ant
* Moved the package to Git
* Switch to debhelper level 10
* Standards-Version updated to 4.1.1
diff --git a/debian/control b/debian/control
index 4234988..752ecb4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,10 @@ Uploaders:
Marcus Better <mar...@better.se>,
Emmanuel Bourg <ebo...@apache.org>
Build-Depends:
- ant-optional,
antlr,
- cdbs,
debhelper (>= 10),
default-jdk,
+ gradle-debian-helper,
junit,
libjaxen-java,
libjunitperf-java,
diff --git a/debian/libdom4j-java-doc.install b/debian/libdom4j-java-doc.install
new file mode 100644
index 0000000..8da08c6
--- /dev/null
+++ b/debian/libdom4j-java-doc.install
@@ -0,0 +1 @@
+build/docs/javadoc/* /usr/share/doc/libdom4j-java-doc/apidocs/
diff --git a/debian/libdom4j-java.poms b/debian/libdom4j-java.poms
new file mode 100644
index 0000000..62018bd
--- /dev/null
+++ b/debian/libdom4j-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=build/libs/dom4j.jar
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..eac9184
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+s/net.java.dev.msv/com.sun.msv.datatype.xsd/ xsdlib * s/.*/debian/
+s/javax.xml.stream/stax/ stax-api * s/.*/debian/
diff --git a/debian/patches/01_build-tweaks.patch
b/debian/patches/01_build-tweaks.patch
deleted file mode 100644
index a8352a4..0000000
--- a/debian/patches/01_build-tweaks.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description:
- Link the Javadoc with the Java API installed with default-jre
- Fix the classpath for the tests
- Ignore test failures
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -24,6 +24,15 @@
- <include name="xalan*.jar" />
- <include name="xerces*.jar" />
- </fileset>
-+ <fileset dir="/usr/share/java">
-+ <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>
-
- <path id="samples.classpath">
-@@ -155,6 +164,7 @@
- <target name="compile-test" depends="compile">
- <javac srcdir="${test.dir}"
- destdir="${build.dest}"
-+ encoding="ISO-8859-1"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="${deprecation}"
-@@ -219,7 +229,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">
-- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-+ <link href="/usr/share/doc/default-jre/api"/>
- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
- </javadoc>
-
-@@ -236,7 +246,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">
-- <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-+ <link href="/usr/share/doc/default-jre/api"/>
- <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
- <link href="${build.javadocs}"/>
- </javadoc>
-@@ -270,7 +280,7 @@
- <!-- =================================================================== -->
- <target name="test" depends="compile-test">
- <mkdir dir="${build.dir}/test-results/xml"/>
-- <junit printsummary="yes" haltonfailure="yes">
-+ <junit printsummary="yes" haltonfailure="no">
- <formatter type="xml"/>
-
- <classpath>
diff --git a/debian/patches/02_disable-matrix-concat-test.patch
b/debian/patches/02_disable-matrix-concat-test.patch
deleted file mode 100644
index 3a45aba..0000000
--- a/debian/patches/02_disable-matrix-concat-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Disable the matrix concat test
-Bug-Debian: http://bugs.debian.org/439614
-Forwarded: not-needed
---- a/src/test/org/dom4j/xpath/MatrixConcatTest.java
-+++ b/src/test/org/dom4j/xpath/MatrixConcatTest.java
-@@ -32,10 +32,11 @@
- String[] exp1 = {"EQUITY_CF1", "EQUITY_CF2", "EQUITY_CF3"};
-
- String[] exp2 = {"EQUITY_BAR_CF1", "EQUITY_BAR_CF2",
"EQUITY_BAR_CF3"};
--
-+ /* Disabled. Doesn't wor k with any JVM I found.
- testMatrixConcat("'EQUITY_',/product/cashflows/CashFlow/XREF", exp1);
- testMatrixConcat("'EQUITY_','BAR_',/product/cashflows/CashFlow/XREF",
- exp2);
-+ */
- }
-
- // Implementation methods
diff --git a/debian/patches/03_remove-non-free-map.patch
b/debian/patches/03_remove-non-free-map.patch
deleted file mode 100644
index 868b318..0000000
--- a/debian/patches/03_remove-non-free-map.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Remove the usages of the non free ConcurrentReaderHashMap class.
-Forwarded: not-needed
---- 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";
--
- /**
- * 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 = new ConcurrentHashMap();
-
- /**
- * Cache of {@link Namespace}instances indexed by URI for default
- * namespaces with no prefixes
- */
-- protected static Map noPrefixCache;
--
-- static {
-- /* 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),
-- 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) {
-- /* Try to use the util.concurrent library (if in classpath) */
-- try {
-- Class clazz = Class.forName(CONCURRENTREADERHASHMAP_CLASS);
-- cache = (Map) clazz.newInstance();
-- noPrefixCache = (Map) clazz.newInstance();
-- } catch (Throwable t2) {
-- /* If previous implementations fail, use internal one */
-- cache = new ConcurrentReaderHashMap();
-- noPrefixCache = new ConcurrentReaderHashMap();
-- }
-- }
-- }
-+ protected static Map noPrefixCache = new ConcurrentHashMap();
-
- /**
- * DOCUMENT ME!
-@@ -154,7 +127,7 @@
- answer = (Map) cache.get(uri);
-
- if (answer == null) {
-- answer = new ConcurrentReaderHashMap();
-+ answer = new ConcurrentHashMap();
- cache.put(uri, answer);
- }
- }
diff --git a/debian/patches/04_headless-test.patch
b/debian/patches/04_headless-test.patch
index c60a17c..d9b9ea7 100644
--- a/debian/patches/04_headless-test.patch
+++ b/debian/patches/04_headless-test.patch
@@ -1,10 +1,10 @@
--- a/xml/bean/gui.xml
+++ b/xml/bean/gui.xml
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <widgets>
-- <window class="javax.swing.JFrame" title="Frame #1"/>
-- <window class="javax.swing.JFrame" title="Frame #2"/>
-+ <window class="java.awt.Canvas" title="Frame #1"/>
-+ <window class="java.awt.Canvas" title="Frame #2"/>
- </widgets>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <widgets>
+- <window class="javax.swing.JFrame" title="Frame #1"/>
+- <window class="javax.swing.JFrame" title="Frame #2"/>
++ <window class="java.awt.Canvas" title="Frame #1"/>
++ <window class="java.awt.Canvas" title="Frame #2"/>
+ </widgets>
diff --git a/debian/patches/05_java7-compat.patch
b/debian/patches/05_java7-compat.patch
deleted file mode 100644
index 41a86e1..0000000
--- a/debian/patches/05_java7-compat.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Fixup compareTo function in Rule class to be compliant
- with the Java 7 (and Java 6) API. Comparisons where not symmetric
- with the upstream handling in this function:
- .
- r1 > r2 but ! r2 < r1
- .
- Also added extra tests to ensure that comparison works both ways.
-Author: James Page <james.p...@ubuntu.com>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/673765
---- a/src/java/org/dom4j/rule/Rule.java
-+++ b/src/java/org/dom4j/rule/Rule.java
-@@ -99,16 +99,16 @@
- * @return DOCUMENT ME!
- */
- public int compareTo(Rule that) {
-- int answer = this.importPrecedence - that.importPrecedence;
--
-- if (answer == 0) {
-- answer = (int) Math.round(this.priority - that.priority);
--
-- if (answer == 0) {
-- answer = this.appearenceCount - that.appearenceCount;
-- }
-+ int answer = 0;
-+ if (this.importPrecedence != that.importPrecedence) {
-+ answer = this.importPrecedence < that.importPrecedence ? -1 : 1;
-+ }
-+ else if (Double.compare(this.priority, that.priority) != 0) {
-+ answer = Double.compare(this.priority, that.priority);
-+ }
-+ else if (this.appearenceCount != that.appearenceCount) {
-+ answer = this.appearenceCount < that.appearenceCount ? -1 : 1;
- }
--
- return answer;
- }
-
---- a/src/test/org/dom4j/rule/RuleTest.java
-+++ b/src/test/org/dom4j/rule/RuleTest.java
-@@ -48,6 +48,18 @@
-
- assertTrue("r1 > r2", value > 0);
-
-+ value = r2.compareTo(r1);
-+
-+ System.out.println("Comparison: " + value);
-+
-+ assertTrue("r2 < r1", value < 0);
-+
-+ value = r1.compareTo(r1);
-+
-+ System.out.println("Comparison: " + value);
-+
-+ assertTrue("r1 == r1", value == 0);
-+
- ArrayList list = new ArrayList();
- list.add(r1);
- list.add(r2);
diff --git a/debian/patches/06_dom-level3-support.patch
b/debian/patches/06_dom-level3-support.patch
deleted file mode 100644
index 053704e..0000000
--- a/debian/patches/06_dom-level3-support.patch
+++ /dev/null
@@ -1,958 +0,0 @@
-Description: Implement DOM Level 3 methods to fix the compilation
- with Java 5 and later
-Author: Torsten Werner
-Forwarded: not-needed
---- a/src/java/org/dom4j/dom/DOMDocumentType.java
-+++ b/src/java/org/dom4j/dom/DOMDocumentType.java
-@@ -12,7 +12,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -177,6 +179,66 @@
- public String getInternalSubset() {
- return getElementName();
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-+++ b/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-@@ -15,7 +15,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -177,6 +179,66 @@
- }
- }
-
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
- // Implementation methods
- //
-------------------------------------------------------------------------
- }
---- a/src/java/org/dom4j/dom/DOMAttribute.java
-+++ b/src/java/org/dom4j/dom/DOMAttribute.java
-@@ -14,7 +14,10 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -179,6 +182,76 @@
- public org.w3c.dom.Element getOwnerElement() {
- return DOMNodeHelper.asDOMElement(getParent());
- }
-+
-+ public TypeInfo getSchemaTypeInfo() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isId() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler
handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMDocumentFactory.java
-+++ b/src/java/org/dom4j/dom/DOMDocumentFactory.java
-@@ -174,6 +174,11 @@
- docType.getPublicId(), docType.getSystemId());
- }
- }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
-
-@@ -213,4 +218,4 @@
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-- */
-\ No newline at end of file
-+ */
---- a/src/java/org/dom4j/dom/DOMComment.java
-+++ b/src/java/org/dom4j/dom/DOMComment.java
-@@ -13,7 +13,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -187,6 +189,66 @@
- throws DOMException {
- DOMNodeHelper.replaceData(this, offset, count, arg);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler
handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMNamespace.java
-+++ b/src/java/org/dom4j/dom/DOMNamespace.java
-@@ -13,7 +13,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -140,6 +142,66 @@
- public boolean hasAttributes() {
- return DOMNodeHelper.hasAttributes(this);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMDocument.java
-+++ b/src/java/org/dom4j/dom/DOMDocument.java
-@@ -15,12 +15,15 @@
-
- import org.w3c.dom.Attr;
- import org.w3c.dom.CDATASection;
-+import org.w3c.dom.DOMConfiguration;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.EntityReference;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- import org.w3c.dom.ProcessingInstruction;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -301,6 +304,136 @@
- return super.getDocumentFactory();
- }
- }
-+
-+ public String getInputEncoding() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getXmlEncoding() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean getXmlStandalone() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public void setXmlStandalone(boolean arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getXmlVersion() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setXmlVersion(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean getStrictErrorChecking() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public void setStrictErrorChecking(boolean arg0) {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getDocumentURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setDocumentURI(String arg0) {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public Node adoptNode(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public DOMConfiguration getDomConfig() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void normalizeDocument() {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public Node renameNode(Node arg0, String arg1, String arg2) throws
DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMEntityReference.java
-+++ b/src/java/org/dom4j/dom/DOMEntityReference.java
-@@ -13,7 +13,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -166,6 +168,66 @@
- public boolean hasAttributes() {
- return DOMNodeHelper.hasAttributes(this);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMText.java
-+++ b/src/java/org/dom4j/dom/DOMText.java
-@@ -14,7 +14,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -224,6 +226,81 @@
- protected Text createText(String text) {
- return new DOMText(text);
- }
-+
-+ public boolean isElementContentWhitespace() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getWholeText() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public org.w3c.dom.Text replaceWholeText(String arg0) throws DOMException
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMCDATA.java
-+++ b/src/java/org/dom4j/dom/DOMCDATA.java
-@@ -14,7 +14,10 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.Text;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -225,6 +228,81 @@
- protected CDATA createCDATA(String text) {
- return new DOMCDATA(text);
- }
-+
-+ public boolean isElementContentWhitespace() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getWholeText() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Text replaceWholeText(String content) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler
handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
---- a/src/java/org/dom4j/dom/DOMElement.java
-+++ b/src/java/org/dom4j/dom/DOMElement.java
-@@ -16,11 +16,14 @@
- import org.dom4j.QName;
- import org.dom4j.tree.DefaultElement;
-
-+import org.w3c.dom.Attr;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -389,6 +392,86 @@
-
- return getDocumentFactory().createQName(localName, prefix, namespace);
- }
-+
-+ public TypeInfo getSchemaTypeInfo() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setIdAttribute(String arg0, boolean arg1) throws DOMException
{
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public void setIdAttributeNS(String arg0, String arg1, boolean arg2)
throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public void setIdAttributeNode(Attr arg0, boolean arg1) throws
DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
{
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
diff --git a/debian/patches/series b/debian/patches/series
index 77110c6..e65b47b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-01_build-tweaks.patch
-02_disable-matrix-concat-test.patch
-03_remove-non-free-map.patch
04_headless-test.patch
-05_java7-compat.patch
-06_dom-level3-support.patch
diff --git a/debian/pom.xml b/debian/pom.xml
index d714101..5f5646b 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -1,215 +1,55 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <name>dom4j</name>
- <version>1.6.1</version>
- <description>dom4j: the flexible XML framework for Java</description>
- <url>http://dom4j.org</url>
- <issueManagement>
- <url>http://sourceforge.net/tracker/?group_id=16035</url>
- </issueManagement>
- <ciManagement>
- <notifiers>
- <notifier>
- <address>dom4j-...@lists.sourceforge.net</address>
- </notifier>
- </notifiers>
- </ciManagement>
- <inceptionYear>2001</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>dom4j user list</name>
-
<subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-user</subscribe>
-
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-user</unsubscribe>
-
<archive>http://www.mail-archive.com/dom4j-user%40lists.sourceforge.net/</archive>
- </mailingList>
- <mailingList>
- <name>dom4j developer list</name>
-
<subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-dev</subscribe>
-
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-dev</unsubscribe>
-
<archive>http://www.mail-archive.com/dom4j-dev%40lists.sourceforge.net/</archive>
- </mailingList>
- <mailingList>
- <name>dom4j commits list</name>
-
<subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-commits</subscribe>
-
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-commits</unsubscribe>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <id>carnold</id>
- <name>Curt Arnold</name>
- <email>carn...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>ddlucas</id>
- <name>David Lucas</name>
- <email>ddlu...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>drwhite</id>
- <name>David White</name>
- <email>drwh...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>jjenkov</id>
- <name>Jakob Jenkov</name>
- <email>jjen...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>jstrachan</id>
- <name>James Strachan</name>
- <email>jstrac...@apache.org</email>
- <organization>SpiritSoft, Inc.</organization>
- </developer>
- <developer>
- <id>laramiec</id>
- <name>Laramie Crocker</name>
- <email>laram...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>maartenc</id>
- <name>Maarten Coene</name>
- <email>maart...@users.sourceforge.net</email>
- <organization>Cronos</organization>
- </developer>
- <developer>
- <id>mskells</id>
- <name>Michael Skells</name>
- <email>mske...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>nicksanderson</id>
- <name>Nick Sanderson</name>
- <email>nicksander...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>slehmann</id>
- <name>Steen Lehmann</name>
- <email>slehm...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>tradem</id>
- <name>Tobias Rademacher</name>
- <email>tra...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>werken</id>
- <name>Bob McWhirter</name>
- <email>wer...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>wolfftw</id>
- <name>Todd Wolff</name>
- <email>wolf...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>yeekee</id>
- <name>OuYang Chen</name>
- <email>yee...@users.sourceforge.net</email>
- </developer>
- <developer>
- <id>yruan2</id>
- <name>Yuxin Ruan</name>
- <email>yru...@users.sourceforge.net</email>
- </developer>
- </developers>
- <scm>
-
<connection>scm:cvs:pserver:anonym...@cvs.sourceforge.net:/cvsroot/dom4j:dom4j</connection>
-
<developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/dom4j:dom4j</developerConnection>
- <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dom4j/dom4j/</url>
- </scm>
- <organization>
- <name>MetaStuff Ltd.</name>
- <url>http://sourceforge.net/projects/dom4j</url>
- </organization>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1-beta-6</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>msv</groupId>
- <artifactId>xsdlib</artifactId>
- <version>20030807</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>msv</groupId>
- <artifactId>relaxngDatatype</artifactId>
- <version>20030807</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>pull-parser</groupId>
- <artifactId>pull-parser</artifactId>
- <version>2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- </dependency>
- <dependency>
- <groupId>junitperf</groupId>
- <artifactId>junitperf</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-ri</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <distributionManagement>
- <site>
- <id>default</id>
- <name>Default Site</name>
- <url>scp://dom4j.org//home/groups/d/do/dom4j/htdocs</url>
- </site>
- </distributionManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.0</version>
+ <name>dom4j</name>
+ <description>flexible XML framework for Java</description>
+ <url>http://dom4j.github.io/</url>
+ <licenses>
+ <license>
+ <name>BSD 3-clause New License</name>
+ <url>https://github.com/dom4j/dom4j/blob/master/LICENSE</url>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <name>Filip Jirsák</name>
+ <email>fi...@jirsak.org</email>
+ <url>https://github.com/FilipJirsak</url>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:g...@github.com:dom4j/dom4j.git</connection>
+
<developerConnection>scm:git:g...@github.com:dom4j/dom4j.git</developerConnection>
+ <url>g...@github.com:dom4j/dom4j.git</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.21</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.11.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/rules b/debian/rules
index f78a92f..c7f5447 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+ dh $@ --with maven-repo-helper
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen \
- xalan2 xercesImpl ant-junit junit junitperf xsdlib
-
-DEB_ANT_BUILD_TARGET := package release-javadoc
-DEB_ANT_CHECK_TARGET := test
-DEB_DH_INSTALLCHANGELOGS_ARGS := -k
-DEB_INSTALL_CHANGELOGS_ALL := docs/changes-report.html
-
-install/libdom4j-java::
- mh_installpom -plibdom4j-java debian/pom.xml
- mh_installjar -plibdom4j-java debian/pom.xml -l build/dom4j.jar
-
-clean::
- mh_clean
+override_dh_auto_build:
+ dh_auto_build -- jar javadoc
get-orig-source:
uscan --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/dom4j.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
