Skip to content

Commit 65250ba

Browse files
authored
Merge pull request #503 from joschi/jackson-2.11
Upgrade to Jackson 2.11.1
2 parents 178bd88 + 5c9a5d0 commit 65250ba

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.fasterxml.jackson.core</groupId>
4444
<artifactId>jackson-databind</artifactId>
45-
<version>2.9.10.4</version>
45+
<version>2.11.1</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>com.google.code.findbugs</groupId>

core/src/main/java/pl/project13/core/PropertiesFileGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package pl.project13.core;
1919

2020
import com.fasterxml.jackson.core.type.TypeReference;
21+
import com.fasterxml.jackson.databind.MapperFeature;
2122
import com.fasterxml.jackson.databind.ObjectMapper;
2223
import nu.studer.java.util.OrderedProperties;
2324
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -33,6 +34,7 @@
3334
import java.util.Properties;
3435

3536
public class PropertiesFileGenerator {
37+
private static final ObjectMapper MAPPER = new ObjectMapper().enable(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES);
3638

3739
private LoggerBridge log;
3840
private BuildContext buildContext;
@@ -95,8 +97,7 @@ public void maybeGeneratePropertiesFile(@Nonnull Properties localProperties, Fil
9597
if (isJsonFormat) {
9698
try (Writer outputWriter = new OutputStreamWriter(outputStream, sourceCharset)) {
9799
log.info("Writing json file to [{}] (for module {})...", gitPropsFile.getAbsolutePath(), projectName);
98-
ObjectMapper mapper = new ObjectMapper();
99-
mapper.writerWithDefaultPrettyPrinter().writeValue(outputWriter, sortedLocalProperties);
100+
MAPPER.writerWithDefaultPrettyPrinter().writeValue(outputWriter, sortedLocalProperties);
100101
}
101102
} else {
102103
log.info("Writing properties file to [{}] (for module {})...", gitPropsFile.getAbsolutePath(), projectName);
@@ -135,11 +136,10 @@ private Properties readJsonProperties(@Nonnull File jsonFile, Charset sourceChar
135136

136137
try (final FileInputStream fis = new FileInputStream(jsonFile)) {
137138
try (final InputStreamReader reader = new InputStreamReader(fis, sourceCharset)) {
138-
final ObjectMapper mapper = new ObjectMapper();
139139
final TypeReference<HashMap<String, Object>> mapTypeRef =
140140
new TypeReference<HashMap<String, Object>>() {};
141141

142-
propertiesMap = mapper.readValue(reader, mapTypeRef);
142+
propertiesMap = MAPPER.readValue(reader, mapTypeRef);
143143
}
144144
} catch (final Exception ex) {
145145
throw new CannotReadFileException(ex);

0 commit comments

Comments
 (0)