diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 318175cf4..081ef1021 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -9,11 +9,11 @@ body: attributes: label: Search before asking description: > - Please make sure to search in the [feature](https://github.com/apache/incubator-hugegraph-toolchain/issues?q=is%3Aissue+label%3A%22Feature%22) first + Please make sure to search in the [feature](https://github.com/apache/hugegraph-toolchain/issues?q=is%3Aissue+label%3A%22Feature%22) first to see whether the same feature was requested already. options: - label: > - I had searched in the [feature](https://github.com/apache/incubator-hugegraph-toolchain/issues?q=is%3Aissue+label%3A%22Feature%22) and found no + I had searched in the [feature](https://github.com/apache/hugegraph-toolchain/issues?q=is%3Aissue+label%3A%22Feature%22) and found no similar feature requirement. required: true diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml index 4cdb18363..4cd3f7780 100644 --- a/.github/workflows/hubble-ci.yml +++ b/.github/workflows/hubble-ci.yml @@ -83,7 +83,7 @@ jobs: python -m pip install -r ${TRAVIS_DIR}/requirements.txt cd hugegraph-hubble mvn package -Dmaven.test.skip=true - cd apache-hugegraph-hubble-incubating* + cd apache-hugegraph-hubble-* cd bin ./start-hubble.sh -d ./stop-hubble.sh diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index be557e360..000000000 --- a/DISCLAIMER +++ /dev/null @@ -1,7 +0,0 @@ -Apache HugeGraph (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, -and decision making process have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or stability of the code, -it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/NOTICE b/NOTICE index b1d047e18..001846263 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ -Apache HugeGraph(incubating) -Copyright 2022-2025 The Apache Software Foundation +Apache HugeGraph +Copyright 2022-2026 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index 3395177fd..0a4c38dd1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ A comprehensive suite of client SDKs, data tools, and management utilities for [ **HugeGraph Ecosystem**: 1. [hugegraph](https://github.com/apache/hugegraph) - Core graph database (**[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) - Distributed graph computing system -3. [hugegraph-ai](https://github.com/apache/incubator-hugegraph-ai) - Graph AI/LLM/Knowledge Graph integration +3. [hugegraph-ai](https://github.com/apache/hugegraph-ai) - Graph AI/LLM/Knowledge Graph integration 4. [hugegraph-website](https://github.com/apache/hugegraph-doc) - Documentation and website ## Architecture Overview @@ -191,7 +191,7 @@ client := hugegraph.NewClient("http://localhost:8080", "hugegraph") -> **Looking for other languages?** See [hugegraph-python-client](https://github.com/apache/incubator-hugegraph-ai/tree/main/hugegraph-python-client) in the hugegraph-ai repository. +> **Looking for other languages?** See [hugegraph-python-client](https://github.com/apache/hugegraph-ai/tree/main/hugegraph-python-client) in the hugegraph-ai repository. --- @@ -247,7 +247,7 @@ client := hugegraph.NewClient("http://localhost:8080", "hugegraph") **Quick Start**: ```bash -cd hugegraph-hubble/apache-hugegraph-hubble-incubating-*/bin +cd hugegraph-hubble/apache-hugegraph-hubble-*/bin ./start-hubble.sh # Background mode ./start-hubble.sh -f # Foreground mode ./stop-hubble.sh # Stop server diff --git a/hugegraph-client-go/README.en.md b/hugegraph-client-go/README.en.md index 1b8f37f53..4481f382e 100644 --- a/hugegraph-client-go/README.en.md +++ b/hugegraph-client-go/README.en.md @@ -30,8 +30,8 @@ Go get github. com/go huggraph ```Go package main -import "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" -import "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/hgtransport" +import "github.com/apache/hugegraph-toolchain/hugegraph-client-go" +import "github.com/apache/hugegraph-toolchain/hugegraph-client-go/hgtransport" func main() { diff --git a/hugegraph-client-go/README.md b/hugegraph-client-go/README.md index faf0cc067..4fb07a3a0 100644 --- a/hugegraph-client-go/README.md +++ b/hugegraph-client-go/README.md @@ -11,7 +11,7 @@ #### 安装教程 ```shell -go get github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go +go get github.com/apache/hugegraph-toolchain/hugegraph-client-go ``` #### 实现 API @@ -28,8 +28,8 @@ go get github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go ```go package main -import "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" -import "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/hgtransport" +import "github.com/apache/hugegraph-toolchain/hugegraph-client-go" +import "github.com/apache/hugegraph-toolchain/hugegraph-client-go/hgtransport" func main() { diff --git a/hugegraph-client-go/api/api.go b/hugegraph-client-go/api/api.go index ac1ec92d7..7533121e1 100644 --- a/hugegraph-client-go/api/api.go +++ b/hugegraph-client-go/api/api.go @@ -22,8 +22,8 @@ import ( "strconv" "time" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/hgtransport" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/version" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/hgtransport" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/version" ) // VERSION returns the package version as a string. diff --git a/hugegraph-client-go/api/v1/api.go b/hugegraph-client-go/api/v1/api.go index 09fec0fe0..11de949a6 100644 --- a/hugegraph-client-go/api/v1/api.go +++ b/hugegraph-client-go/api/v1/api.go @@ -17,7 +17,7 @@ package v1 -import "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" +import "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" type APIV1 struct { Version Version diff --git a/hugegraph-client-go/api/v1/edgelabel/edgelabel.go b/hugegraph-client-go/api/v1/edgelabel/edgelabel.go index 5a2d90a24..c22268235 100644 --- a/hugegraph-client-go/api/v1/edgelabel/edgelabel.go +++ b/hugegraph-client-go/api/v1/edgelabel/edgelabel.go @@ -22,8 +22,8 @@ import ( "encoding/json" "errors" "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" "io" "io/ioutil" "net/http" diff --git a/hugegraph-client-go/api/v1/edgelabel/edgelabel_test.go b/hugegraph-client-go/api/v1/edgelabel/edgelabel_test.go index 6709c17af..160d46543 100644 --- a/hugegraph-client-go/api/v1/edgelabel/edgelabel_test.go +++ b/hugegraph-client-go/api/v1/edgelabel/edgelabel_test.go @@ -19,11 +19,11 @@ package edgelabel_test import ( "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/edgelabel" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/vertexlabel" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/edgelabel" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/vertexlabel" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" "math/rand" "testing" "time" diff --git a/hugegraph-client-go/api/v1/gremlin/gemlin.go b/hugegraph-client-go/api/v1/gremlin/gemlin.go index 5be0f42b0..a2c3112bf 100644 --- a/hugegraph-client-go/api/v1/gremlin/gemlin.go +++ b/hugegraph-client-go/api/v1/gremlin/gemlin.go @@ -23,7 +23,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" "io" "io/ioutil" "net/http" diff --git a/hugegraph-client-go/api/v1/gremlin/gemlin_test.go b/hugegraph-client-go/api/v1/gremlin/gemlin_test.go index c8cddd675..d880c8878 100644 --- a/hugegraph-client-go/api/v1/gremlin/gemlin_test.go +++ b/hugegraph-client-go/api/v1/gremlin/gemlin_test.go @@ -20,7 +20,7 @@ package gremlin_test import ( "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go" "log" "testing" ) diff --git a/hugegraph-client-go/api/v1/propertykey/propertykey.go b/hugegraph-client-go/api/v1/propertykey/propertykey.go index 125d9a088..499bb3d2d 100644 --- a/hugegraph-client-go/api/v1/propertykey/propertykey.go +++ b/hugegraph-client-go/api/v1/propertykey/propertykey.go @@ -22,8 +22,8 @@ import ( "encoding/json" "errors" "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" "io" "io/ioutil" "net/http" diff --git a/hugegraph-client-go/api/v1/propertykey/propertykey_test.go b/hugegraph-client-go/api/v1/propertykey/propertykey_test.go index 14e1e99c3..84b9f81c3 100644 --- a/hugegraph-client-go/api/v1/propertykey/propertykey_test.go +++ b/hugegraph-client-go/api/v1/propertykey/propertykey_test.go @@ -19,9 +19,9 @@ package propertykey_test import ( "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" "log" "math/rand" "testing" diff --git a/hugegraph-client-go/api/v1/schema.go b/hugegraph-client-go/api/v1/schema.go index ebe237ffb..1db7333f1 100644 --- a/hugegraph-client-go/api/v1/schema.go +++ b/hugegraph-client-go/api/v1/schema.go @@ -21,12 +21,12 @@ import ( "context" "encoding/json" "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/hgtransport" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/hgtransport" "io" "io/ioutil" "net/http" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" ) // ----- API Definition ------------------------------------------------------- diff --git a/hugegraph-client-go/api/v1/schema_test.go b/hugegraph-client-go/api/v1/schema_test.go index 47daab74f..6e9362e6c 100644 --- a/hugegraph-client-go/api/v1/schema_test.go +++ b/hugegraph-client-go/api/v1/schema_test.go @@ -19,7 +19,7 @@ package v1_test import ( "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go" "log" "testing" ) diff --git a/hugegraph-client-go/api/v1/version.go b/hugegraph-client-go/api/v1/version.go index e3a55990f..1db8334b0 100644 --- a/hugegraph-client-go/api/v1/version.go +++ b/hugegraph-client-go/api/v1/version.go @@ -20,12 +20,12 @@ package v1 import ( "context" "encoding/json" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/hgtransport" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/hgtransport" "io" "io/ioutil" "net/http" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" ) // ----- API Definition ------------------------------------------------------- diff --git a/hugegraph-client-go/api/v1/version_test.go b/hugegraph-client-go/api/v1/version_test.go index 623098852..9c8b23904 100644 --- a/hugegraph-client-go/api/v1/version_test.go +++ b/hugegraph-client-go/api/v1/version_test.go @@ -20,7 +20,7 @@ package v1_test import ( "testing" - hugegraph "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" + hugegraph "github.com/apache/hugegraph-toolchain/hugegraph-client-go" ) func TestVersionRequest_Do(t *testing.T) { diff --git a/hugegraph-client-go/api/v1/vertex/vertex.go b/hugegraph-client-go/api/v1/vertex/vertex.go index 0e2a3c521..a7975a851 100644 --- a/hugegraph-client-go/api/v1/vertex/vertex.go +++ b/hugegraph-client-go/api/v1/vertex/vertex.go @@ -22,8 +22,8 @@ import ( "context" "encoding/json" "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" "io" "io/ioutil" "net/http" diff --git a/hugegraph-client-go/api/v1/vertexlabel/vertexlabel.go b/hugegraph-client-go/api/v1/vertexlabel/vertexlabel.go index 76bc3e0d3..8825b95c6 100644 --- a/hugegraph-client-go/api/v1/vertexlabel/vertexlabel.go +++ b/hugegraph-client-go/api/v1/vertexlabel/vertexlabel.go @@ -28,8 +28,8 @@ import ( "net/url" "strings" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" ) type VertexLabel struct { diff --git a/hugegraph-client-go/api/v1/vertexlabel/vertexlabel_test.go b/hugegraph-client-go/api/v1/vertexlabel/vertexlabel_test.go index 5289434d9..de07e481d 100644 --- a/hugegraph-client-go/api/v1/vertexlabel/vertexlabel_test.go +++ b/hugegraph-client-go/api/v1/vertexlabel/vertexlabel_test.go @@ -19,10 +19,10 @@ package vertexlabel_test import ( "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/vertexlabel" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/model" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/vertexlabel" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/model" "math/rand" "testing" "time" diff --git a/hugegraph-client-go/go.mod b/hugegraph-client-go/go.mod index d45b4200e..01e22ea8e 100644 --- a/hugegraph-client-go/go.mod +++ b/hugegraph-client-go/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go +module github.com/apache/hugegraph-toolchain/hugegraph-client-go go 1.19 diff --git a/hugegraph-client-go/hgtransport/hgtransport.go b/hugegraph-client-go/hgtransport/hgtransport.go index 8c669c8be..2f52bb40a 100644 --- a/hugegraph-client-go/hgtransport/hgtransport.go +++ b/hugegraph-client-go/hgtransport/hgtransport.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/internal/version" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/internal/version" ) // Version returns the package version as a string. diff --git a/hugegraph-client-go/hugegraph.go b/hugegraph-client-go/hugegraph.go index 910f836bd..5e5a5f305 100644 --- a/hugegraph-client-go/hugegraph.go +++ b/hugegraph-client-go/hugegraph.go @@ -20,18 +20,18 @@ package hugegraph import ( "errors" "fmt" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/edgelabel" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/gremlin" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/vertex" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/api/v1/vertexlabel" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/edgelabel" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/gremlin" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/propertykey" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/vertex" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/api/v1/vertexlabel" "net" "net/http" "net/url" "os" - "github.com/apache/incubator-hugegraph-toolchain/hugegraph-client-go/hgtransport" + "github.com/apache/hugegraph-toolchain/hugegraph-client-go/hgtransport" ) // Config 配置类型 diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh index aa48dda46..d7b74aff9 100755 --- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh @@ -28,7 +28,6 @@ git clone --depth 150 ${HUGEGRAPH_GIT_URL} hugegraph cd hugegraph git checkout "${COMMIT_ID}" mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp -# TODO: lack incubator after apache package release (update it later) cd hugegraph-server mv apache-hugegraph-*.tar.gz ../../ cd ../../ @@ -37,7 +36,6 @@ tar zxf apache-hugegraph-*.tar.gz HTTPS_SERVER_DIR="hugegraph_https" mkdir ${HTTPS_SERVER_DIR} -# TODO: lack incubator after apache package release (update it later) cp -r apache-hugegraph-*/. ${HTTPS_SERVER_DIR} cd "$(find apache-hugegraph-* | head -1)" # start HugeGraphServer with http protocol diff --git a/hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java b/hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java index f430fd07c..67ee71fac 100644 --- a/hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java @@ -26,7 +26,7 @@ public final class CommonUtil { - public static final String PREFIX = "https://github.com/apache/incubator-hugegraph-doc/" + + public static final String PREFIX = "https://github.com/apache/hugegraph-doc/" + "raw/binary/dist/toolchain/"; public static void checkMapClass(Object object, Class kClass, diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index bedb10535..03d28150c 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -31,7 +31,7 @@ ${project.parent.artifactId} - apache-${release.name}-incubating-${project.version} + apache-${release.name}-${project.version} @@ -52,10 +52,10 @@ cd $root_path || exit mkdir -p ${final.name} - mv -v $root_path/hugegraph-hubble/apache-hugegraph-hubble-incubating-${project.version} ${final.name}/ || exit - mv -v $root_path/hugegraph-loader/apache-hugegraph-loader-incubating-${project.version} ${final.name}/ || exit - mv -v $root_path/hugegraph-tools/apache-hugegraph-tools-incubating-${project.version} ${final.name}/ || exit - cp -r -v $root_path/hugegraph-dist/release-docs/* $root_path/DISCLAIMER ${final.name}/ || exit + mv -v $root_path/hugegraph-hubble/apache-hugegraph-hubble-${project.version} ${final.name}/ || exit + mv -v $root_path/hugegraph-loader/apache-hugegraph-loader-${project.version} ${final.name}/ || exit + mv -v $root_path/hugegraph-tools/apache-hugegraph-tools-${project.version} ${final.name}/ || exit + cp -r -v $root_path/hugegraph-dist/release-docs/* ${final.name}/ || exit tar zcvf $root_path/target/${final.name}.tar.gz ./${final.name} || exit 1 diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index 3450cbb44..7543d0822 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -203,9 +203,9 @@ ============================================================================ - APACHE HUGEGRAPH (Incubating) SUBCOMPONENTS: + APACHE HUGEGRAPH SUBCOMPONENTS: - The Apache HugeGraph(Incubating) project contains subcomponents with separate copyright + The Apache HugeGraph project contains subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. diff --git a/hugegraph-dist/release-docs/NOTICE b/hugegraph-dist/release-docs/NOTICE index e0f4eb142..d268ded9b 100644 --- a/hugegraph-dist/release-docs/NOTICE +++ b/hugegraph-dist/release-docs/NOTICE @@ -1,5 +1,5 @@ -Apache HugeGraph(incubating) -Copyright 2022-2025 The Apache Software Foundation +Apache HugeGraph +Copyright 2022-2026 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/hugegraph-dist/scripts/apache-release.sh b/hugegraph-dist/scripts/apache-release.sh index 9d36366c8..75a2fa4a6 100755 --- a/hugegraph-dist/scripts/apache-release.sh +++ b/hugegraph-dist/scripts/apache-release.sh @@ -41,14 +41,14 @@ rm -rf dist && mkdir -p dist/apache-${REPO} # step1: package the source code cd ../../ || exit git archive --format=tar.gz \ - --output="${GROUP}-dist/scripts/dist/apache-${REPO}/apache-${REPO}-incubating-${RELEASE_VERSION}-src.tar.gz" \ - --prefix="apache-${REPO}-incubating-${RELEASE_VERSION}-src/" "${GIT_BRANCH}" || exit + --output="${GROUP}-dist/scripts/dist/apache-${REPO}/apache-${REPO}-${RELEASE_VERSION}-src.tar.gz" \ + --prefix="apache-${REPO}-${RELEASE_VERSION}-src/" "${GIT_BRANCH}" || exit cd - || exit # step2: copy the binary file (Optional) # Note: it's optional for project to generate binary package (skip this step if not need) -cp -v ../../target/apache-${REPO}-incubating-"${RELEASE_VERSION}".tar.gz \ +cp -v ../../target/apache-${REPO}-"${RELEASE_VERSION}".tar.gz \ dist/apache-${REPO} || exit # step3: sign + hash @@ -83,7 +83,7 @@ cd ../ rm -rfv ${SVN_DIR} ##### 4.1 pull from remote & copy files -svn co "https://dist.apache.org/repos/dist/dev/incubator/${GROUP}" ${SVN_DIR} +svn co "https://dist.apache.org/repos/dist/dev/${GROUP}" ${SVN_DIR} mkdir -p ${SVN_DIR}/"${RELEASE_VERSION}" cp -v apache-${REPO}/*tar.gz* "${SVN_DIR}/${RELEASE_VERSION}" cd ${SVN_DIR} || exit diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 6e9164f5e..377b6fb41 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -37,7 +37,7 @@ RUN set -x \ FROM eclipse-temurin:11-jre-jammy -COPY --from=build /pkg/hugegraph-hubble/apache-hugegraph-hubble-incubating-*/ /hubble +COPY --from=build /pkg/hugegraph-hubble/apache-hugegraph-hubble-*/ /hubble WORKDIR /hubble/ EXPOSE 8088 diff --git a/hugegraph-hubble/README.md b/hugegraph-hubble/README.md index c9392f5e3..6b03d5aff 100644 --- a/hugegraph-hubble/README.md +++ b/hugegraph-hubble/README.md @@ -1,8 +1,8 @@ # Apache HugeGraph-Hubble [![License](https://img.shields.io/badge/license-Apache%202-0E78BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) -[![hugegraph-hubble-ci](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/hubble-ci.yml/badge.svg?branch=master)](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/hubble-ci.yml) -[![CodeQL](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/codeql-analysis.yml) +[![hugegraph-hubble-ci](https://github.com/apache/hugegraph-toolchain/actions/workflows/hubble-ci.yml/badge.svg?branch=master)](https://github.com/apache/hugegraph-toolchain/actions/workflows/hubble-ci.yml) +[![CodeQL](https://github.com/apache/hugegraph-toolchain/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/hugegraph-toolchain/actions/workflows/codeql-analysis.yml) hugegraph-hubble is a graph management and analysis platform that provides features: graph data load, schema management, graph relationship analysis, and graphical display. @@ -29,9 +29,9 @@ And you can find more details in the [doc](https://hugegraph.apache.org/docs/qui `hubble` is in the `toolchain` project. First, download the binary tar tarball ```bash -wget https://downloads.apache.org/incubator/hugegraph/{version}/apache-hugegraph-toolchain-incubating-{version}.tar.gz -tar -xvf apache-hugegraph-toolchain-incubating-{version}.tar.gz -cd apache-hugegraph-toolchain-incubating-{version}.tar.gz/apache-hugegraph-hubble-incubating-{version} +wget https://downloads.apache.org/hugegraph/{version}/apache-hugegraph-toolchain-{version}.tar.gz +tar -xvf apache-hugegraph-toolchain-{version}.tar.gz +cd apache-hugegraph-toolchain-{version}/apache-hugegraph-hubble-{version} ``` Run `hubble`: @@ -74,12 +74,12 @@ git clone https://github.com/apache/hugegraph-toolchain.git Compile `hubble`. It depends on the loader and client, so you need to build these dependencies in advance during the compilation process (you can skip this step later). ```bash -cd incubator-hugegraph-toolchain +cd hugegraph-toolchain sudo pip install -r hugegraph-hubble/hubble-dist/assembly/travis/requirements.txt mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp cd hugegraph-hubble mvn -e compile package -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp -cd apache-hugegraph-hubble-incubating* +cd apache-hugegraph-hubble-* ``` Run `hubble` diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh index 7e9c40eb4..8cce7d092 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh @@ -32,7 +32,6 @@ cd "${GIT_DIR}" git checkout "${COMMIT_ID}" mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp -# TODO: lack incubator after apache package release (update it later) cd hugegraph-server TAR=$(echo apache-hugegraph-*.tar.gz) cp apache-hugegraph-*.tar.gz ../../ diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml index 66335e06f..61f29d3b9 100644 --- a/hugegraph-hubble/hubble-dist/pom.xml +++ b/hugegraph-hubble/hubble-dist/pom.xml @@ -27,7 +27,7 @@ ${project.parent.artifactId} - apache-${release.name}-incubating-${project.version} + apache-${release.name}-${project.version} ${project.basedir}/.. ${project.basedir} ${current.basedir}/assembly diff --git a/hugegraph-hubble/package.json b/hugegraph-hubble/package.json index bf26f8771..a6087977d 100644 --- a/hugegraph-hubble/package.json +++ b/hugegraph-hubble/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/apache/incubator-hugegraph-toolchain" + "url": "https://github.com/apache/hugegraph-toolchain" }, "husky": { "hooks": { diff --git a/hugegraph-loader/Dockerfile b/hugegraph-loader/Dockerfile index c923327d9..85f609296 100644 --- a/hugegraph-loader/Dockerfile +++ b/hugegraph-loader/Dockerfile @@ -32,7 +32,7 @@ RUN set -x \ FROM eclipse-temurin:11-jre-jammy -COPY --from=build /pkg/hugegraph-loader/apache-hugegraph-loader-incubating-*/ /loader +COPY --from=build /pkg/hugegraph-loader/apache-hugegraph-loader-*/ /loader WORKDIR /loader/ RUN set -x \ diff --git a/hugegraph-loader/README.md b/hugegraph-loader/README.md index 6460a7bd9..08abfde2e 100644 --- a/hugegraph-loader/README.md +++ b/hugegraph-loader/README.md @@ -30,7 +30,7 @@ And you can find more details in the [doc](https://hugegraph.apache.org/docs/qui Download the latest version of the HugeGraph-Toolchain release package: ``` bash -wget https://downloads.apache.org/incubator/hugegraph/{version}/apache-hugegraph-toolchain-incubating-{version}.tar.gz +wget https://downloads.apache.org/hugegraph/{version}/apache-hugegraph-toolchain-{version}.tar.gz tar zxf *hugegraph*.tar.gz ``` @@ -43,7 +43,7 @@ Clone the latest version of HugeGraph-Loader source package: git clone https://github.com/apache/hugegraph-toolchain.git # 2. get from direct (e.g. here is 1.0.0, please choose the latest version) -wget https://downloads.apache.org/incubator/hugegraph/{version}/apache-hugegraph-toolchain-incubating-{version}-src.tar.gz +wget https://downloads.apache.org/hugegraph/{version}/apache-hugegraph-toolchain-{version}-src.tar.gz ``` Due to the license limitation of the `Oracle OJDBC`, you need to manually install ojdbc to the local maven repository. Visit the [Oracle jdbc downloads page](https://www.oracle.com/database/technologies/appdev/jdbc-drivers-archive.html). Select Oracle Database 12c Release 2 (12.2.0.1) drivers, as shown in the following figure. @@ -90,15 +90,15 @@ The example `docker-compose.yml` is [here](./docker/example/docker-compose.yml). Download and unzip the compiled archive ```bash -wget https://downloads.apache.org/incubator/hugegraph/{version}/apache-hugegraph-toolchain-incubating-{version}.tar.gz +wget https://downloads.apache.org/hugegraph/{version}/apache-hugegraph-toolchain-{version}.tar.gz tar zxf *hugegraph*.tar.gz ``` Then, load data with example file: ```bash -cd apache-hugegraph-toolchain-incubating-{version} -cd apache-hugegraph-loader-incubating-{version} +cd apache-hugegraph-toolchain-{version} +cd apache-hugegraph-loader-{version} sh bin/hugegraph-loader.sh -g hugegraph -f example/file/struct.json -s example/file/schema.groovy ``` diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh index 3cba191f5..354acd958 100755 --- a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh @@ -28,7 +28,6 @@ git clone --depth 150 ${HUGEGRAPH_GIT_URL} hugegraph cd hugegraph git checkout "${COMMIT_ID}" mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp -# TODO: lack incubator after apache package release (update it later) cd hugegraph-server mv apache-hugegraph-*.tar.gz ../../ cd ../../ @@ -37,7 +36,6 @@ tar zxf apache-hugegraph-*.tar.gz HTTPS_SERVER_DIR="hugegraph_https" mkdir ${HTTPS_SERVER_DIR} -# TODO: lack incubator after apache package release (update it later) cp -r apache-hugegraph-*/. ${HTTPS_SERVER_DIR} cd "$(find apache-hugegraph-* | head -1)" # start HugeGraphServer with http protocol diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh b/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh index afe1c859f..07a4bb335 100755 --- a/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh +++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh @@ -25,12 +25,10 @@ VERSION=$1 HUGEGRAPH_LINK="https://github.com/hugegraph/hugegraph/releases/download/v${VERSION}/hugegraph-${VERSION}.tar.gz" wget "${HUGEGRAPH_LINK}" || exit 1 -# TODO: lack incubator after apache package release (update it later) tar zxvf hugegraph-${VERSION}.tar.gz HTTPS_SERVER_DIR="hugegraph_https" mkdir ${HTTPS_SERVER_DIR} -# TODO: lack incubator after apache package release (update it later) cp -r hugegraph-${VERSION}/. ${HTTPS_SERVER_DIR} cd hugegraph-${VERSION} diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index e3924bfde..29272b2b5 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -39,7 +39,7 @@ ${project.artifactId} - apache-${release.name}-incubating-${project.version} + apache-${release.name}-${project.version} ${project.basedir}/assembly ${assembly.dir}/descriptor ${assembly.dir}/static diff --git a/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-source.sh index 3cba191f5..354acd958 100755 --- a/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-source.sh @@ -28,7 +28,6 @@ git clone --depth 150 ${HUGEGRAPH_GIT_URL} hugegraph cd hugegraph git checkout "${COMMIT_ID}" mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp -# TODO: lack incubator after apache package release (update it later) cd hugegraph-server mv apache-hugegraph-*.tar.gz ../../ cd ../../ @@ -37,7 +36,6 @@ tar zxf apache-hugegraph-*.tar.gz HTTPS_SERVER_DIR="hugegraph_https" mkdir ${HTTPS_SERVER_DIR} -# TODO: lack incubator after apache package release (update it later) cp -r apache-hugegraph-*/. ${HTTPS_SERVER_DIR} cd "$(find apache-hugegraph-* | head -1)" # start HugeGraphServer with http protocol diff --git a/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-tar.sh b/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-tar.sh index 00f388bf0..e570e3d17 100755 --- a/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-tar.sh +++ b/hugegraph-spark-connector/assembly/travis/install-hugegraph-from-tar.sh @@ -22,11 +22,11 @@ if [[ $# -ne 1 ]]; then fi VERSION=$1 -HUGEGRAPH_LINK="https://downloads.apache.org/incubator/hugegraph/${VERSION}/apache-hugegraph-incubating-${VERSION}.tar.gz" +HUGEGRAPH_LINK="https://downloads.apache.org/hugegraph/${VERSION}/apache-hugegraph-${VERSION}.tar.gz" wget "${HUGEGRAPH_LINK}" -q --show-progress || exit 1 -tar zxvf apache-hugegraph-incubating-${VERSION}.tar.gz -cd apache-hugegraph-incubating-${VERSION} +tar zxvf apache-hugegraph-${VERSION}.tar.gz +cd apache-hugegraph-${VERSION} ## start HugeGraphServer with http protocol bin/init-store.sh diff --git a/hugegraph-spark-connector/pom.xml b/hugegraph-spark-connector/pom.xml index 1ce5b6d22..aef8407e5 100644 --- a/hugegraph-spark-connector/pom.xml +++ b/hugegraph-spark-connector/pom.xml @@ -49,7 +49,7 @@ ${project.basedir}/assembly ${assembly.dir}/descriptor ${project.artifactId} - apache-${release.name}-incubating-${project.version} + apache-${release.name}-${project.version} diff --git a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh index 3cba191f5..354acd958 100755 --- a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh @@ -28,7 +28,6 @@ git clone --depth 150 ${HUGEGRAPH_GIT_URL} hugegraph cd hugegraph git checkout "${COMMIT_ID}" mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp -# TODO: lack incubator after apache package release (update it later) cd hugegraph-server mv apache-hugegraph-*.tar.gz ../../ cd ../../ @@ -37,7 +36,6 @@ tar zxf apache-hugegraph-*.tar.gz HTTPS_SERVER_DIR="hugegraph_https" mkdir ${HTTPS_SERVER_DIR} -# TODO: lack incubator after apache package release (update it later) cp -r apache-hugegraph-*/. ${HTTPS_SERVER_DIR} cd "$(find apache-hugegraph-* | head -1)" # start HugeGraphServer with http protocol diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml index e49c5ae28..80787453e 100644 --- a/hugegraph-tools/pom.xml +++ b/hugegraph-tools/pom.xml @@ -29,12 +29,12 @@ hugegraph-tools jar - https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-tools + https://github.com/apache/hugegraph-toolchain/tree/master/hugegraph-tools ${project.artifactId} ${project.artifactId} - apache-${release.name}-incubating-${project.version} + apache-${release.name}-${project.version} ${project.basedir}/assembly ${assembly.dir}/descriptor bash diff --git a/pom.xml b/pom.xml index d9413db92..f64ad728a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ pom ${project.artifactId} - https://github.com/apache/incubator-hugegraph-toolchain + https://github.com/apache/hugegraph-toolchain hugegraph-toolchain is the integration project contains a series of utilities for HugeGraph, it includes 5+ main modules (loader/hubble/tools/clients/data connector) @@ -48,7 +48,7 @@ - Apache HugeGraph(Incubating) + Apache HugeGraph dev-subscribe@hugegraph.apache.org https://hugegraph.apache.org/ @@ -59,7 +59,7 @@ Developer List dev-subscribe@hugegraph.apache.org dev-unsubscribe@hugegraph.apache.org - dev@hugegraph.incubator.apache.org + dev@hugegraph.apache.org Commits List @@ -102,7 +102,7 @@ 1.5.0 ${project.artifactId} - apache-${release.name}-incubating-${project.version} + apache-${release.name}-${project.version} ${project.basedir}/assembly ${assembly.dir}/descriptor ${assembly.dir}/static @@ -565,7 +565,7 @@ **/*.txt **/.flattened-pom.xml **/hubble-fe/**/* - **/apache-hugegraph-hubble-incubating-*/**/* + **/apache-hugegraph-hubble-*/**/*