From 5d34b014801c46d00649ac18d59310e7cf9681a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Thu, 24 Nov 2022 23:05:21 +0800 Subject: [PATCH 1/3] fix outdated manifest version & use project.version instead --- hugegraph-api/pom.xml | 2 +- .../main/java/org/apache/hugegraph/version/ApiVersion.java | 4 ++-- hugegraph-core/pom.xml | 2 +- .../java/org/apache/hugegraph/version/CoreVersion.java | 2 +- .../java/org/apache/hugegraph/unit/util/VersionTest.java | 7 +++++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hugegraph-api/pom.xml b/hugegraph-api/pom.xml index 381a9430c9..ba5092f010 100644 --- a/hugegraph-api/pom.xml +++ b/hugegraph-api/pom.xml @@ -186,7 +186,7 @@ - 0.69.0.0 + ${project.version} 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 index 7c793989f5..168a9c351b 100644 --- a/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java @@ -122,11 +122,11 @@ public final class ApiVersion { * The second parameter of Version.of() is for IDE running without JAR * TODO: what shall we set for this version? (consider the basic compatibility) */ - public static final Version VERSION = Version.of(ApiVersion.class, "0.69"); + public static final Version VERSION = Version.of(ApiVersion.class, "1.0.0"); 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.0", "1.0.1", CoreVersion.NAME); } } diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml index 52c710ac0c..4683bb349b 100644 --- a/hugegraph-core/pom.xml +++ b/hugegraph-core/pom.xml @@ -325,7 +325,7 @@ - 0.13.0.0 + ${project.version} 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 index d8e422f823..3c953ee92e 100644 --- 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.0", "1.0.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 index 10b6e291f0..eb447cb69a 100644 --- 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(); + } } From 4871d16627a6b0f3c269e599857f9852d9c0eaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Sat, 26 Nov 2022 11:42:54 +0800 Subject: [PATCH 2/3] fix outdated manifest version & use project.version instead --- hugegraph-api/pom.xml | 2 +- .../src/main/java/org/apache/hugegraph/version/ApiVersion.java | 2 +- .../src/main/java/org/apache/hugegraph/version/CoreVersion.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hugegraph-api/pom.xml b/hugegraph-api/pom.xml index ba5092f010..381a9430c9 100644 --- a/hugegraph-api/pom.xml +++ b/hugegraph-api/pom.xml @@ -186,7 +186,7 @@ - ${project.version} + 0.69.0.0 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 index 168a9c351b..94a9b9e47a 100644 --- 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, "1.0.0", "1.0.1", CoreVersion.NAME); + VersionUtil.check(CoreVersion.VERSION, "1.0", "1.1", CoreVersion.NAME); } } 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 index 3c953ee92e..6fb9a3b706 100644 --- 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, "1.0.0", "1.0.1", CommonVersion.NAME); + VersionUtil.check(CommonVersion.VERSION, "1.0", "1.1", CommonVersion.NAME); } } From 0e0979914b7951f8bdd3ab6998644a2d4204f1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com> Date: Sat, 26 Nov 2022 19:14:35 +0800 Subject: [PATCH 3/3] fix outdated manifest version & use project.version instead --- .../src/main/java/org/apache/hugegraph/version/ApiVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 94a9b9e47a..ce7494174e 100644 --- a/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java @@ -122,7 +122,7 @@ public final class ApiVersion { * The second parameter of Version.of() is for IDE running without JAR * TODO: what shall we set for this version? (consider the basic compatibility) */ - public static final Version VERSION = Version.of(ApiVersion.class, "1.0.0"); + public static final Version VERSION = Version.of(ApiVersion.class, "0.69"); public static void check() { // Check version of hugegraph-core. Firstly do check from version 0.3