Skip to content

Commit 5a057ce

Browse files
committed
Update jackson to version 2.8.9 and remove depreceiated modules
Update corrects jacksons JXAB xml compatibility. See FasterXML/jackson-dataformat-xml#178 for details. refs #11207
1 parent 9abff3f commit 5a057ce

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<guava.version>18.0</guava.version>
8383
<hamcrest.version>1.3</hamcrest.version>
8484
<hierarchicalcontextrunner.version>4.12.1</hierarchicalcontextrunner.version>
85-
<jackson.version>2.5.4</jackson.version>
85+
<jackson.version>2.8.9</jackson.version>
8686
<jstl.version>1.2</jstl.version>
8787
<junit.version>4.12</junit.version>
8888
<mockito.version>1.10.19</mockito.version>
@@ -196,12 +196,6 @@
196196
<version>${jackson.version}</version>
197197
</dependency>
198198

199-
<dependency>
200-
<groupId>com.fasterxml.jackson.datatype</groupId>
201-
<artifactId>jackson-datatype-jsr310</artifactId>
202-
<version>${jackson.version}</version>
203-
</dependency>
204-
205199
<dependency>
206200
<groupId>com.fasterxml.jackson.datatype</groupId>
207201
<artifactId>jackson-datatype-guava</artifactId>

src/main/java/gov/nysenate/ess/core/config/JacksonConfig.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.fasterxml.jackson.databind.DeserializationFeature;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.fasterxml.jackson.databind.SerializationFeature;
6+
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
67
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
78
import com.fasterxml.jackson.datatype.guava.GuavaModule;
8-
import com.fasterxml.jackson.datatype.jsr310.JSR310Module;
99
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
1010
import org.springframework.context.annotation.Bean;
1111
import org.springframework.context.annotation.Configuration;
@@ -28,7 +28,9 @@ public ObjectMapper jsonObjectMapper() {
2828
*/
2929
@Bean
3030
public ObjectMapper xmlObjectMapper() {
31-
ObjectMapper objectMapper = new XmlMapper();
31+
JacksonXmlModule module = new JacksonXmlModule();
32+
module.setDefaultUseWrapper(false);
33+
ObjectMapper objectMapper = new XmlMapper(module);
3234
configureMapper(objectMapper);
3335
return objectMapper;
3436
}
@@ -42,7 +44,6 @@ private void configureMapper(ObjectMapper objectMapper) {
4244
objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
4345
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
4446
objectMapper.registerModule(new GuavaModule());
45-
objectMapper.registerModule(new JSR310Module());
4647
objectMapper.registerModule(new JaxbAnnotationModule());
4748
}
4849
}

0 commit comments

Comments
 (0)