This is an automated email from the ASF dual-hosted git repository. jin pushed a commit to branch readme in repository https://gitbox.apache.org/repos/asf/hugegraph.git
commit fcbaa5ac068771c96579de43154665064064ea03 Author: imbajin <[email protected]> AuthorDate: Tue Mar 10 14:36:37 2026 +0800 chore: remove 'incubating' branding, update docs & packaging Replace references to 'incubator'/'incubating' across the repo to the final 'hugegraph' branding and packaging names. Updates include: removal of DISCLAIMER, NOTICE year bump, README and docs link/badge fixes, pom final.name changes (remove -incubating suffix), Dockerfile and assembly scripts adjusted to new package paths, numerous docs and tests updated to new URLs/paths, mailing list/contact updates, and minor serena project.yml additions. --- .serena/project.yml | 20 ++++++++++++++++++++ CONTRIBUTING.md | 18 +++++++++--------- DISCLAIMER | 7 ------- NOTICE | 4 ++-- README.md | 14 +++++++------- .../apache/hugegraph/ct/base/ClusterConstant.java | 8 ++++---- .../MultiClusterTest/BaseMultiClusterTest.java | 2 +- .../hugegraph/SimpleClusterTest/BaseSimpleTest.java | 2 +- hugegraph-cluster-test/pom.xml | 2 +- hugegraph-commons/README.md | 10 +++++----- hugegraph-commons/hugegraph-common/pom.xml | 2 +- .../apache/hugegraph/unit/rest/RestClientTest.java | 4 ++-- hugegraph-commons/pom.xml | 4 ++-- hugegraph-pd/AGENTS.md | 6 +++--- hugegraph-pd/Dockerfile | 2 +- hugegraph-pd/pom.xml | 2 +- hugegraph-server/Dockerfile | 2 +- hugegraph-server/Dockerfile-hstore | 2 +- hugegraph-server/hugegraph-dist/docker/README.md | 2 +- hugegraph-server/hugegraph-dist/pom.xml | 2 +- .../src/assembly/travis/run-api-test-for-raft.sh | 2 +- .../src/assembly/travis/run-api-test.sh | 4 ++-- .../hugegraph-dist/src/assembly/travis/start-pd.sh | 2 +- .../src/assembly/travis/start-store.sh | 2 +- hugegraph-server/pom.xml | 2 +- hugegraph-store/Dockerfile | 2 +- hugegraph-store/README.md | 4 ++-- hugegraph-store/docs/deployment-guide.md | 14 +++++++------- hugegraph-store/docs/development-guide.md | 6 +++--- hugegraph-store/docs/operations-guide.md | 18 +++++++++--------- hugegraph-store/pom.xml | 2 +- install-dist/pom.xml | 8 ++++---- install-dist/release-docs/LICENSE | 4 ++-- install-dist/release-docs/NOTICE | 4 ++-- install-dist/scripts/apache-release.sh | 8 ++++---- pom.xml | 4 ++-- 36 files changed, 107 insertions(+), 94 deletions(-) diff --git a/.serena/project.yml b/.serena/project.yml index 16ccb1169..d4fd762ad 100644 --- a/.serena/project.yml +++ b/.serena/project.yml @@ -103,3 +103,23 @@ default_modes: # fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools. # This cannot be combined with non-empty excluded_tools or included_optional_tools. fixed_tools: [] + +# override of the corresponding setting in serena_config.yml, see the documentation there. +# If null or missing, the value from the global config is used. +symbol_info_budget: + +# The language backend to use for this project. +# If not set, the global setting from serena_config.yml is used. +# Valid values: LSP, JetBrains +# Note: the backend is fixed at startup. If a project with a different backend +# is activated post-init, an error will be returned. +language_backend: + +# list of regex patterns which, when matched, mark a memory entry as read‑only. +# Extends the list from the global configuration, merging the two lists. +read_only_memory_patterns: [] + +# line ending convention to use when writing source files. +# Possible values: unset (use global setting), "lf", "crlf", or "native" (platform default) +# This does not affect Serena's own files (e.g. memories and configuration files), which always use native line endings. +line_ending: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f06c8beaf..47c9a72f2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,13 +19,13 @@ Before submitting the code, we need to do some preparation: 1. Sign up or login to GitHub: [https://github.com](https://github.com) -2. Fork HugeGraph repo from GitHub: [https://github.com/apache/incubator-hugegraph/fork](https://github.com/apache/incubator-hugegraph/fork) +2. Fork HugeGraph repo from GitHub: [https://github.com/apache/hugegraph/fork](https://github.com/apache/hugegraph/fork) -3. Clone code from fork repo to local: [https://github.com/${GITHUB_USER_NAME}/incubator-hugegraph](https://github.com/${GITHUB_USER_NAME}/incubator-hugegraph) +3. Clone code from fork repo to local: [https://github.com/${GITHUB_USER_NAME}/hugegraph](https://github.com/${GITHUB_USER_NAME}/hugegraph) ```shell # clone code from remote to local repo - git clone https://github.com/${GITHUB_USER_NAME}/incubator-hugegraph.git hugegraph + git clone https://github.com/${GITHUB_USER_NAME}/hugegraph.git hugegraph ``` 4. Configure local HugeGraph repo @@ -34,7 +34,7 @@ Before submitting the code, we need to do some preparation: cd hugegraph # add upstream to synchronize the latest code - git remote add hugegraph https://github.com/apache/incubator-hugegraph + git remote add hugegraph https://github.com/apache/hugegraph # set name and email to push code to github git config user.name "{full-name}" # like "Jermy Li" @@ -43,7 +43,7 @@ Before submitting the code, we need to do some preparation: ## 2. Create an Issue on GitHub -If you encounter bugs or have any questions, please go to [GitHub Issues](https://github.com/apache/incubator-hugegraph/issues) to report them and feel free to [create an issue](https://github.com/apache/incubator-hugegraph/issues/new). +If you encounter bugs or have any questions, please go to [GitHub Issues](https://github.com/apache/hugegraph/issues) to report them and feel free to [create an issue](https://github.com/apache/hugegraph/issues/new). ## 3. Make changes of code locally @@ -75,10 +75,10 @@ Note: Code style is defined by the `.editorconfig` file at the repository root. ##### 3.2.1 Check licenses If we want to add new third-party dependencies to the `HugeGraph` project, we need to do the following things: -1. Find the third-party dependent repository, put the dependent `license` file into [./hugegraph-dist/release-docs/licenses/](https://github.com/apache/incubator-hugegraph/tree/master/hugegraph-dist/release-docs/licenses) path. -2. Declare the dependency in [./install-dist/release-docs/LICENSE](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/release-docs/LICENSE) `LICENSE` information. -3. Find the NOTICE file in the repository and append it to [./install-dist/release-docs/NOTICE](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/release-docs/NOTICE) file (skip this step if there is no NOTICE file). -4. Execute locally [./install-dist/scripts/dependency/regenerate_known_dependencies.sh](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/scripts/dependency/regenerate_known_dependencies.sh) to update the dependency list [known-dependencies.txt](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/scripts/dependency/known-dependencies.txt) (or manually update). +1. Find the third-party dependent repository, put the dependent `license` file into [./hugegraph-dist/release-docs/licenses/](https://github.com/apache/hugegraph/tree/master/hugegraph-dist/release-docs/licenses) path. +2. Declare the dependency in [./install-dist/release-docs/LICENSE](https://github.com/apache/hugegraph/blob/master/install-dist/release-docs/LICENSE) `LICENSE` information. +3. Find the NOTICE file in the repository and append it to [./install-dist/release-docs/NOTICE](https://github.com/apache/hugegraph/blob/master/install-dist/release-docs/NOTICE) file (skip this step if there is no NOTICE file). +4. Execute locally [./install-dist/scripts/dependency/regenerate_known_dependencies.sh](https://github.com/apache/hugegraph/blob/master/install-dist/scripts/dependency/regenerate_known_dependencies.sh) to update the dependency list [known-dependencies.txt](https://github.com/apache/hugegraph/blob/master/install-dist/scripts/dependency/known-dependencies.txt) (or manually update). **Example**: A new third-party dependency is introduced into the project -> `ant-1.9.1.jar` - The project source code is located at: https://github.com/apache/ant/tree/rel/1.9.1 diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index be718eef3..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 aa6764af8..8e48b813b 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 c027cda43..fd0d5224a 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ <div align="center"> [](https://www.apache.org/licenses/LICENSE-2.0.html) -[](https://github.com/apache/incubator-hugegraph/actions/workflows/ci.yml) -[](https://github.com/apache/incubator-hugegraph/actions/workflows/licence-checker.yml) +[](https://github.com/apache/hugegraph/actions/workflows/ci.yml) +[](https://github.com/apache/hugegraph/actions/workflows/licence-checker.yml) [](https://github.com/apache/hugegraph/releases) [](https://deepwiki.com/apache/hugegraph) @@ -48,7 +48,7 @@ Complete **HugeGraph** ecosystem components: 2. **[hugegraph-computer](https://github.com/apache/hugegraph-computer)** - Integrated **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 & website** repository @@ -223,9 +223,9 @@ Download pre-built packages from the [Download Page](https://hugegraph.apache.or ```bash # Download and extract -wget https://downloads.apache.org/incubator/hugegraph/{version}/apache-hugegraph-incubating-{version}.tar.gz -tar -xzf apache-hugegraph-incubating-{version}.tar.gz -cd apache-hugegraph-incubating-{version} +wget https://downloads.apache.org/hugegraph/{version}/apache-hugegraph-{version}.tar.gz +tar -xzf apache-hugegraph-{version}.tar.gz +cd apache-hugegraph-{version} # Initialize backend storage bin/init-store.sh @@ -363,7 +363,7 @@ Welcome to contribute to HugeGraph! Thank you to all the contributors who have helped make HugeGraph better! -[](https://github.com/apache/incubator-hugegraph/graphs/contributors) +[](https://github.com/apache/hugegraph/graphs/contributors) ## License diff --git a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java index 9120c0cf9..730bbc53e 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java @@ -33,12 +33,12 @@ public class ClusterConstant { public static final String PLUGINS_DIR = "plugins"; public static final String BIN_DIR = "bin"; public static final String CONF_DIR = "conf"; - public static final String PD_PACKAGE_PREFIX = "apache-hugegraph-pd-incubating"; + public static final String PD_PACKAGE_PREFIX = "apache-hugegraph-pd"; public static final String PD_JAR_PREFIX = "hg-pd-service"; - public static final String STORE_PACKAGE_PREFIX = "apache-hugegraph-store-incubating"; + public static final String STORE_PACKAGE_PREFIX = "apache-hugegraph-store"; public static final String STORE_JAR_PREFIX = "hg-store-node"; - public static final String SERVER_PACKAGE_PREFIX = "apache-hugegraph-server-incubating"; - public static final String CT_PACKAGE_PREFIX = "apache-hugegraph-ct-incubating"; + public static final String SERVER_PACKAGE_PREFIX = "apache-hugegraph-server"; + public static final String CT_PACKAGE_PREFIX = "apache-hugegraph-ct"; public static final String APPLICATION_FILE = "application.yml"; public static final String SERVER_PROPERTIES = "rest-server.properties"; public static final String HUGEGRAPH_PROPERTIES = "graphs/hugegraph.properties"; diff --git a/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/MultiClusterTest/BaseMultiClusterTest.java b/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/MultiClusterTest/BaseMultiClusterTest.java index af640b3a9..9e9093302 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/MultiClusterTest/BaseMultiClusterTest.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/MultiClusterTest/BaseMultiClusterTest.java @@ -38,7 +38,7 @@ import jakarta.ws.rs.core.Response; * MultiNode Test generate the cluster env with 3 pd node + 3 store node + 3 server node. * Or you can set different num of nodes by using env = new MultiNodeEnv(pdNum, storeNum, serverNum) * All nodes are deployed in ports generated randomly, the application of nodes are stored - * in /apache-hugegraph-ct-incubating-1.7.0, you can visit each node with rest api. + * in /apache-hugegraph-ct-1.7.0, you can visit each node with rest api. */ public class BaseMultiClusterTest { diff --git a/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/SimpleClusterTest/BaseSimpleTest.java b/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/SimpleClusterTest/BaseSimpleTest.java index 849b4b835..f0f0c3346 100644 --- a/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/SimpleClusterTest/BaseSimpleTest.java +++ b/hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/SimpleClusterTest/BaseSimpleTest.java @@ -45,7 +45,7 @@ import jakarta.ws.rs.core.Response; /** * Simple Test generate the cluster env with 1 pd node + 1 store node + 1 server node. * All nodes are deployed in ports generated randomly; The application of nodes is stored - * in /apache-hugegraph-ct-incubating-1.7.0, you can visit each node with rest api. + * in /apache-hugegraph-ct-1.7.0, you can visit each node with rest api. */ public class BaseSimpleTest { diff --git a/hugegraph-cluster-test/pom.xml b/hugegraph-cluster-test/pom.xml index ecb47b797..cd54ac0ff 100644 --- a/hugegraph-cluster-test/pom.xml +++ b/hugegraph-cluster-test/pom.xml @@ -42,7 +42,7 @@ <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <final.name>apache-${release.name}-ct-incubating-${project.version}</final.name> + <final.name>apache-${release.name}-ct-${project.version}</final.name> </properties> <dependencies> diff --git a/hugegraph-commons/README.md b/hugegraph-commons/README.md index 7162e9313..d8cbcbc24 100644 --- a/hugegraph-commons/README.md +++ b/hugegraph-commons/README.md @@ -3,8 +3,8 @@ [](https://www.apache.org/licenses/LICENSE-2.0.html) [](https://codecov.io/gh/hugegraph/hugegraph-common) [](https://mvnrepository.com/artifact/org.apache.hugegraph/hugegraph-common) -[](https://github.com/apache/incubator-hugegraph-commons/actions/workflows/codeql-analysis.yml) -[](https://github.com/apache/incubator-hugegraph-commons/actions/workflows/ci.yml) +[](https://github.com/apache/hugegraph-commons/actions/workflows/codeql-analysis.yml) +[](https://github.com/apache/hugegraph-commons/actions/workflows/ci.yml) hugegraph-commons is a common module for [HugeGraph](https://github.com/apache/hugegraph) and its peripheral components. @@ -49,7 +49,7 @@ And here are links of other repositories: - 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! -[](https://github.com/apache/incubator-hugegraph-commons/graphs/contributors) +[](https://github.com/apache/hugegraph-commons/graphs/contributors) ## Licence @@ -59,8 +59,8 @@ Same as HugeGraph, hugegraph-commons are also licensed under [Apache 2.0](./LICE --- - - [GitHub Issues](https://github.com/apache/incubator-hugegraph-commons/issues): Feedback on usage issues and functional requirements (quick response) + - [GitHub Issues](https://github.com/apache/hugegraph-commons/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"/> diff --git a/hugegraph-commons/hugegraph-common/pom.xml b/hugegraph-commons/hugegraph-common/pom.xml index a57bcf59c..14f7cc217 100644 --- a/hugegraph-commons/hugegraph-common/pom.xml +++ b/hugegraph-commons/hugegraph-common/pom.xml @@ -28,7 +28,7 @@ <artifactId>hugegraph-common</artifactId> <name>${project.artifactId}</name> - <url>https://github.com/apache/incubator-hugegraph-commons/tree/master/hugegraph-common</url> + <url>https://github.com/apache/hugegraph-commons/tree/master/hugegraph-common</url> <description> hugegraph-common is a common module for HugeGraph and its peripheral components. hugegraph-common encapsulates locks, configurations, events, iterators, rest and some diff --git a/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java b/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java index 712aea7ab..93a69dd8e 100644 --- a/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java +++ b/hugegraph-commons/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java @@ -112,7 +112,7 @@ public class RestClientTest { @Test public void testPostHttpsWithAllParams() { - String url = "https://github.com/apache/incubator-hugegraph-doc/" + + String url = "https://github.com/apache/hugegraph-doc/" + "raw/master/dist/commons/cacerts.jks"; String trustStoreFile = "src/test/resources/cacerts.jks"; BaseUnitTest.downloadFileByUrl(url, trustStoreFile); @@ -129,7 +129,7 @@ public class RestClientTest { @Test public void testPostHttpsWithTokenAndAllParams() { - String url = "https://github.com/apache/incubator-hugegraph-doc/" + + String url = "https://github.com/apache/hugegraph-doc/" + "raw/master/dist/commons/cacerts.jks"; String trustStoreFile = "src/test/resources/cacerts.jks"; BaseUnitTest.downloadFileByUrl(url, trustStoreFile); diff --git a/hugegraph-commons/pom.xml b/hugegraph-commons/pom.xml index 59d12b99a..b9e780bd3 100644 --- a/hugegraph-commons/pom.xml +++ b/hugegraph-commons/pom.xml @@ -50,7 +50,7 @@ <developers> <developer> - <id>Apache Hugegraph(Incubating)</id> + <id>Apache HugeGraph</id> <email>[email protected]</email> <url>https://hugegraph.apache.org/</url> </developer> @@ -61,7 +61,7 @@ <name>Developer List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> + <post>[email protected]</post> </mailingList> <mailingList> <name>Commits List</name> diff --git a/hugegraph-pd/AGENTS.md b/hugegraph-pd/AGENTS.md index 0b501bf64..edd9280a7 100644 --- a/hugegraph-pd/AGENTS.md +++ b/hugegraph-pd/AGENTS.md @@ -110,7 +110,7 @@ mvn clean install # Build distribution package only mvn clean package -pl hg-pd-dist -am -DskipTests -# Output: hg-pd-dist/target/apache-hugegraph-pd-incubating-<version>.tar.gz +# Output: hg-pd-dist/target/apache-hugegraph-pd-<version>.tar.gz ``` ### Running Tests @@ -165,7 +165,7 @@ mvn clean After building, extract the tarball: ``` -apache-hugegraph-pd-incubating-<version>/ +apache-hugegraph-pd-<version>/ ├── bin/ │ ├── start-hugegraph-pd.sh # Start PD server │ ├── stop-hugegraph-pd.sh # Stop PD server @@ -183,7 +183,7 @@ apache-hugegraph-pd-incubating-<version>/ ### Starting PD ```bash -cd apache-hugegraph-pd-incubating-<version>/ +cd apache-hugegraph-pd-<version>/ bin/start-hugegraph-pd.sh # With custom GC options diff --git a/hugegraph-pd/Dockerfile b/hugegraph-pd/Dockerfile index c30cc3dfe..812e05e7d 100644 --- a/hugegraph-pd/Dockerfile +++ b/hugegraph-pd/Dockerfile @@ -30,7 +30,7 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.sk # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 FROM eclipse-temurin:11-jre-jammy -COPY --from=build /pkg/hugegraph-pd/apache-hugegraph-pd-incubating-*/ /hugegraph-pd/ +COPY --from=build /pkg/hugegraph-pd/apache-hugegraph-pd-*/ /hugegraph-pd/ LABEL maintainer="HugeGraph Docker Maintainers <[email protected]>" # TODO: use g1gc or zgc as default diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index 4af7896bb..ceb8af33b 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -44,7 +44,7 @@ <properties> <log4j2.version>2.17.0</log4j2.version> - <final.name>apache-${release.name}-pd-incubating-${project.version}</final.name> + <final.name>apache-${release.name}-pd-${project.version}</final.name> <commons-lang3.version>3.12.0</commons-lang3.version> <junit.version>4.13.2</junit.version> </properties> diff --git a/hugegraph-server/Dockerfile b/hugegraph-server/Dockerfile index c9df67dc3..f7613f848 100644 --- a/hugegraph-server/Dockerfile +++ b/hugegraph-server/Dockerfile @@ -30,7 +30,7 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.sk # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 FROM eclipse-temurin:11-jre-jammy -COPY --from=build /pkg/hugegraph-server/apache-hugegraph-server-incubating-*/ /hugegraph-server/ +COPY --from=build /pkg/hugegraph-server/apache-hugegraph-server-*/ /hugegraph-server/ LABEL maintainer="HugeGraph Docker Maintainers <[email protected]>" # TODO: use g1gc or zgc as default diff --git a/hugegraph-server/Dockerfile-hstore b/hugegraph-server/Dockerfile-hstore index 8f7017b6d..7bd15a070 100644 --- a/hugegraph-server/Dockerfile-hstore +++ b/hugegraph-server/Dockerfile-hstore @@ -30,7 +30,7 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 FROM eclipse-temurin:11-jre-jammy -COPY --from=build /pkg/hugegraph-server/apache-hugegraph-server-incubating-*/ /hugegraph-server/ +COPY --from=build /pkg/hugegraph-server/apache-hugegraph-server-*/ /hugegraph-server/ # remove hugegraph.properties and rename hstore.properties.template for default hstore backend RUN cd /hugegraph-server/conf/graphs \ && rm hugegraph.properties && mv hstore.properties.template hugegraph.properties diff --git a/hugegraph-server/hugegraph-dist/docker/README.md b/hugegraph-server/hugegraph-dist/docker/README.md index 20c8565b8..454d4ca24 100644 --- a/hugegraph-server/hugegraph-dist/docker/README.md +++ b/hugegraph-server/hugegraph-dist/docker/README.md @@ -40,7 +40,7 @@ If you want to customize the preloaded data, please mount the groovy scripts (no 2. Using docker compose - We can also use `docker-compose up -d` to quickly start. The `docker-compose.yaml` is below. [example.groovy](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/src/assembly/static/scripts/example.groovy) is a pre-defined script. If needed, we can mount a new `example.groovy` to preload different data: + We can also use `docker-compose up -d` to quickly start. The `docker-compose.yaml` is below. [example.groovy](https://github.com/apache/hugegraph/blob/master/hugegraph-server/hugegraph-dist/src/assembly/static/scripts/example.groovy) is a pre-defined script. If needed, we can mount a new `example.groovy` to preload different data: ```yaml version: '3' diff --git a/hugegraph-server/hugegraph-dist/pom.xml b/hugegraph-server/hugegraph-dist/pom.xml index 324d253dc..1fe20b6d9 100644 --- a/hugegraph-server/hugegraph-dist/pom.xml +++ b/hugegraph-server/hugegraph-dist/pom.xml @@ -356,7 +356,7 @@ </plugins> </build> <activation> - <!-- usage refer: https://github.com/apache/incubator-hugegraph/pull/2277 --> + <!-- usage refer: https://github.com/apache/hugegraph/pull/2277 --> <property> <name>!skip-tar-package</name> </property> diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh index 2b998d57a..a48894728 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh @@ -23,7 +23,7 @@ REPORT_FILE=$REPORT_DIR/jacoco-api-test.xml TRAVIS_DIR=$(dirname $0) VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) -SERVER_DIR=hugegraph-server/apache-hugegraph-server-incubating-$VERSION +SERVER_DIR=hugegraph-server/apache-hugegraph-server-$VERSION RAFT1_DIR=hugegraph-raft1 RAFT2_DIR=hugegraph-raft2 RAFT3_DIR=hugegraph-raft3 diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh index 3bf0d2d9e..11875f88a 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh @@ -23,7 +23,7 @@ REPORT_FILE=$REPORT_DIR/jacoco-api-test-for-raft.xml TRAVIS_DIR=$(dirname $0) VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) -SERVER_DIR=hugegraph-server/apache-hugegraph-server-incubating-$VERSION/ +SERVER_DIR=hugegraph-server/apache-hugegraph-server-$VERSION/ CONF=$SERVER_DIR/conf/graphs/hugegraph.properties REST_SERVER_CONF=$SERVER_DIR/conf/rest-server.properties GREMLIN_SERVER_CONF=$SERVER_DIR/conf/gremlin-server.yaml @@ -35,7 +35,7 @@ mvn package -Dmaven.test.skip=true -ntp wget -P $SERVER_DIR/lib/ https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar if [[ ! -e "$SERVER_DIR/ikanalyzer-2012_u6.jar" ]]; then - wget -P $SERVER_DIR/lib/ https://raw.githubusercontent.com/apache/incubator-hugegraph-doc/ik_binary/dist/server/ikanalyzer-2012_u6.jar + wget -P $SERVER_DIR/lib/ https://raw.githubusercontent.com/apache/hugegraph-doc/ik_binary/dist/server/ikanalyzer-2012_u6.jar fi # config rest-server diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh index bab4adcc8..35e82ade4 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh @@ -29,7 +29,7 @@ else exit 1 fi -PD_DIR=$HOME_DIR/hugegraph-pd/apache-hugegraph-pd-incubating-$VersionInBash +PD_DIR=$HOME_DIR/hugegraph-pd/apache-hugegraph-pd-$VersionInBash pushd $PD_DIR . bin/start-hugegraph-pd.sh diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh index 8882df3a8..3e876ce9a 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh @@ -29,7 +29,7 @@ else exit 1 fi -STORE_DIR=$HOME_DIR/hugegraph-store/apache-hugegraph-store-incubating-$VersionInBash +STORE_DIR=$HOME_DIR/hugegraph-store/apache-hugegraph-store-$VersionInBash pushd $STORE_DIR . bin/start-hugegraph-store.sh diff --git a/hugegraph-server/pom.xml b/hugegraph-server/pom.xml index a4dac32ab..1ef5ed957 100644 --- a/hugegraph-server/pom.xml +++ b/hugegraph-server/pom.xml @@ -37,7 +37,7 @@ <properties> <top.level.dir>${project.basedir}/..</top.level.dir> - <final.name>apache-${release.name}-server-incubating-${project.version}</final.name> + <final.name>apache-${release.name}-server-${project.version}</final.name> <slf4j.version>1.7.5</slf4j.version> <log4j.version>1.2.17</log4j.version> <log4j2.version>2.17.1</log4j2.version> diff --git a/hugegraph-store/Dockerfile b/hugegraph-store/Dockerfile index c0b4b71cb..e14a31033 100644 --- a/hugegraph-store/Dockerfile +++ b/hugegraph-store/Dockerfile @@ -30,7 +30,7 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.sk # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 FROM eclipse-temurin:11-jre-jammy -COPY --from=build /pkg/hugegraph-store/apache-hugegraph-store-incubating-*/ /hugegraph-store/ +COPY --from=build /pkg/hugegraph-store/apache-hugegraph-store-*/ /hugegraph-store/ LABEL maintainer="HugeGraph Docker Maintainers <[email protected]>" # TODO: use g1gc or zgc as default diff --git a/hugegraph-store/README.md b/hugegraph-store/README.md index ba41ab95c..934d30eef 100644 --- a/hugegraph-store/README.md +++ b/hugegraph-store/README.md @@ -109,7 +109,7 @@ mvn clean package -pl hugegraph-store/hugegraph-store-dist -am -DskipTests The assembled distribution will be available at: ``` -hugegraph-store/apache-hugegraph-store-incubating-1.7.0/lib/hg-store-node-1.7.0.jar``` +hugegraph-store/apache-hugegraph-store-1.7.0/lib/hg-store-node-1.7.0.jar``` ``` ### Configuration @@ -214,7 +214,7 @@ Start the Store server: ```bash # Replace {version} with your hugegraph version -cd apache-hugegraph-store-incubating-{version} +cd apache-hugegraph-store-{version} # Start Store node bin/start-hugegraph-store.sh diff --git a/hugegraph-store/docs/deployment-guide.md b/hugegraph-store/docs/deployment-guide.md index d45b713c4..409fd34c9 100644 --- a/hugegraph-store/docs/deployment-guide.md +++ b/hugegraph-store/docs/deployment-guide.md @@ -416,8 +416,8 @@ df -h ```bash # Extract PD distribution -tar -xzf apache-hugegraph-pd-incubating-1.7.0.tar.gz -cd apache-hugegraph-pd-incubating-1.7.0 +tar -xzf apache-hugegraph-pd-1.7.0.tar.gz +cd apache-hugegraph-pd-1.7.0 # Edit configuration vi conf/application.yml @@ -509,8 +509,8 @@ curl http://192.168.1.10:8620/v1/members ```bash # Extract Store distribution -tar -xzf apache-hugegraph-store-incubating-1.7.0.tar.gz -cd apache-hugegraph-store-incubating-1.7.0 +tar -xzf apache-hugegraph-store-1.7.0.tar.gz +cd apache-hugegraph-store-1.7.0 # Edit configuration vi conf/application.yml @@ -595,7 +595,7 @@ curl http://192.168.1.10:8620/v1/stores "address":"192.168.1.10:8500", "raftAddress":"192.168.1.10:8510", "version":"","state":"Up", - "deployPath":"/Users/user/incubator-hugegraph/hugegraph-store/hg-store-node/target/classes/", + "deployPath":"/Users/user/hugegraph/hugegraph-store/hg-store-node/target/classes/", "dataPath":"./storage", "startTimeStamp":1761818547335, "registedTimeStamp":1761818547335, @@ -626,8 +626,8 @@ curl http://192.168.1.10:8620/v1/stores ```bash # Extract Server distribution -tar -xzf apache-hugegraph-incubating-1.7.0.tar.gz -cd apache-hugegraph-incubating-1.7.0 +tar -xzf apache-hugegraph-1.7.0.tar.gz +cd apache-hugegraph-1.7.0 # Configure backend vi conf/graphs/hugegraph.properties diff --git a/hugegraph-store/docs/development-guide.md b/hugegraph-store/docs/development-guide.md index c255e5682..b5839e801 100644 --- a/hugegraph-store/docs/development-guide.md +++ b/hugegraph-store/docs/development-guide.md @@ -58,7 +58,7 @@ git checkout 1.7-rebase 2. Add new "Application" configuration: - Main class: `org.apache.hugegraph.store.node.StoreNodeApplication` - VM options: `-Xms4g -Xmx4g -Dconfig.file=conf/application.yml` - - Working directory: `hugegraph-store/hg-store-dist/target/apache-hugegraph-store-incubating-1.7.0` + - Working directory: `hugegraph-store/hg-store-dist/target/apache-hugegraph-store-1.7.0` - Use classpath of module: `hg-store-node` ### Build from Source @@ -216,7 +216,7 @@ hg-store-grpc/ **Start Server**: ```bash -cd hugegraph-store/hg-store-dist/target/apache-hugegraph-store-incubating-1.7.0 +cd hugegraph-store/hg-store-dist/target/apache-hugegraph-store-1.7.0 bin/start-hugegraph-store.sh ``` @@ -242,7 +242,7 @@ mvn compile ```bash mvn clean package -DskipTests -# Output: hg-store-dist/target/apache-hugegraph-store-incubating-<version>.tar.gz +# Output: hg-store-dist/target/apache-hugegraph-store-<version>.tar.gz ``` **Regenerate gRPC stubs** (after modifying `.proto` files): diff --git a/hugegraph-store/docs/operations-guide.md b/hugegraph-store/docs/operations-guide.md index a937d52bf..773d49f94 100644 --- a/hugegraph-store/docs/operations-guide.md +++ b/hugegraph-store/docs/operations-guide.md @@ -593,8 +593,8 @@ curl http://192.168.1.10:8620/v1/partitionsAndStatus 1. **Deploy New Store Node**: ```bash # Follow deployment guide - tar -xzf apache-hugegraph-store-incubating-1.7.0.tar.gz - cd apache-hugegraph-store-incubating-1.7.0 + tar -xzf apache-hugegraph-store-1.7.0.tar.gz + cd apache-hugegraph-store-1.7.0 # Configure and start vi conf/application.yml @@ -670,14 +670,14 @@ curl http://192.168.1.10:8620/v1/partitionsAndStatus bin/stop-hugegraph-store.sh # Backup current version -mv apache-hugegraph-store-incubating-1.7.0 apache-hugegraph-store-incubating-1.7.0-backup +mv apache-hugegraph-store-1.7.0 apache-hugegraph-store-1.7.0-backup # Extract new version -tar -xzf apache-hugegraph-store-incubating-1.8.0.tar.gz -cd apache-hugegraph-store-incubating-1.8.0 +tar -xzf apache-hugegraph-store-1.8.0.tar.gz +cd apache-hugegraph-store-1.8.0 # Copy configuration from backup -cp ../apache-hugegraph-store-incubating-1.7.0-backup/conf/application.yml conf/ +cp ../apache-hugegraph-store-1.7.0-backup/conf/application.yml conf/ # Start new version bin/start-hugegraph-store.sh @@ -714,9 +714,9 @@ If upgrade fails: bin/stop-hugegraph-store.sh # Restore backup -rm -rf apache-hugegraph-store-incubating-1.8.0 -mv apache-hugegraph-store-incubating-1.7.0-backup apache-hugegraph-store-incubating-1.7.0 -cd apache-hugegraph-store-incubating-1.7.0 +rm -rf apache-hugegraph-store-1.8.0 +mv apache-hugegraph-store-1.7.0-backup apache-hugegraph-store-1.7.0 +cd apache-hugegraph-store-1.7.0 # Restart old version bin/start-hugegraph-store.sh diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml index b9d7a0382..9ff1e933e 100644 --- a/hugegraph-store/pom.xml +++ b/hugegraph-store/pom.xml @@ -45,7 +45,7 @@ <properties> <log4j2.version>2.15.0</log4j2.version> - <final.name>apache-${release.name}-store-incubating-${project.version}</final.name> + <final.name>apache-${release.name}-store-${project.version}</final.name> </properties> <dependencyManagement> diff --git a/install-dist/pom.xml b/install-dist/pom.xml index 0b6ffa990..d30a3a2ac 100644 --- a/install-dist/pom.xml +++ b/install-dist/pom.xml @@ -29,7 +29,7 @@ <artifactId>install-dist</artifactId> <properties> - <final.name>apache-${release.name}-incubating-${project.version}</final.name> + <final.name>apache-${release.name}-${project.version}</final.name> </properties> <build> @@ -50,9 +50,9 @@ cd $root_path || exit mkdir -p ${final.name} - cp -r -v $root_path/hugegraph-pd/apache-hugegraph-pd-incubating-${project.version} ${final.name}/ || exit - cp -r -v $root_path/hugegraph-store/apache-hugegraph-store-incubating-${project.version} ${final.name}/ || exit - cp -r -v $root_path/hugegraph-server/apache-hugegraph-server-incubating-${project.version} ${final.name}/ || exit + cp -r -v $root_path/hugegraph-pd/apache-hugegraph-pd-${project.version} ${final.name}/ || exit + cp -r -v $root_path/hugegraph-store/apache-hugegraph-store-${project.version} ${final.name}/ || exit + cp -r -v $root_path/hugegraph-server/apache-hugegraph-server-${project.version} ${final.name}/ || exit cp -r -v $root_path/install-dist/release-docs/* $root_path/DISCLAIMER ${final.name}/ || exit tar zcvf $root_path/target/${final.name}.tar.gz ./${final.name} || exit 1 diff --git a/install-dist/release-docs/LICENSE b/install-dist/release-docs/LICENSE index 9a1afd766..bd00dbc11 100644 --- a/install-dist/release-docs/LICENSE +++ b/install-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/install-dist/release-docs/NOTICE b/install-dist/release-docs/NOTICE index f3eb6d4cc..247b9dadd 100644 --- a/install-dist/release-docs/NOTICE +++ b/install-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/install-dist/scripts/apache-release.sh b/install-dist/scripts/apache-release.sh index 168217c42..0eb721ae8 100755 --- a/install-dist/scripts/apache-release.sh +++ b/install-dist/scripts/apache-release.sh @@ -41,13 +41,13 @@ rm -rf dist && mkdir -p dist/apache-${REPO} # step1: package the source code cd ../../ && echo "Package source in: $(pwd)" git archive --format=tar.gz \ - --output="install-dist/scripts/dist/apache-${REPO}/apache-${REPO}-incubating-${RELEASE_VERSION}-src.tar.gz" \ - --prefix=apache-${REPO}-incubating-"${RELEASE_VERSION}"-src/ "${GIT_BRANCH}" || exit + --output="install-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 dist/apache-${REPO} || exit +cp -v ../../target/apache-${REPO}-"${RELEASE_VERSION}".tar.gz dist/apache-${REPO} || exit # step3: sign + hash ##### 3.1 sign in source & binary package @@ -80,7 +80,7 @@ SVN_DIR="${GROUP}-svn-dev" cd ../ rm -rfv ${SVN_DIR} -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} ##### 4.2 copy new release package to svn directory mkdir -p ${SVN_DIR}/"${RELEASE_VERSION}" diff --git a/pom.xml b/pom.xml index d2595823f..850ac99fa 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ <developers> <developer> - <id>Apache Hugegraph(incubating)</id> + <id>Apache HugeGraph</id> <email>[email protected]</email> <url>https://hugegraph.apache.org/</url> </developer> @@ -58,7 +58,7 @@ <name>Development Mailing List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> + <post>[email protected]</post> </mailingList> <mailingList> <name>Commits List</name>
