Skip to content
This repository was archived by the owner on Aug 13, 2020. It is now read-only.

Commit ba93d87

Browse files
authored
Merge pull request #606 from CJSCommonPlatform/upgrade-jackson
Upgrade Jackson to 2.8.11 to fix Jackson security issue
2 parents 575eed2 + 0b05bb4 commit ba93d87

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file, which follo
33
on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
44
[Semantic Versioning](http://semver.org/).
55

6+
## [4.0.4] - 2018-05-17
7+
- Upgrade Jackson to 2.8.11 to fix Jackson security issues
8+
69
## [4.0.3] - 2018-05-10
710
### Changed
811
- Makes TestDataSourceFactory lock rows in the same way as postgresql

core/src/test/java/uk/gov/justice/services/core/dispatcher/EnvelopePayloadTypeConverterTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ private JsonEnvelope getJsonEnvelope(final JsonValue payload) {
127127
.withId(UUID.randomUUID()), payload);
128128
}
129129

130-
131-
private class TestObject {
130+
private static class TestObject {
132131

133132
private String myString;
134133

@@ -148,7 +147,7 @@ public void setMyString(final String myString) {
148147
}
149148
}
150149

151-
private class DifferentTestObject {
150+
private static class DifferentTestObject {
152151

153152
private String myString;
154153

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>uk.gov.justice</groupId>
99
<artifactId>maven-framework-parent-pom</artifactId>
10-
<version>1.11.0</version>
10+
<version>1.12.1</version>
1111
</parent>
1212

1313
<groupId>uk.gov.justice.services</groupId>
@@ -47,17 +47,17 @@
4747
<properties>
4848
<cpp.repo.name>microservice_framework</cpp.repo.name>
4949

50-
<common-bom.version>1.22.0</common-bom.version>
50+
<common-bom.version>1.26.0</common-bom.version>
5151
<embedded-artemis.version>1.2.0</embedded-artemis.version>
52-
<file.service.version>1.15.0</file.service.version>
52+
<file.service.version>1.16.1</file.service.version>
5353
<h2.version>1.3.173</h2.version>
5454
<jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
5555
<jboss-vfs.version>3.2.12.Final</jboss-vfs.version>
56-
<raml-maven-plugin.version>1.6.1</raml-maven-plugin.version>
57-
<test-utils.version>1.16.0</test-utils.version>
58-
<utilities.version>1.12.0</utilities.version>
59-
<generator-maven-plugin.version>2.3.0</generator-maven-plugin.version>
60-
<framework-api.version>2.0.1</framework-api.version>
56+
<raml-maven-plugin.version>1.6.2</raml-maven-plugin.version>
57+
<test-utils.version>1.17.2</test-utils.version>
58+
<utilities.version>1.13.1</utilities.version>
59+
<generator-maven-plugin.version>2.5.0</generator-maven-plugin.version>
60+
<framework-api.version>2.0.3</framework-api.version>
6161
</properties>
6262

6363
<dependencyManagement>

test-utils/test-utils-core/src/test/java/uk/gov/justice/services/test/utils/core/converter/JsonObjectToObjectConverterFactoryTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,16 @@ public void testUsableJsonObjectToObjectConverterIsProduced(){
2727
assertThat(convertedPojo.getTestAttribute(), is("testValue"));
2828
}
2929

30-
private class TestPojo {
30+
private static class TestPojo {
3131

32-
private String testAttribute;
32+
private final String testAttribute;
3333

34-
public String getTestAttribute() {
35-
return testAttribute;
36-
}
37-
38-
public void setTestAttribute(String testAttribute) {
34+
private TestPojo(final String testAttribute) {
3935
this.testAttribute = testAttribute;
4036
}
4137

38+
public String getTestAttribute() {
39+
return testAttribute;
40+
}
4241
}
43-
}
42+
}

0 commit comments

Comments
 (0)