From 166013b3dfb4b1c94e884da01ea82845cea250be Mon Sep 17 00:00:00 2001
From: liningrui <liningrui@baidu.com>
Date: Tue, 18 Dec 2018 19:33:15 +0800
Subject: [PATCH] Fix dependency conflict "InjectionManagerFactory not found"

Fix #9

Change-Id: I83f2074c431994f72a62e37ab4a6086c3142a1b5
---
 pom.xml                                                | 10 ++++++++--
 .../com/baidu/hugegraph/version/CommonVersion.java     |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 864480e41..e2ca47893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.baidu.hugegraph</groupId>
     <artifactId>hugegraph-common</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4</version>
 
     <name>hugegraph-common</name>
     <url>https://github.com/hugegraph/hugegraph-common</url>
@@ -67,6 +67,7 @@
         <jsr305.version>3.0.1</jsr305.version>
         <javassist.version>3.21.0-GA</javassist.version>
         <jersey.version>2.25.1</jersey.version>
+        <jersey.hk2.version>2.27</jersey.hk2.version>
         <junit.version>4.12</junit.version>
     </properties>
 
@@ -155,6 +156,11 @@
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.hk2.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -192,7 +198,7 @@
                         <manifestEntries>
                             <!-- Must be on one line, otherwise the automatic
                                  upgrade script cannot replace the version number -->
-                            <Implementation-Version>1.5.3.0</Implementation-Version>
+                            <Implementation-Version>1.5.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 deb96e040..aa9c14f7c 100644
--- a/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
+++ b/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
@@ -25,5 +25,7 @@ public class CommonVersion {
 
     public static final String NAME = "hugegraph-common";
 
-    public static final Version VERSION = Version.of(CommonVersion.class);
+    // The second parameter of Version.of() is for all-in-one JAR
+    public static final Version VERSION = Version.of(CommonVersion.class,
+                                                     "1.5.4");
 }