[pkg-java] r18032 - in trunk/libjson-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-11 22:29:27 +0000 (Fri, 11 Apr 2014)
New Revision: 18032

Added:
   trunk/libjson-java/debian/patches/
   trunk/libjson-java/debian/patches/01-java8-compatibility.patch
   trunk/libjson-java/debian/patches/series
Modified:
   trunk/libjson-java/debian/build.xml
   trunk/libjson-java/debian/changelog
   trunk/libjson-java/debian/control
Log:
Use the renamed method MultiKeyMap.removeMultiKey()



Modified: trunk/libjson-java/debian/build.xml
===================================================================
--- trunk/libjson-java/debian/build.xml	2014-04-11 17:08:23 UTC (rev 18031)
+++ trunk/libjson-java/debian/build.xml	2014-04-11 22:29:27 UTC (rev 18032)
@@ -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">

Modified: trunk/libjson-java/debian/changelog
===================================================================
--- trunk/libjson-java/debian/changelog	2014-04-11 17:08:23 UTC (rev 18031)
+++ trunk/libjson-java/debian/changelog	2014-04-11 22:29:27 UTC (rev 18032)
@@ -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)

Modified: trunk/libjson-java/debian/control
===================================================================
--- trunk/libjson-java/debian/control	2014-04-11 17:08:23 UTC (rev 18031)
+++ trunk/libjson-java/debian/control	2014-04-11 22:29:27 UTC (rev 18032)
@@ -9,7 +9,7 @@
 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,

Added: trunk/libjson-java/debian/patches/01-java8-compatibility.patch
===================================================================
--- trunk/libjson-java/debian/patches/01-java8-compatibility.patch	                        (rev 0)
+++ trunk/libjson-java/debian/patches/01-java8-compatibility.patch	2014-04-11 22:29:27 UTC (rev 18032)
@@ -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/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 );
+       }
+    }
+ 

Added: trunk/libjson-java/debian/patches/series
===================================================================
--- trunk/libjson-java/debian/patches/series	                        (rev 0)
+++ trunk/libjson-java/debian/patches/series	2014-04-11 22:29:27 UTC (rev 18032)
@@ -0,0 +1 @@
+01-java8-compatibility.patch