This is an automated email from the ASF dual-hosted git repository. jin pushed a commit to branch release-1.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-computer.git
commit f0bac6ca20b6c079b2ef9c3204df6b0c86706285 Author: imbajin <[email protected]> AuthorDate: Mon Jan 16 23:46:57 2023 +0800 chore: add DISCLAIMER & NOTICE & LICENSE file to binary package (#224) * remove apache-release.sh rule from .gitattributes * chore: fix a string of configs & add rat check in ci * Update ci.yml --- .gitattributes | 1 - .github/workflows/ci.yml | 9 +++++++-- DISCLAIMER | 7 +++++++ LICENSE | 2 +- NOTICE | 2 ++ computer-dist/pom.xml | 9 +-------- computer-dist/release-docs/NOTICE | 6 ++++-- computer-dist/src/assembly/descriptor/assembly.xml | 15 +++++++++++++++ computer-dist/src/assembly/travis/install-env.sh | 6 +++--- .../src/assembly/travis/install-hugegraph-from-source.sh | 6 +++--- .../src/assembly/travis/load-data-into-hugegraph.sh | 4 ++-- pom.xml | 1 + 12 files changed, 46 insertions(+), 22 deletions(-) diff --git a/.gitattributes b/.gitattributes index c605d59d..1b26b132 100755 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,6 @@ .gitattributes export-ignore .gitignore export-ignore .asf.yaml export-ignore -apache-release.sh export-ignore .licenserc.yaml export-ignore # ignored directory diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09677c9c..f283bef5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ on: branches: - master - /^release-.*$/ - - /^v[0-9]\..*$/ pull_request: jobs: @@ -28,6 +27,12 @@ jobs: java-version: '8' distribution: 'zulu' + - name: License check(RAT) + run: | + mvn apache-rat:check -ntp + find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt + grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt + - name: Setup Python3 uses: actions/setup-python@v4 with: @@ -67,7 +72,7 @@ jobs: - name: Prepare env and service run: | $TRAVIS_DIR/install-env.sh - $TRAVIS_DIR/install-hugegraph-from-source.sh $HUGEGRAPH_SERVER_COMMIT_ID | grep -v "Downloading\|Downloaded" + $TRAVIS_DIR/install-hugegraph-from-source.sh $HUGEGRAPH_SERVER_COMMIT_ID $TRAVIS_DIR/load-data-into-hugegraph.sh - name: Install JDK 11 diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 00000000..be557e36 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,7 @@ +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/LICENSE b/LICENSE index 6cf09a14..64582849 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/NOTICE b/NOTICE index 6be2560f..42f88212 100644 --- a/NOTICE +++ b/NOTICE @@ -3,3 +3,5 @@ Copyright 2022-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). + +The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021. diff --git a/computer-dist/pom.xml b/computer-dist/pom.xml index 2c201960..5ae7a5a3 100644 --- a/computer-dist/pom.xml +++ b/computer-dist/pom.xml @@ -35,30 +35,25 @@ </properties> <dependencies> - <dependency> <groupId>org.apache.hugegraph</groupId> <artifactId>computer-algorithm</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.apache.hugegraph</groupId> <artifactId>computer-core</artifactId> </dependency> - <dependency> <groupId>org.apache.hugegraph</groupId> <artifactId>computer-k8s-operator</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.apache.hugegraph</groupId> <artifactId>computer-yarn</artifactId> <scope>provided</scope> </dependency> - </dependencies> <build> @@ -78,9 +73,7 @@ <appendAssemblyId>false</appendAssemblyId> <outputDirectory>${top.level.dir} </outputDirectory> - <descriptor> - ${assembly.descriptor.dir}/assembly.xml - </descriptor> + <descriptor>${assembly.descriptor.dir}/assembly.xml</descriptor> <finalName>${final.name}</finalName> </configuration> </execution> diff --git a/computer-dist/release-docs/NOTICE b/computer-dist/release-docs/NOTICE index 02b530ad..f9878069 100644 --- a/computer-dist/release-docs/NOTICE +++ b/computer-dist/release-docs/NOTICE @@ -1,9 +1,11 @@ -Apache HugeGraph -Copyright 2021-2022 The Apache Software Foundation +Apache HugeGraph(incubating) +Copyright 2022-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021. + ======================================================================== Apache Avro diff --git a/computer-dist/src/assembly/descriptor/assembly.xml b/computer-dist/src/assembly/descriptor/assembly.xml index 75e4c623..1bf7f6f7 100644 --- a/computer-dist/src/assembly/descriptor/assembly.xml +++ b/computer-dist/src/assembly/descriptor/assembly.xml @@ -48,6 +48,21 @@ <include>*.jar</include> </includes> </fileSet> + <fileSet> + <directory>${top.level.dir}/computer-dist/release-docs/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>LICENSE*</include> + <include>NOTICE*</include> + </includes> + </fileSet> + <fileSet> + <directory>${top.level.dir}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>DISCLAIMER*</include> + </includes> + </fileSet> </fileSets> <dependencySets> diff --git a/computer-dist/src/assembly/travis/install-env.sh b/computer-dist/src/assembly/travis/install-env.sh index 41e33953..127d84fb 100755 --- a/computer-dist/src/assembly/travis/install-env.sh +++ b/computer-dist/src/assembly/travis/install-env.sh @@ -17,7 +17,7 @@ # set -ev -TRAVIS_DIR=`dirname $0` +TRAVIS_DIR=$(dirname "$0") -sh ${TRAVIS_DIR}/start-etcd.sh -echo "Installing requirments..." +sh "${TRAVIS_DIR}"/start-etcd.sh +echo "Installing requirements..." diff --git a/computer-dist/src/assembly/travis/install-hugegraph-from-source.sh b/computer-dist/src/assembly/travis/install-hugegraph-from-source.sh index 9b687ccd..af5281de 100755 --- a/computer-dist/src/assembly/travis/install-hugegraph-from-source.sh +++ b/computer-dist/src/assembly/travis/install-hugegraph-from-source.sh @@ -25,10 +25,10 @@ fi COMMIT_ID=$1 HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"; -git clone --depth 100 ${HUGEGRAPH_GIT_URL} +git clone --depth 100 ${HUGEGRAPH_GIT_URL} hugegraph cd hugegraph -git checkout ${COMMIT_ID} -mvn package -DskipTests +git checkout "${COMMIT_ID}" +mvn package -DskipTests -ntp mv apache-hugegraph-*.tar.gz ../ cd ../ diff --git a/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh b/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh index 50b2fd62..b68bec7d 100755 --- a/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh +++ b/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh @@ -18,12 +18,12 @@ set -ev -TRAVIS_DIR=`dirname $0` +TRAVIS_DIR=$(dirname "$0") DATASET_DIR=${TRAVIS_DIR}/../dataset HUGEGRAPH_LOADER_GIT_URL="https://github.com/apache/hugegraph-toolchain.git"; -git clone --depth 10 ${HUGEGRAPH_LOADER_GIT_URL} +git clone --depth 10 ${HUGEGRAPH_LOADER_GIT_URL} hugegraph-toolchain cd hugegraph-toolchain mvn install -pl hugegraph-client,hugegraph-loader -am -DskipTests -ntp diff --git a/pom.xml b/pom.xml index 9643f444..c1c61144 100644 --- a/pom.xml +++ b/pom.xml @@ -309,6 +309,7 @@ <exclude>**/target/*</exclude> <exclude>.github/**/*</exclude> <exclude>**/.flattened-pom.xml</exclude> + <exclude>DISCLAIMER</exclude> <exclude>**/zz_generated.deepcopy.go</exclude> </excludes> <consoleOutput>true</consoleOutput>
