Skip to content

Commit 3530dbf

Browse files
committed
Updating several dependency vulnerabilities
* Jackson updated to 2.10 * (Test only) Jetty updated to 9.4.41 * (Test only) Guava updated to 30.1.1 * (Test only) Junit updated to 4.31.2
1 parent c01505a commit 3530dbf

4 files changed

Lines changed: 19 additions & 7 deletions

File tree

json-view/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
<groupId>com.monitorjbl</groupId>
88
<artifactId>json-view</artifactId>
9-
<version>1.0.2-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<name>json-view</name>
1111
<description>Provides programmatic exclusion/inclusion for Jackson JSON serialization</description>
1212
<url>https://github.com/monitorjbl/json-view</url>
1313

1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<jackson.version>2.9.8</jackson.version>
16+
<jackson.version>2.10.5</jackson.version>
1717
</properties>
1818

1919
<developers>

json-view/src/test/java/com/monitorjbl/json/JsonViewSerializerTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public void testBasicSerialization() throws IOException {
106106
ref.setStringArray(new String[]{"apple", "banana"});
107107
ref.setList(asList("red", "blue", "green"));
108108
ref.setSub(new TestSubobject("qwerqwerqwerqw", new TestSubobject("poxcpvoxcv")));
109+
ref.setTargetObject("blarg");
109110
String serialized = sut.writeValueAsString(
110111
JsonView.with(ref).onClass(TestObject.class, match()
111112
.exclude("str2")
@@ -115,6 +116,7 @@ public void testBasicSerialization() throws IOException {
115116
Map<String, Object> obj = sut.readValue(serialized, NonReplacableKeyMap.class);
116117
assertNull(obj.get("str2"));
117118
assertNotNull(obj.get("sub"));
119+
assertNotNull(obj.get("targetObject"));
118120
assertNull(((Map) obj.get("sub")).get("val"));
119121
}
120122

@@ -1090,7 +1092,8 @@ public void testSerializationOrder() throws Exception {
10901092
assertEquals("subWithIgnores", keys.get(1));
10911093
assertEquals("str1", keys.get(2));
10921094
assertEquals("str2", keys.get(3));
1093-
assertEquals("date", keys.get(4));
1095+
assertEquals("targetObject", keys.get(4));
1096+
assertEquals("date", keys.get(5));
10941097
}
10951098

10961099
@Test

json-view/src/test/java/com/monitorjbl/json/model/TestObject.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public enum TestEnum {VALUE_A, VALUE_B}
3232
private String str2;
3333
@JsonIgnore
3434
private String ignoredDirect;
35+
private String targetObject;
3536
private String ignoredIndirect;
3637
private Date date;
3738
private int int1;
@@ -96,6 +97,14 @@ public void setIgnoredIndirect(String ignoredIndirect) {
9697
this.ignoredIndirect = ignoredIndirect;
9798
}
9899

100+
public String getTargetObject() {
101+
return targetObject;
102+
}
103+
104+
public void setTargetObject(String targetObject) {
105+
this.targetObject = targetObject;
106+
}
107+
99108
public Date getDate() {
100109
return date;
101110
}

spring-json-view/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.monitorjbl</groupId>
88
<artifactId>spring-json-view</artifactId>
9-
<version>1.0.2-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<name>spring-json-view</name>
1111
<description>Provides programmatic JSON response manipulation for Spring MVC</description>
1212
<url>https://github.com/monitorjbl/spring-json-view</url>
@@ -164,20 +164,20 @@
164164
<dependency>
165165
<groupId>junit</groupId>
166166
<artifactId>junit</artifactId>
167-
<version>4.11</version>
167+
<version>4.13.2</version>
168168
<scope>test</scope>
169169
</dependency>
170170
<dependency>
171171
<groupId>com.google.guava</groupId>
172172
<artifactId>guava</artifactId>
173-
<version>18.0</version>
173+
<version>30.1.1-jre</version>
174174
<scope>test</scope>
175175
</dependency>
176176

177177
<dependency>
178178
<groupId>org.eclipse.jetty</groupId>
179179
<artifactId>jetty-webapp</artifactId>
180-
<version>9.3.0.M1</version>
180+
<version>9.4.41.v20210516</version>
181181
<scope>test</scope>
182182
</dependency>
183183

0 commit comments

Comments
 (0)