[jenkins-json] 02/05: Use the renamed method MultiKeyMap.removeMultiKey()
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Apr 11 23:21:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jenkins-json.
commit 4c943cefaa0fd68f5c38be2cceb52f8bb76f17cd
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Apr 12 00:57:03 2014 +0200
Use the renamed method MultiKeyMap.removeMultiKey()
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/patches/0002-java8-compatibility.patch | 25 +++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index d200428..286aa4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
jenkins-json (2.4-jenkins-3-2) UNRELEASED; urgency=medium
* Team upload.
+ * Use the renamed method MultiKeyMap.removeMultiKey() introduced
+ in libcommons-collections3-java 3.2.1-7
* Switch to debhelper level 9
-- Emmanuel Bourg <ebourg at apache.org> Sat, 12 Apr 2014 00:40:41 +0200
diff --git a/debian/control b/debian/control
index 5df438f..c8df5b6 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep:
groovy-doc,
libcommons-beanutils-java,
libcommons-beanutils-java-doc,
- libcommons-collections3-java,
+ libcommons-collections3-java (>= 3.2.1-7~),
libcommons-httpclient-java,
libcommons-httpclient-java-doc,
libcommons-lang-java,
diff --git a/debian/patches/0002-java8-compatibility.patch b/debian/patches/0002-java8-compatibility.patch
new file mode 100644
index 0000000..eb396c5
--- /dev/null
+++ b/debian/patches/0002-java8-compatibility.patch
@@ -0,0 +1,25 @@
+Description: Uses the renamed method MultiKeyMap.removeMultiKey() introduced
+ in libcommons-collections3-java 3.2.1-7 to solve a compatibility issue with
+ Java 8.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/net/sf/json/JsonConfig.java
++++ b/src/main/java/net/sf/json/JsonConfig.java
+@@ -1398,7 +1398,7 @@
+ */
+ public void unregisterJsonValueProcessor( Class beanClass, Class propertyType ) {
+ if( beanClass != null && propertyType != null ) {
+- beanTypeMap.remove( beanClass, propertyType );
++ beanTypeMap.removeMultiKey( beanClass, propertyType );
+ }
+ }
+
+@@ -1411,7 +1411,7 @@
+ */
+ public void unregisterJsonValueProcessor( Class beanClass, String key ) {
+ if( beanClass != null && key != null ) {
+- beanKeyMap.remove( beanClass, key );
++ beanKeyMap.removeMultiKey( beanClass, key );
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 143dc93..0be511e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Drop-requirement-for-maven-3.0.1.patch
+0002-java8-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-json.git
More information about the pkg-java-commits
mailing list