Skip to content

Commit 69a4454

Browse files
authored
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
1 parent e9d9bb5 commit 69a4454

File tree

12 files changed

+46
-22
lines changed

12 files changed

+46
-22
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
.gitattributes export-ignore
33
.gitignore export-ignore
44
.asf.yaml export-ignore
5-
apache-release.sh export-ignore
65
.licenserc.yaml export-ignore
76

87
# ignored directory

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- master
77
- /^release-.*$/
8-
- /^v[0-9]\..*$/
98
pull_request:
109

1110
jobs:
@@ -28,6 +27,12 @@ jobs:
2827
java-version: '8'
2928
distribution: 'zulu'
3029

30+
- name: License check(RAT)
31+
run: |
32+
mvn apache-rat:check -ntp
33+
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
34+
grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt
35+
3136
- name: Setup Python3
3237
uses: actions/setup-python@v4
3338
with:
@@ -67,7 +72,7 @@ jobs:
6772
- name: Prepare env and service
6873
run: |
6974
$TRAVIS_DIR/install-env.sh
70-
$TRAVIS_DIR/install-hugegraph-from-source.sh $HUGEGRAPH_SERVER_COMMIT_ID | grep -v "Downloading\|Downloaded"
75+
$TRAVIS_DIR/install-hugegraph-from-source.sh $HUGEGRAPH_SERVER_COMMIT_ID
7176
$TRAVIS_DIR/load-data-into-hugegraph.sh
7277

7378
- name: Install JDK 11

DISCLAIMER

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Apache HugeGraph (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
2+
3+
Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications,
4+
and decision making process have stabilized in a manner consistent with other successful ASF projects.
5+
6+
While incubation status is not necessarily a reflection of the completeness or stability of the code,
7+
it does indicate that the project has yet to be fully endorsed by the ASF.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Apache License
1+
Apache License
22
Version 2.0, January 2004
33
http://www.apache.org/licenses/
44

NOTICE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ Copyright 2022-2023 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
6+
7+
The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021.

computer-dist/pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,25 @@
3535
</properties>
3636

3737
<dependencies>
38-
3938
<dependency>
4039
<groupId>org.apache.hugegraph</groupId>
4140
<artifactId>computer-algorithm</artifactId>
4241
<scope>provided</scope>
4342
</dependency>
44-
4543
<dependency>
4644
<groupId>org.apache.hugegraph</groupId>
4745
<artifactId>computer-core</artifactId>
4846
</dependency>
49-
5047
<dependency>
5148
<groupId>org.apache.hugegraph</groupId>
5249
<artifactId>computer-k8s-operator</artifactId>
5350
<scope>provided</scope>
5451
</dependency>
55-
5652
<dependency>
5753
<groupId>org.apache.hugegraph</groupId>
5854
<artifactId>computer-yarn</artifactId>
5955
<scope>provided</scope>
6056
</dependency>
61-
6257
</dependencies>
6358

6459
<build>
@@ -78,9 +73,7 @@
7873
<appendAssemblyId>false</appendAssemblyId>
7974
<outputDirectory>${top.level.dir}
8075
</outputDirectory>
81-
<descriptor>
82-
${assembly.descriptor.dir}/assembly.xml
83-
</descriptor>
76+
<descriptor>${assembly.descriptor.dir}/assembly.xml</descriptor>
8477
<finalName>${final.name}</finalName>
8578
</configuration>
8679
</execution>

computer-dist/release-docs/NOTICE

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
Apache HugeGraph
2-
Copyright 2021-2022 The Apache Software Foundation
1+
Apache HugeGraph(incubating)
2+
Copyright 2022-2023 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
66

7+
The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021.
8+
79
========================================================================
810

911
Apache Avro

computer-dist/src/assembly/descriptor/assembly.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@
4848
<include>*.jar</include>
4949
</includes>
5050
</fileSet>
51+
<fileSet>
52+
<directory>${top.level.dir}/computer-dist/release-docs/</directory>
53+
<outputDirectory>/</outputDirectory>
54+
<includes>
55+
<include>LICENSE*</include>
56+
<include>NOTICE*</include>
57+
</includes>
58+
</fileSet>
59+
<fileSet>
60+
<directory>${top.level.dir}</directory>
61+
<outputDirectory>/</outputDirectory>
62+
<includes>
63+
<include>DISCLAIMER*</include>
64+
</includes>
65+
</fileSet>
5166
</fileSets>
5267

5368
<dependencySets>

computer-dist/src/assembly/travis/install-env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818
set -ev
1919

20-
TRAVIS_DIR=`dirname $0`
20+
TRAVIS_DIR=$(dirname "$0")
2121

22-
sh ${TRAVIS_DIR}/start-etcd.sh
23-
echo "Installing requirments..."
22+
sh "${TRAVIS_DIR}"/start-etcd.sh
23+
echo "Installing requirements..."

computer-dist/src/assembly/travis/install-hugegraph-from-source.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ fi
2525
COMMIT_ID=$1
2626
HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
2727

28-
git clone --depth 100 ${HUGEGRAPH_GIT_URL}
28+
git clone --depth 100 ${HUGEGRAPH_GIT_URL} hugegraph
2929
cd hugegraph
30-
git checkout ${COMMIT_ID}
31-
mvn package -DskipTests
30+
git checkout "${COMMIT_ID}"
31+
mvn package -DskipTests -ntp
3232

3333
mv apache-hugegraph-*.tar.gz ../
3434
cd ../

0 commit comments

Comments
 (0)