[jenkins-dom4j] 05/05: New upstream release (1.6.1-jenkins-4) Removed backport-util.patch and fix-test-compilation.patch (fixed upstream)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins-dom4j.

commit e0c13fc0efa77ebfdb83f5633679577f8974b37f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 4 20:08:24 2014 +0200

    New upstream release (1.6.1-jenkins-4)
    Removed backport-util.patch and fix-test-compilation.patch (fixed upstream)
---
 debian/patches/backport-util.patch        | 72 -------------------------------
 debian/patches/fix-test-compilation.patch | 56 ------------------------
 debian/patches/series                     |  2 -
 3 files changed, 130 deletions(-)

diff --git a/debian/patches/backport-util.patch b/debian/patches/backport-util.patch
deleted file mode 100644
index 58bb390..0000000
--- a/debian/patches/backport-util.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Use backport-utils-concurrent instead of bundled
- Java for dfsg compliance.
-Author: Marcus Better <marcus at better.se>
-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/fix-test-compilation.patch b/debian/patches/fix-test-compilation.patch
deleted file mode 100644
index 5f1917d..0000000
--- a/debian/patches/fix-test-compilation.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Fix the issues preventing the compilation of the tests
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: https://github.com/jenkinsci/dom4j/pull/3
---- a/build.xml
-+++ b/build.xml
-@@ -160,8 +160,11 @@
-            destdir="${build.dest}"
-            debug="${debug}"
-            optimize="${optimize}"
-+           encoding="ISO-8859-1"
-            deprecation="${deprecation}"
-            classpathref="test.classpath">
-+      <exclude name="**/dom/*" />
-+      <exclude name="**/DOMWriterTest*" /> 
-     </javac>
-   </target>
- 
-@@ -284,6 +287,8 @@
-       <batchtest fork="yes" todir="${build.dir}/test-results/xml">
-         <fileset dir="${test.dir}">
-           <include name="**/*Test.java" />
-+          <exclude name="**/dom/*" />
-+          <exclude name="**/DOMWriterTest.java" /> 
-           <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
-         </fileset>
-       </batchtest>
---- a/src/test/org/dom4j/CloneTest.java
-+++ b/src/test/org/dom4j/CloneTest.java
-@@ -11,8 +11,6 @@
- 
- import java.util.Comparator;
- 
--import org.dom4j.dom.DOMDocument;
--import org.dom4j.dom.DOMDocumentFactory;
- import org.dom4j.util.NodeComparator;
- 
- /**
-@@ -30,18 +28,6 @@
- 
-     // Test case(s)
-     // -------------------------------------------------------------------------
--    public void testBug1148333() {
--        DOMDocumentFactory factory = (DOMDocumentFactory) DOMDocumentFactory
--                .getInstance();
--        DOMDocument doc = (DOMDocument) factory.createDocument();
--        Element el = doc.addElement("root");
--        el.addNamespace("pref2", "uri2");
--
--        DOMDocument clone = (DOMDocument) doc.cloneNode(true);
--        
--        assertNotSame(doc, clone);
--        assertNodesEqual(doc, clone);
--    }
- 
-     public void testElementWithNamespaceClone() {
-         Element element = DocumentFactory.getInstance()
diff --git a/debian/patches/series b/debian/patches/series
index 60c1854..8766e04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 build.patch
-backport-util.patch
 compat.patch
-fix-test-compilation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-dom4j.git