You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2023/01/14 05:51:43 UTC
[incubator-hugegraph] branch master updated: chore: modify NOTICE & LICENSE path (#2084)
This is an automated email from the ASF dual-hosted git repository.
jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/master by this push:
new 342762537 chore: modify NOTICE & LICENSE path (#2084)
342762537 is described below
commit 3427625379d1d361873b1877673d16fb03166648
Author: Simon Cheung <mi...@apache.org>
AuthorDate: Sat Jan 14 13:51:36 2023 +0800
chore: modify NOTICE & LICENSE path (#2084)
Co-authored-by: imbajin <ji...@apache.org>
---
.github/workflows/ci.yml | 11 ++--
.github/workflows/codeql-analysis.yml | 60 +++++++++++-----------
LICENSE | 2 +-
NOTICE | 2 +
hugegraph-dist/release-docs/NOTICE | 6 ++-
.../src/assembly/descriptor/assembly.xml | 8 ++-
6 files changed, 49 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c142d2c1e..9c78051f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,8 +26,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- BACKEND: [memory, cassandra, scylladb, hbase, rocksdb, mysql, postgresql]
- JAVA_VERSION: ['8', '11']
+ BACKEND: [ memory, cassandra, scylladb, hbase, rocksdb, mysql, postgresql ]
+ JAVA_VERSION: [ '8', '11' ]
steps:
- name: Install JDK ${{ matrix.JAVA_VERSION }}
@@ -50,14 +50,13 @@ jobs:
- name: Compile
run: |
- mvn clean compile -U -Dmaven.javadoc.skip=true | grep -v "Downloading\|Downloaded"
+ mvn clean compile -U -Dmaven.javadoc.skip=true -ntp
- name: Install JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'zulu'
-
- name: Prepare env and service
run: |
$TRAVIS_DIR/install-backend.sh $BACKEND
@@ -65,8 +64,8 @@ jobs:
- name: Install JDK ${{ matrix.JAVA_VERSION }}
uses: actions/setup-java@v3
with:
- java-version: ${{ matrix.JAVA_VERSION }}
- distribution: 'zulu'
+ java-version: ${{ matrix.JAVA_VERSION }}
+ distribution: 'zulu'
- name: Run unit test
run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 17f41813f..75f0c78c4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,40 +26,40 @@ jobs:
language: [ 'java' ]
steps:
- - name: Checkout repository
- uses: actions/checkout@v3
+ - name: Checkout repository
+ uses: actions/checkout@v3
- - name: Setup Java JDK
- uses: actions/setup-java@v3
- with:
- distribution: 'zulu'
- java-version: '8'
+ - name: Setup Java JDK
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: '8'
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
- # âšī¸ Command-line programs to run using the OS shell.
- # đ https://git.io/JvXDl
+ # âšī¸ Command-line programs to run using the OS shell.
+ # đ https://git.io/JvXDl
- # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
+ # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
- #- run: |
- # make bootstrap
- # make release
+ #- run: |
+ # make bootstrap
+ # make release
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
diff --git a/LICENSE b/LICENSE
index e06d20818..8f71f43fe 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 6be2560f9..42f88212e 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/hugegraph-dist/release-docs/NOTICE b/hugegraph-dist/release-docs/NOTICE
index 927e63c8a..d472740c7 100644
--- a/hugegraph-dist/release-docs/NOTICE
+++ b/hugegraph-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.
+
========================================================================
audience-annotations NOTICE
diff --git a/hugegraph-dist/src/assembly/descriptor/assembly.xml b/hugegraph-dist/src/assembly/descriptor/assembly.xml
index 401b556b4..1b055ac13 100644
--- a/hugegraph-dist/src/assembly/descriptor/assembly.xml
+++ b/hugegraph-dist/src/assembly/descriptor/assembly.xml
@@ -49,11 +49,17 @@
</includes>
</fileSet>
<fileSet>
- <directory>${top.level.dir}</directory>
+ <directory>${top.level.dir}/hugegraph-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>