From 230172fbc1247b32b7d71fa3304f8fe1c0e0f768 Mon Sep 17 00:00:00 2001 From: liningrui Date: Wed, 3 Mar 2021 11:13:02 +0800 Subject: [PATCH] Upgrade version to 0.12.0 Change-Id: Ia7eab6e7c88816234204ec6e60fc807f25e71212 --- hugegraph-api/pom.xml | 2 +- .../main/java/com/baidu/hugegraph/version/ApiVersion.java | 2 +- hugegraph-cassandra/pom.xml | 2 +- hugegraph-core/pom.xml | 6 +++--- .../java/com/baidu/hugegraph/io/HugeGraphSONModule.java | 6 ++++-- .../main/java/com/baidu/hugegraph/version/CoreVersion.java | 2 +- hugegraph-dist/pom.xml | 2 +- hugegraph-example/pom.xml | 2 +- hugegraph-hbase/pom.xml | 2 +- hugegraph-mysql/pom.xml | 2 +- hugegraph-palo/pom.xml | 2 +- .../baidu/hugegraph/backend/store/palo/PaloSessions.java | 2 +- hugegraph-postgresql/pom.xml | 2 +- hugegraph-rocksdb/pom.xml | 2 +- hugegraph-scylladb/pom.xml | 2 +- hugegraph-test/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 22 insertions(+), 20 deletions(-) diff --git a/hugegraph-api/pom.xml b/hugegraph-api/pom.xml index b687b64ac2..1aefdcce5d 100644 --- a/hugegraph-api/pom.xml +++ b/hugegraph-api/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java index 4062ef3534..319d47bc20 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java +++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java @@ -116,6 +116,6 @@ public final class ApiVersion { public static final void check() { // Check version of hugegraph-core. Firstly do check from version 0.3 - VersionUtil.check(CoreVersion.VERSION, "0.11", "0.12", CoreVersion.NAME); + VersionUtil.check(CoreVersion.VERSION, "0.12", "0.13", CoreVersion.NAME); } } diff --git a/hugegraph-cassandra/pom.xml b/hugegraph-cassandra/pom.xml index 7fb53b4420..992ed514dd 100644 --- a/hugegraph-cassandra/pom.xml +++ b/hugegraph-cassandra/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml index 6b79e236fe..61b26a5981 100644 --- a/hugegraph-core/pom.xml +++ b/hugegraph-core/pom.xml @@ -5,7 +5,7 @@ com.baidu.hugegraph hugegraph - 0.11.2 + 0.12.0 ../pom.xml hugegraph-core @@ -19,7 +19,7 @@ com.baidu.hugegraph hugegraph-common - 1.8.1 + 1.8.4 @@ -208,7 +208,7 @@ - 0.11.2.0 + 0.12.0.0 diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java index 8e214adb03..5c1d60fd16 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java @@ -21,6 +21,8 @@ import java.io.File; import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; import java.util.Optional; @@ -58,7 +60,6 @@ import com.baidu.hugegraph.backend.id.IdGenerator.StringId; import com.baidu.hugegraph.backend.id.IdGenerator.UuidId; import com.baidu.hugegraph.backend.store.Shard; -import com.baidu.hugegraph.date.SafeDateFormat; import com.baidu.hugegraph.schema.EdgeLabel; import com.baidu.hugegraph.schema.IndexLabel; import com.baidu.hugegraph.schema.PropertyKey; @@ -85,8 +86,9 @@ public class HugeGraphSONModule extends TinkerPopJacksonModule { private static final GraphSONSchemaSerializer schemaSerializer = new GraphSONSchemaSerializer(); + // NOTE: jackson will synchronize DateFormat private static final String DF = "yyyy-MM-dd HH:mm:ss.SSS"; - private static final SafeDateFormat DATE_FORMAT = new SafeDateFormat(DF); + private static final DateFormat DATE_FORMAT = new SimpleDateFormat(DF); static { TYPE_DEFINITIONS = new ConcurrentHashMap<>(); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java index e2812029f1..f912d6e722 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/version/CoreVersion.java @@ -33,7 +33,7 @@ public class CoreVersion { // The second parameter of Version.of() is for IDE running without JAR public static final Version VERSION = Version.of(CoreVersion.class, - "0.11.2"); + "0.12.0"); public static final String GREMLIN_VERSION = "3.4.3"; diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index 92d8ca25a6..60e770b3fa 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 hugegraph-dist diff --git a/hugegraph-example/pom.xml b/hugegraph-example/pom.xml index d60ebe14cf..7ddfc44d50 100644 --- a/hugegraph-example/pom.xml +++ b/hugegraph-example/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-hbase/pom.xml b/hugegraph-hbase/pom.xml index 458ef75023..9fd639474d 100644 --- a/hugegraph-hbase/pom.xml +++ b/hugegraph-hbase/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-mysql/pom.xml b/hugegraph-mysql/pom.xml index d2666f5220..2e6f663f5e 100644 --- a/hugegraph-mysql/pom.xml +++ b/hugegraph-mysql/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-palo/pom.xml b/hugegraph-palo/pom.xml index 2180f2a908..561f5a9ee7 100644 --- a/hugegraph-palo/pom.xml +++ b/hugegraph-palo/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java b/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java index d349bbb510..7f52fddfed 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java +++ b/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java @@ -219,7 +219,7 @@ private PaloLoadInfo getLoadInfoByLabel(String label) { public final class PaloLoadTask extends TimerTask { private static final String DF = "yyyy-MM-dd-HH-mm-ss"; - private final DateFormat DATE_FORMAT = new SafeDateFormat(DF); + private final SafeDateFormat DATE_FORMAT = new SafeDateFormat(DF); /** * There exist two running palo load task corresponds to two stores, diff --git a/hugegraph-postgresql/pom.xml b/hugegraph-postgresql/pom.xml index 79336464b2..c5012d7abe 100644 --- a/hugegraph-postgresql/pom.xml +++ b/hugegraph-postgresql/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-rocksdb/pom.xml b/hugegraph-rocksdb/pom.xml index 8cdb4f3ceb..ebd88cd1e9 100644 --- a/hugegraph-rocksdb/pom.xml +++ b/hugegraph-rocksdb/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-scylladb/pom.xml b/hugegraph-scylladb/pom.xml index 20b6dc7f82..6ba5b8c87f 100644 --- a/hugegraph-scylladb/pom.xml +++ b/hugegraph-scylladb/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/hugegraph-test/pom.xml b/hugegraph-test/pom.xml index 983761d309..0177e38bb3 100644 --- a/hugegraph-test/pom.xml +++ b/hugegraph-test/pom.xml @@ -5,7 +5,7 @@ hugegraph com.baidu.hugegraph - 0.11.2 + 0.12.0 4.0.0 diff --git a/pom.xml b/pom.xml index 0e11102214..dfbc8063c0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.baidu.hugegraph hugegraph - 0.11.2 + 0.12.0 pom 3.3.9