This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-collections3-java.
commit e1a812ce5a7f7522c86367695e357a4e69bbe965 Author: Emmanuel Bourg <[email protected]> Date: Mon Nov 16 23:45:34 2015 +0100 Refreshed the patches --- debian/changelog | 4 +- debian/patches/OSGI_Manifest.diff | 29 ++--- debian/patches/java8-compatibility.patch | 208 +++++++++++++++---------------- 3 files changed, 115 insertions(+), 126 deletions(-) diff --git a/debian/changelog b/debian/changelog index afaa6e6..fa1f522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -libcommons-collections3-java (3.2.1-9) UNRELEASED; urgency=medium +libcommons-collections3-java (3.2.2-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Mon, 16 Nov 2015 10:58:45 +0100 diff --git a/debian/patches/OSGI_Manifest.diff b/debian/patches/OSGI_Manifest.diff index 5a5e730..c349b03 100644 --- a/debian/patches/OSGI_Manifest.diff +++ b/debian/patches/OSGI_Manifest.diff @@ -4,29 +4,16 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml @@ -148,6 +148,7 @@ - <filter token="title" value="${component.title}"/> - <filter token="package" value="${component.package}"/> - <filter token="version" value="${component.version}"/> + <filter token="title" value="${component.title}"/> + <filter token="package" value="${component.package}"/> + <filter token="version" value="${component.version}"/> + <filter token="lastmodified" value="${lastmodified}"/> - </filterset> - <fileset dir="${source.conf}" includes="*.MF"/> - </copy> ---- a/src/conf/MANIFEST.MF + </filterset> + <fileset dir="${source.conf}" includes="*.MF"/> + </copy> +--- /dev/null +++ b/src/conf/MANIFEST.MF -@@ -1,12 +1,47 @@ --Manifest-Version: 1.0 --Package: org.apache.commons.collections --Extension-Name: commons-collections --Specification-Version: @version@ --Specification-Vendor: Apache Software Foundation --Specification-Title: Commons Collections --Implementation-Version: @version@ --Implementation-Vendor: Apache Software Foundation --Implementation-Title: Commons Collections --Implementation-Vendor-Id: org.apache --X-Compile-Source-JDK: 1.2 --X-Compile-Target-JDK: 1.2 -\ No newline at end of file +@@ -0,0 +1,47 @@ +Manifest-Version: 1.0 +Package: org.apache.commons.collections +Extension-Name: commons-collections diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch index 43494cc..baf1e53 100644 --- a/debian/patches/java8-compatibility.patch +++ b/debian/patches/java8-compatibility.patch @@ -4,42 +4,114 @@ Description: Renames the MultiMap.remove(Object, Object) method to removeMapping are those used by Commons Collections 4 (packaged as libcommons-collections4-java). Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed ---- a/src/java/org/apache/commons/collections/map/MultiValueMap.java -+++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java -@@ -153,7 +153,7 @@ - * @param value the value to remove - * @return the value removed (which was passed in), null if nothing removed - */ -- public Object remove(Object key, Object value) { -+ public Object removeMapping(Object key, Object value) { - Collection valuesForKey = getCollection(key); - if (valuesForKey == null) { - return null; --- a/src/java/org/apache/commons/collections/MultiHashMap.java +++ b/src/java/org/apache/commons/collections/MultiHashMap.java @@ -331,7 +331,7 @@ - * @param item the value to remove - * @return the value removed (which was passed in), null if nothing removed - */ -- public Object remove(Object key, Object item) { -+ public Object removeMapping(Object key, Object item) { - Collection valuesForKey = getCollection(key); - if (valuesForKey == null) { - return null; + * @param item the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object item) { ++ public Object removeMapping(Object key, Object item) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; --- a/src/java/org/apache/commons/collections/MultiMap.java +++ b/src/java/org/apache/commons/collections/MultiMap.java @@ -66,7 +66,7 @@ - * @throws ClassCastException if the key or value is of an invalid type - * @throws NullPointerException if the key or value is null and null is invalid - */ -- public Object remove(Object key, Object item); -+ public Object removeMapping(Object key, Object item); - - //----------------------------------------------------------------------- - /** + * @throws ClassCastException if the key or value is of an invalid type + * @throws NullPointerException if the key or value is null and null is invalid + */ +- public Object remove(Object key, Object item); ++ public Object removeMapping(Object key, Object item); + + //----------------------------------------------------------------------- + /** +--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java +@@ -197,7 +197,7 @@ + * @param key2 the second key + * @return the value mapped to the removed key, null if key not in map + */ +- public Object remove(Object key1, Object key2) { ++ public Object removeMultiKey(Object key1, Object key2) { + int hashCode = hash(key1, key2); + int index = map.hashIndex(hashCode, map.data.length); + AbstractHashedMap.HashEntry entry = map.data[index]; +--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java +@@ -153,7 +153,7 @@ + * @param value the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object value) { ++ public Object removeMapping(Object key, Object value) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java ++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java +@@ -217,7 +217,7 @@ + MultiHashMap one = new MultiHashMap(); + Integer value = new Integer(1); + one.put("One", value); +- one.remove("One", value); ++ one.removeMapping("One", value); + + MultiHashMap two = new MultiHashMap(); + assertEquals(two, one); +@@ -269,7 +269,7 @@ + assertEquals(4, map.totalSize()); + map.remove("A"); + assertEquals(3, map.totalSize()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.totalSize()); + } + +@@ -292,7 +292,7 @@ + map.remove("A"); + assertEquals(0, map.size("A")); + assertEquals(3, map.size("B")); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(0, map.size("A")); + assertEquals(2, map.size("B")); + } +@@ -464,11 +464,11 @@ + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(null, map.removeMapping("C", "CA")); ++ assertEquals(null, map.removeMapping("A", "AD")); ++ assertEquals("AC", map.removeMapping("A", "AC")); ++ assertEquals("AB", map.removeMapping("A", "AB")); ++ assertEquals("AA", map.removeMapping("A", "AA")); + assertEquals(new MultiHashMap(), map); + } + +--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +@@ -315,10 +315,10 @@ + switch (key.size()) { + case 2: + assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); +- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + assertEquals(size - 1, multimap.size()); +- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + break; + case 3: --- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java +++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java -@@ -160,7 +160,7 @@ +@@ -161,7 +161,7 @@ MultiValueMap one = new MultiValueMap(); Integer value = new Integer(1); one.put("One", value); @@ -48,7 +120,7 @@ Forwarded: not-needed MultiValueMap two = new MultiValueMap(); assertEquals(two, one); -@@ -186,7 +186,7 @@ +@@ -187,7 +187,7 @@ assertEquals(4, map.totalSize()); map.remove("A"); assertEquals(3, map.totalSize()); @@ -57,7 +129,7 @@ Forwarded: not-needed assertEquals(2, map.totalSize()); } -@@ -203,7 +203,7 @@ +@@ -204,7 +204,7 @@ assertEquals(2, map.size()); map.remove("A"); assertEquals(2, map.size()); @@ -66,7 +138,7 @@ Forwarded: not-needed assertEquals(2, map.size()); } -@@ -226,7 +226,7 @@ +@@ -227,7 +227,7 @@ map.remove("A"); assertEquals(0, map.size("A")); assertEquals(3, map.size("B")); @@ -75,7 +147,7 @@ Forwarded: not-needed assertEquals(0, map.size("A")); assertEquals(2, map.size("B")); } -@@ -327,11 +327,11 @@ +@@ -338,11 +338,11 @@ map.put("A", "AA"); map.put("A", "AB"); map.put("A", "AC"); @@ -92,75 +164,3 @@ Forwarded: not-needed assertEquals(new MultiValueMap(), map); } ---- a/src/test/org/apache/commons/collections/TestMultiHashMap.java -+++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java -@@ -217,7 +217,7 @@ - MultiHashMap one = new MultiHashMap(); - Integer value = new Integer(1); - one.put("One", value); -- one.remove("One", value); -+ one.removeMapping("One", value); - - MultiHashMap two = new MultiHashMap(); - assertEquals(two, one); -@@ -269,7 +269,7 @@ - assertEquals(4, map.totalSize()); - map.remove("A"); - assertEquals(3, map.totalSize()); -- map.remove("B", "BC"); -+ map.removeMapping("B", "BC"); - assertEquals(2, map.totalSize()); - } - -@@ -292,7 +292,7 @@ - map.remove("A"); - assertEquals(0, map.size("A")); - assertEquals(3, map.size("B")); -- map.remove("B", "BC"); -+ map.removeMapping("B", "BC"); - assertEquals(0, map.size("A")); - assertEquals(2, map.size("B")); - } -@@ -464,11 +464,11 @@ - map.put("A", "AA"); - map.put("A", "AB"); - map.put("A", "AC"); -- assertEquals(null, map.remove("C", "CA")); -- assertEquals(null, map.remove("A", "AD")); -- assertEquals("AC", map.remove("A", "AC")); -- assertEquals("AB", map.remove("A", "AB")); -- assertEquals("AA", map.remove("A", "AA")); -+ assertEquals(null, map.removeMapping("C", "CA")); -+ assertEquals(null, map.removeMapping("A", "AD")); -+ assertEquals("AC", map.removeMapping("A", "AC")); -+ assertEquals("AB", map.removeMapping("A", "AB")); -+ assertEquals("AA", map.removeMapping("A", "AA")); - assertEquals(new MultiHashMap(), map); - } - ---- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java -+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java -@@ -197,7 +197,7 @@ - * @param key2 the second key - * @return the value mapped to the removed key, null if key not in map - */ -- public Object remove(Object key1, Object key2) { -+ public Object removeMultiKey(Object key1, Object key2) { - int hashCode = hash(key1, key2); - int index = map.hashIndex(hashCode, map.data.length); - AbstractHashedMap.HashEntry entry = map.data[index]; ---- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java -+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java -@@ -315,10 +315,10 @@ - switch (key.size()) { - case 2: - assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); -- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1))); -+ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); - assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); - assertEquals(size - 1, multimap.size()); -- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1))); -+ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); - assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); - break; - case 3: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-collections3-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
