Merge pull request #134 from jglick/updates

Dependency updates
jenkinsci · Oct 20, 2017 · 04889cf · 04889cf
2 parents dc2afaa + 8ab2860
commit 04889cf
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -44,12 +44,22 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
+      <version>1.8.3</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.3.1</version>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.9</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.localizer</groupId>

diff --git 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
@@ -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
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>1.8.3</version>
+      <version>2.4.11</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

diff --git a/jelly/pom.xml b/jelly/pom.xml
@@ -27,6 +27,10 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.dom4j</groupId>
       <artifactId>dom4j</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.kohsuke</groupId>
     <artifactId>pom</artifactId>
-    <version>14</version>
+    <version>19</version>
   </parent>
   <groupId>org.kohsuke.stapler</groupId>
   <artifactId>stapler-parent</artifactId>
@@ -122,7 +122,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
+        <version>3.0.0-M1</version>
         <executions>
           <execution>
             <goals>
@@ -140,6 +140,7 @@
                     <string>com.headius.invokebinder.*</string>
                   </ignoreClasses>
                 </enforceBytecodeVersion>
+                <requireUpperBoundDeps />
               </rules>
             </configuration>
           </execution>
@@ -148,7 +149,7 @@
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-beta-2</version>
+            <version>1.0-beta-4</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -271,6 +272,11 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.2</version>
+    </dependency>
   </dependencies>
   </dependencyManagement>
 </project>