Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependency updates #134

Merged
merged 6 commits into from
Oct 20, 2017
Merged

Dependency updates #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d59a74
Cleanup upper Bound dependencies
oleg-nenashev Oct 10, 2017
00405e2
Update groovy-all in stapler-groovy to the Jenkins core’s version
oleg-nenashev Oct 10, 2017
8d574a5
Update Extra enforcer rules as suggested by @jglick
oleg-nenashev Oct 13, 2017
610a9fa
Ensure that the test properly reports unexpected null values.
jglick Oct 20, 2017
fbba07e
Update commons-beanutils to 1.8.3 to match jenkins-core.
jglick Oct 20, 2017
8ab2860
A longstanding bug in databinding seems to have been masked by corner…
jglick Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/kohsuke/stapler/RequestImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return l.toCollection();
}
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/kohsuke/stapler/DataBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions jelly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -140,6 +140,7 @@
<string>com.headius.invokebinder.*</string>
</ignoreClasses>
</enforceBytecodeVersion>
<requireUpperBoundDeps />
</rules>
</configuration>
</execution>
Expand All @@ -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>
Expand Down Expand Up @@ -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>