Upgrade jackson version to 2.10.2 (#45)
diff --git a/pom.xml b/pom.xml
index 27809ff..5f70e9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.baidu.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
- <version>1.7.3</version>
+ <version>1.7.4</version>
<name>hugegraph-common</name>
<url>https://github.com/hugegraph/hugegraph-common</url>
@@ -66,9 +66,9 @@
<javax.json.version>1.0</javax.json.version>
<jsr305.version>3.0.1</jsr305.version>
<javassist.version>3.21.0-GA</javassist.version>
- <!--TODO: Update to 2.29 when released-->
<jersey.version>2.22</jersey.version>
<jersey.hk2.version>2.27</jersey.hk2.version>
+ <jackson.version>2.10.2</jackson.version>
<junit.version>4.12</junit.version>
<mockito.version>2.25.1</mockito.version>
</properties>
@@ -154,6 +154,38 @@
<version>${javassist.version}</version>
</dependency>
+ <!-- jackson -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
<!-- jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -164,6 +196,16 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
@@ -218,7 +260,7 @@
<manifestEntries>
<!-- Must be on one line, otherwise the automatic
upgrade script cannot replace the version number -->
- <Implementation-Version>1.7.3.0</Implementation-Version>
+ <Implementation-Version>1.7.4.0</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
diff --git a/src/main/java/com/baidu/hugegraph/version/CommonVersion.java b/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
index 29487b9..e8e2dd1 100644
--- a/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
+++ b/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
@@ -27,5 +27,5 @@
// The second parameter of Version.of() is for all-in-one JAR
public static final Version VERSION = Version.of(CommonVersion.class,
- "1.7.3");
+ "1.7.4");
}
diff --git a/src/test/java/com/baidu/hugegraph/unit/license/LicenseManagerTest.java b/src/test/java/com/baidu/hugegraph/unit/license/LicenseManagerTest.java
index 65f6e03..6c27a8c 100644
--- a/src/test/java/com/baidu/hugegraph/unit/license/LicenseManagerTest.java
+++ b/src/test/java/com/baidu/hugegraph/unit/license/LicenseManagerTest.java
@@ -258,7 +258,8 @@
String extra = (String) content.getExtra();
List<ExtraParam> extraParams;
try {
- TypeReference type = new TypeReference<List<ExtraParam>>() {};
+ TypeReference<List<ExtraParam>> type;
+ type = new TypeReference<List<ExtraParam>>() {};
extraParams = MAPPER.readValue(extra, type);
} catch (IOException e) {
throw new RuntimeException("Failed to read extra params", e);
