doc: enhance NOTICE info to keep it clear (#2409)

apache · Jan 9, 2024 · 57cd0e8 · 57cd0e8
1 parent 7965aac
commit 57cd0e8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 127 deletions.
diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml
@@ -13,7 +13,7 @@ jobs:
   dependency-check:
     runs-on: ubuntu-latest
     env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
+      USE_STAGE: 'false' # Whether to include the stage repository.
       SCRIPT_DEPENDENCY: hugegraph-server/hugegraph-dist/scripts/dependency
     steps:
       - name: Checkout source

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
+      USE_STAGE: 'false' # Whether to include the stage repository.
       TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
       REPORT_DIR: target/site/jacoco
       BACKEND: ${{ matrix.BACKEND }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   analyze:
     env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
+      USE_STAGE: 'false' # Whether to include the stage repository.
     name: Analyze
     runs-on: ubuntu-latest
     permissions:

diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml
@@ -11,7 +11,7 @@ jobs:
   check-license:
     runs-on: ubuntu-latest
     env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
+      USE_STAGE: 'false' # Whether to include the stage repository.
     steps:
       - uses: actions/checkout@v4
 

diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache HugeGraph(incubating)
-Copyright 2022-2023 The Apache Software Foundation
+Copyright 2022-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -13,9 +13,6 @@ This product contains code form the Apache TinkerPop Project:
 Apache TinkerPop
 Copyright 2015-2022 The Apache Software Foundation.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 ------------------------------------------------------------------------
 Activiti
 ------------------------------------------------------------------------
@@ -42,7 +39,7 @@ This product contains code form the JanusGraph Project:
 -----------------------------------------------------------------------
 ==============================================================
  JanusGraph: Distributed Graph Database
- Copyright 2012 and onwards JanusGraph Authors
+ Copyright 2012 with JanusGraph Authors
 ==============================================================
 
 This product includes software developed by JanusGraph contributors listed
@@ -56,36 +53,3 @@ DataStax) and the following individuals:
  * Marko A. Rodriguez
  * Stephen Mallette
  * Pavel Yaskevich
-
-It also includes software from other open source projects including, but not limited to (check pom.xml for complete listing):
-
- * Apache Cassandra [https://cassandra.apache.org/]
- * Apache Commons [https://commons.apache.org/]
- * Apache Groovy [http://groovy-lang.org/]
- * Apache HBase [https://hbase.apache.org/]
- * Apache Hadoop [https://hadoop.apache.org/]
- * Apache Kerby [https://github.com/apache/directory-kerby]
- * Apache Log4j [https://logging.apache.org/log4j]
- * Apache Lucene [https://lucene.apache.org/]
- * Apache Solr [https://lucene.apache.org/solr/]
- * Apache TinkerPop [https://tinkerpop.apache.org/]
- * Astyanax [https://github.com/Netflix/astyanax]
- * DataStax Driver for Apache Cassandra  [https://github.com/datastax/java-driver]
- * EasyMock [http://easymock.org/]
- * Elasticsearch [https://www.elastic.co/]
- * Google Cloud Bigtable [https://github.com/googlecloudplatform/cloud-bigtable-client]
- * Google Guava [https://github.com/google/guava]
- * HPPC [https://labs.carrotsearch.com/hppc.html]
- * JUnit [https://www.junit.org/]
- * Jackson [https://github.com/FasterXML/jackson]
- * Kryo [https://github.com/EsotericSoftware/kryo]
- * Metrics [https://metrics.dropwizard.io]
- * Mockito [https://site.mockito.org/]
- * Noggit [https://github.com/yonik/noggit]
- * OpenRDF [http://rdf4j.org/]
- * Oracle BerkeleyDB Java Edition [https://www.oracle.com/technetwork/products/berkeleydb/] (see license below)
- * Project Lombok [https://projectlombok.org/]
- * Reflections8 [https://github.com/aschoerk/reflections8]
- * SLF4J [https://www.slf4j.org/]
- * Spatial4j [https://github.com/locationtech/spatial4j]
- * Vavr [https://www.vavr.io/]
diff --git a/hugegraph-server/hugegraph-dist/release-docs/NOTICE b/hugegraph-server/hugegraph-dist/release-docs/NOTICE
@@ -1,5 +1,5 @@
 Apache HugeGraph(incubating)
-Copyright 2022-2023 The Apache Software Foundation
+Copyright 2022-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -13,7 +13,7 @@ JanusGraph NOTICE
 ========================================================================
 ==============================================================
  JanusGraph: Distributed Graph Database
- Copyright 2012 and onwards JanusGraph Authors
+ Copyright 2012 with JanusGraph Authors
 ==============================================================
 
 This product includes software developed by JanusGraph contributors listed
@@ -28,40 +28,6 @@ DataStax) and the following individuals:
  * Stephen Mallette
  * Pavel Yaskevich
 
-It also includes software from other open source projects including, but not limited to (check pom.xml for complete listing):
-
- * Apache Cassandra [https://cassandra.apache.org/]
- * Apache Commons [https://commons.apache.org/]
- * Apache Groovy [http://groovy-lang.org/]
- * Apache HBase [https://hbase.apache.org/]
- * Apache Hadoop [https://hadoop.apache.org/]
- * Apache Kerby [https://github.com/apache/directory-kerby]
- * Apache Log4j [https://logging.apache.org/log4j]
- * Apache Lucene [https://lucene.apache.org/]
- * Apache Solr [https://lucene.apache.org/solr/]
- * Apache TinkerPop [https://tinkerpop.apache.org/]
- * Astyanax [https://github.com/Netflix/astyanax]
- * DataStax Driver for Apache Cassandra  [https://github.com/datastax/java-driver]
- * EasyMock [http://easymock.org/]
- * Elasticsearch [https://www.elastic.co/]
- * Google Cloud Bigtable [https://github.com/googlecloudplatform/cloud-bigtable-client]
- * Google Guava [https://github.com/google/guava]
- * HPPC [https://labs.carrotsearch.com/hppc.html]
- * JUnit [https://www.junit.org/]
- * Jackson [https://github.com/FasterXML/jackson]
- * Kryo [https://github.com/EsotericSoftware/kryo]
- * Metrics [https://metrics.dropwizard.io]
- * Mockito [https://site.mockito.org/]
- * Noggit [https://github.com/yonik/noggit]
- * OpenRDF [http://rdf4j.org/]
- * Oracle BerkeleyDB Java Edition [https://www.oracle.com/technetwork/products/berkeleydb/] (see license below)
- * Project Lombok [https://projectlombok.org/]
- * Reflections8 [https://github.com/aschoerk/reflections8]
- * SLF4J [https://www.slf4j.org/]
- * Spatial4j [https://github.com/locationtech/spatial4j]
- * Vavr [https://www.vavr.io/]
-
-
 ========================================================================
 
 airline NOTICE
@@ -110,9 +76,6 @@ audience-annotations NOTICE
 Apache Yetus - Audience Annotations
 Copyright 2015-2017 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 ========================================================================
 
 asm NOTICE
@@ -210,9 +173,6 @@ Apache TinkerPop NOTICE
 Apache TinkerPop
 Copyright 2015-2022 The Apache Software Foundation.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 ------------------------------------------------------------------------
 Activiti
 ------------------------------------------------------------------------
@@ -243,10 +203,6 @@ gremlin-console NOTICE
 Apache TinkerPop :: Gremlin Console
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
 ========================================================================
 
 gremlin-core NOTICE
@@ -257,10 +213,6 @@ This product contains code form the JanusGraph Project:
 Apache TinkerPop :: Gremlin Core
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
 ========================================================================
 
 gremlin-driver NOTICE
@@ -270,10 +222,6 @@ gremlin-driver NOTICE
 Apache TinkerPop :: Gremlin Driver
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
 ========================================================================
 
 gremlin-groovy NOTICE
@@ -283,10 +231,6 @@ gremlin-groovy NOTICE
 Apache TinkerPop :: Gremlin Groovy
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
 ========================================================================
 
 gremlin-server NOTICE
@@ -296,10 +240,6 @@ gremlin-server NOTICE
 Apache TinkerPop :: Gremlin Server
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
 ========================================================================
 
 gremlin-shaded NOTICE
@@ -309,10 +249,6 @@ gremlin-shaded NOTICE
 Apache TinkerPop :: Gremlin Shaded
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
 ========================================================================
 
 gremlin-test NOTICE
@@ -322,9 +258,6 @@ gremlin-test NOTICE
 Apache TinkerPop :: Gremlin Test
 Copyright 2013-2021 Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 
 ========================================================================
 
@@ -347,8 +280,6 @@ groovy-cli-picocli NOTICE
 Apache Groovy
 Copyright 2003-2020 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 ========================================================================
 
 groovy-console NOTICE
@@ -357,9 +288,6 @@ groovy-console NOTICE
 Apache Groovy
 Copyright 2003-2020 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 ========================================================================
 
 groovy-swing NOTICE
@@ -368,8 +296,6 @@ groovy-swing NOTICE
 Apache Groovy
 Copyright 2003-2020 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 ========================================================================
 
 groovy-templates NOTICE
@@ -378,8 +304,6 @@ groovy-templates NOTICE
 Apache Groovy
 Copyright 2003-2020 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 ========================================================================
 
 groovy-xml NOTICE
@@ -388,8 +312,6 @@ groovy-xml NOTICE
 Apache Groovy
 Copyright 2003-2020 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 ========================================================================
 
 hbase-shaded-endpoint NOTICE
@@ -399,11 +321,6 @@ hbase-shaded-endpoint NOTICE
 hugegraph-hbase-shaded-endpoint
 Copyright 2007-2021 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 ====
 hugegraph-hbase-shaded-endpoint contained works