Merge branch 'master' into client-support-gs

README.md

@@ -17,6 +17,7 @@ it includes 5+ main modules.
 - [hugegraph-tools](./hugegraph-tools): Command line tool for deploying, managing and backing-up/restoring graphs from HugeGraph.
 - [hugegraph-client](./hugegraph-client): A Java-written client for HugeGraph, providing `RESTful` APIs for accessing graph vertex/edge/schema/gremlin/variables and traversals etc.
 - [hugegraph-client-go](./hugegraph-client-go): A Go-written client for HugeGraph, providing `RESTful` APIs for accessing graph vertex/edge/schema/gremlin/variables and traversals etc. (WIP)
+- [hugegraph-spark-connector](./hugegraph-spark-connector): A Spark connector for reading & writing HugeGraph data in Spark standard format.
 
 ## Usage
 
@@ -33,39 +34,46 @@ You could use import the dependencies in `maven` like this:
   <dependency>
        <groupId>org.apache.hugegraph</groupId>
        <artifactId>hugegraph-client</artifactId>
-       <version>1.3.0</version>
+       <version>1.5.0</version>
   </dependency>
 
   <dependency>
        <groupId>org.apache.hugegraph</groupId>
        <artifactId>hugegraph-loader</artifactId>
-       <version>1.3.0</version>
+       <version>1.5.0</version>
   </dependency>
 ```
 
+And here are links of other **HugeGraph** component/repositories:
+1. [hugegraph](https://github.com/apache/hugegraph) (**[pd](https://github.com/apache/hugegraph/tree/master/hugegraph-pd)/[store](https://github.com/apache/hugegraph/tree/master/hugegraph-store)/[server](https://github.com/apache/hugegraph/tree/master/hugegraph-server)/[commons](https://github.com/apache/hugegraph/tree/master/hugegraph-commons)**)
+2. [hugegraph-computer](https://github.com/apache/hugegraph-computer) (integrated **graph computing** system)
+3. [hugegraph-ai](https://github.com/apache/incubator-hugegraph-ai) (integrated **Graph AI/LLM/KG** system)
+4. [hugegraph-website](https://github.com/apache/hugegraph-doc) (**doc & website** code)
+
+
 ## Doc
 
 The [project homepage](https://hugegraph.apache.org/docs/quickstart/) contains more information about `hugegraph-toolchain`. 
 
 ## License
 
-hugegraph-toolchain is licensed under [Apache 2.0](https://github.com/apache/incubator-hugegraph-toolchain/blob/master/LICENSE) License.
+hugegraph-toolchain is licensed under [Apache 2.0](https://github.com/apache/hugegraph-toolchain/blob/master/LICENSE) License.
 
 ## Contributing
 
 - Welcome to contribute to HugeGraph, please see [How to Contribute](https://hugegraph.apache.org/docs/contribution-guidelines/contribute/) for more information.
 - Note: It's recommended to use [GitHub Desktop](https://desktop.github.com/) to greatly simplify the PR and commit process.
 - Thank you to all the people who already contributed to HugeGraph!
 
-[![contributors graph](https://contrib.rocks/image?repo=apache/hugegraph-toolchain)](https://github.com/apache/incubator-hugegraph-toolchain/graphs/contributors)
+[![contributors graph](https://contrib.rocks/image?repo=apache/hugegraph-toolchain)](https://github.com/apache/hugegraph-toolchain/graphs/contributors)
 
 ### Contact Us
 
 ---
 
- - [GitHub Issues](https://github.com/apache/incubator-hugegraph-toolchain/issues): Feedback on usage issues and functional requirements (quick response)
+ - [GitHub Issues](https://github.com/apache/hugegraph-toolchain/issues): Feedback on usage issues and functional requirements (quick response)
  - Feedback Email: [[email protected]](mailto:[email protected]) ([subscriber](https://hugegraph.apache.org/docs/contribution-guidelines/subscribe/) only)
  - WeChat public account: Apache HugeGraph, welcome to scan this QR code to follow us.
 
- <img src="https://raw.githubusercontent.com/apache/incubator-hugegraph-doc/master/assets/images/wechat.png" alt="QR png" width="350"/>
+ <img src="https://raw.githubusercontent.com/apache/hugegraph-doc/master/assets/images/wechat.png" alt="QR png" width="350"/>
 

hugegraph-hubble/Dockerfile

@@ -17,6 +17,7 @@
 
 FROM maven:3.9.0-eclipse-temurin-11 AS build
 
+ENV NODE_OPTIONS=--dns-result-order=ipv4first
 
 ARG MAVEN_ARGS
 

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/HugeGraphHubble.java

@@ -27,6 +27,9 @@
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
 @SpringBootApplication
 @EnableScheduling
 @MapperScan("org.apache.hugegraph.mapper")
@@ -38,6 +41,8 @@ public static void main(String[] args) {
     }
 
     public static void initEnv() {
+        Ex.check(Charset.defaultCharset().equals(StandardCharsets.UTF_8),
+                "Charset must be UTF-8, current:" + Charset.defaultCharset());
         String hubbleHomePath = System.getProperty("hubble.home.path");
         Ex.check(StringUtils.isNotEmpty(hubbleHomePath),
                  "The system property 'hubble.home.path' must be set");

hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh

@@ -42,7 +42,7 @@ for jar in "${LIB_PATH}"/*.jar; do
     class_path=${class_path}:${jar}
 done
 
-JAVA_OPTS="-Xms512m"
+JAVA_OPTS="-Xms512m -Dfile.encoding=UTF-8"
 JAVA_DEBUG_OPTS=""
 FOREGROUND="false"
 

hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh

@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
+export LANG=zh_CN.UTF-8
 set -ev
 
 if [[ $# -ne 1 ]]; then

hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+export LANG=zh_CN.UTF-8
 set -ev
 
 TRAVIS_DIR=$(dirname "$0")

hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph.sh

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+export LANG=zh_CN.UTF-8
 set -ev
 
 COMMIT_ID=$1

hugegraph-hubble/hubble-dist/assembly/travis/run-api-test.sh

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+export LANG=zh_CN.UTF-8
 set -ev
 
 TRAVIS_DIR="hubble-dist/assembly/travis"

hugegraph-hubble/hubble-dist/assembly/travis/start-hubble.sh

@@ -80,7 +80,7 @@ args=${CONF_PATH}/hugegraph-hubble.properties
 log=${LOG_PATH}/hugegraph-hubble.log
 
 echo -n "starting HugeGraphHubble "
-nohup nice -n 0 java -server "${java_opts}" "${agent_opts}" -Dhubble.home.path="${HOME_PATH}" -cp "${class_path}" ${main_class} "${args}" > "${log}" 2>&1 < /dev/null &
+nohup nice -n 0 java -server -Dfile.encoding=UTF-8 "${java_opts}" "${agent_opts}" -Dhubble.home.path="${HOME_PATH}" -cp "${class_path}" ${main_class} "${args}" > "${log}" 2>&1 < /dev/null &
 pid=$!
 echo ${pid} > "${PID_FILE}"
 

pom.xml

@@ -99,8 +99,7 @@
 
     <properties>
         <revision>1.5.0</revision>
-        <!-- TODO: Update to 1.5.0 later -->
-        <hugegraph.common.version>1.3.0</hugegraph.common.version>
+        <hugegraph.common.version>1.5.0</hugegraph.common.version>
         <release.name>${project.artifactId}</release.name>
         <final.name>apache-${release.name}-incubating-${project.version}</final.name>
         <assembly.dir>${project.basedir}/assembly</assembly.dir>