diff --git a/core/pom.xml b/core/pom.xml index 35fc52a741..14b7d86a0d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -44,12 +44,22 @@ commons-beanutils commons-beanutils - 1.7.0 + 1.8.3 commons-io commons-io - 1.3.1 + 2.4 + + + commons-logging + commons-logging + 1.2 + + + commons-codec + commons-codec + 1.9 org.jvnet.localizer diff --git a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java index 5d16edc5df..e253a1f05e 100644 --- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java +++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java @@ -742,7 +742,7 @@ public Object convertJSON(Object o) { if (converter==null) throw new IllegalArgumentException("Unable to convert to "+l.itemType); - l.add(converter.convert(type,o)); + l.add(converter.convert(l.itemType, o)); return l.toCollection(); } } diff --git a/core/src/test/java/org/kohsuke/stapler/DataBindingTest.java b/core/src/test/java/org/kohsuke/stapler/DataBindingTest.java index 1740920da3..2d8c8e2765 100644 --- a/core/src/test/java/org/kohsuke/stapler/DataBindingTest.java +++ b/core/src/test/java/org/kohsuke/stapler/DataBindingTest.java @@ -139,8 +139,8 @@ public void testScalarToArray() throws Exception { ScalarToArray r = bind("{a:'x',b:'y',c:5,d:6}", ScalarToArray.class); assertEquals("x",r.a[0]); assertEquals("y",r.b.get(0)); - assertEquals(5,(int)r.c[0]); - assertEquals(6,(int)r.d.get(0)); + assertEquals(Integer.valueOf(5), r.c[0]); + assertEquals(Integer.valueOf(6), r.d.get(0)); } public static class ScalarToArray { diff --git a/groovy/pom.xml b/groovy/pom.xml index d9e55a9b99..fb95f5a12e 100644 --- a/groovy/pom.xml +++ b/groovy/pom.xml @@ -19,7 +19,7 @@ org.codehaus.groovy groovy-all - 1.8.3 + 2.4.11 javax.servlet diff --git a/jelly/pom.xml b/jelly/pom.xml index b3a2508832..3debab47ef 100644 --- a/jelly/pom.xml +++ b/jelly/pom.xml @@ -27,6 +27,10 @@ + + commons-collections + commons-collections + org.jenkins-ci.dom4j dom4j diff --git a/pom.xml b/pom.xml index 994cc53d21..3130de161f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.kohsuke pom - 14 + 19 org.kohsuke.stapler stapler-parent @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.3.1 + 3.0.0-M1 @@ -140,6 +140,7 @@ com.headius.invokebinder.* + @@ -148,7 +149,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.0-beta-2 + 1.0-beta-4 @@ -271,6 +272,11 @@ 4.11 test + + commons-collections + commons-collections + 3.2.2 +