fix outdated manifest version & use project.version instead (#2033)

z7658329 · imbajin · web-flow · commit 3b44568e8bdf · 2022-11-26T22:40:33.000+08:00
Co-authored-by: imbajin &lt;jin@apache.org&gt;
diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java b/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java
@@ -127,6 +127,6 @@ public final class ApiVersion {
     public static void check() {
         // Check version of hugegraph-core. Firstly do check from version 0.3
         // TODO: what shall we set for this version? (consider the basic compatibility)
-        VersionUtil.check(CoreVersion.VERSION, "0.13", "0.14", CoreVersion.NAME);
+        VersionUtil.check(CoreVersion.VERSION, "1.0", "1.1", CoreVersion.NAME);
     }
 }
diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml
@@ -325,7 +325,7 @@
                             </addDefaultSpecificationEntries>
                         </manifest>
                         <manifestEntries>
-                            <Implementation-Version>0.13.0.0</Implementation-Version>
+                            <Implementation-Version>${project.version}</Implementation-Version>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java b/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java
@@ -41,6 +41,6 @@ public class CoreVersion {
     public static void check() {
         // Check version of hugegraph-common
         // TODO: why shall we check it? Update it if need
-        VersionUtil.check(CommonVersion.VERSION, "2.1.0", "2.2.0", CommonVersion.NAME);
+        VersionUtil.check(CommonVersion.VERSION, "1.0", "1.1", CommonVersion.NAME);
     }
 }
diff --git a/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/VersionTest.java b/hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/VersionTest.java
@@ -19,6 +19,7 @@
 
 package org.apache.hugegraph.unit.util;
 
+import org.apache.hugegraph.version.ApiVersion;
 import org.junit.Test;
 
 import org.apache.hugegraph.testutil.Assert;
@@ -41,4 +42,10 @@ public void testCoreVersionCheck() {
         // Expect not throw exception
         CoreVersion.check();
     }
+
+    @Test
+    public void testApiVersionCheck() {
+        // Expect not throw exception
+        ApiVersion.check();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,6 @@ public final class ApiVersion {`
`127`	`127`	`public static void check() {`
`128`	`128`	`// Check version of hugegraph-core. Firstly do check from version 0.3`
`129`	`129`	`// TODO: what shall we set for this version? (consider the basic compatibility)`
`130`		`- VersionUtil.check(CoreVersion.VERSION, "0.13", "0.14", CoreVersion.NAME);`
	`130`	`+ VersionUtil.check(CoreVersion.VERSION, "1.0", "1.1", CoreVersion.NAME);`
`131`	`131`	`}`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public class CoreVersion {`
`41`	`41`	`public static void check() {`
`42`	`42`	`// Check version of hugegraph-common`
`43`	`43`	`// TODO: why shall we check it? Update it if need`
`44`		`- VersionUtil.check(CommonVersion.VERSION, "2.1.0", "2.2.0", CommonVersion.NAME);`
	`44`	`+ VersionUtil.check(CommonVersion.VERSION, "1.0", "1.1", CommonVersion.NAME);`
`45`	`45`	`}`
`46`	`46`	`}`