This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjson-java.
commit 8cda2824ee23248054d594a744d42fc11374205b Author: Emmanuel Bourg <[email protected]> Date: Fri Apr 11 22:29:27 2014 +0000 Use the renamed method MultiKeyMap.removeMultiKey() --- debian/build.xml | 4 +++- debian/changelog | 2 ++ debian/control | 2 +- debian/patches/01-java8-compatibility.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 75e6e5d..3662260 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -9,7 +9,9 @@ <target name="compile" description="o Compile the source files"> <mkdir dir="${class.dir}"/> <javac srcdir="${source.dir}" destdir="${class.dir}" - debug="true" source="1.4" target="1.4" nowarn="true"/> + debug="true" source="1.4" target="1.4" nowarn="true"> + <include name="net/**"/> + </javac> </target> <target name="jar" description="o Create the jar" depends="compile"> diff --git a/debian/changelog b/debian/changelog index bd8b973..7dc8f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ libjson-java (2.3-3) UNRELEASED; urgency=low + * Use the renamed method MultiKeyMap.removeMultiKey() introduced + in libcommons-collections3-java 3.2.1-7 * debian/control - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.5 (no changes) diff --git a/debian/control b/debian/control index a01e972..4cd4743 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk Build-Depends-Indep: groovy, junit, libcommons-beanutils-java, - libcommons-collections3-java, + libcommons-collections3-java (>= 3.2.1-7~), libcommons-lang-java, libcommons-logging-java, libezmorph-java, diff --git a/debian/patches/01-java8-compatibility.patch b/debian/patches/01-java8-compatibility.patch new file mode 100644 index 0000000..0af7a02 --- /dev/null +++ b/debian/patches/01-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 <[email protected]> +Forwarded: not-needed +--- a/net/sf/json/JsonConfig.java ++++ b/net/sf/json/JsonConfig.java +@@ -1364,7 +1364,7 @@ + */ + public void unregisterJsonValueProcessor( Class beanClass, Class propertyType ) { + if( beanClass != null && propertyType != null ) { +- beanTypeMap.remove( beanClass, propertyType ); ++ beanTypeMap.removeMultiKey( beanClass, propertyType ); + } + } + +@@ -1377,7 +1377,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 new file mode 100644 index 0000000..3209aba --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjson-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
