From dd8d63c32d641b2eb1f39cd693f78640e0d886a5 Mon Sep 17 00:00:00 2001 From: vaughn Date: Tue, 31 Jan 2023 00:54:50 +0800 Subject: [PATCH 01/10] fix: some reference url and third file license --- .../apache/hugegraph/api/job/GremlinAPI.java | 3 -- .../store/cassandra/CassandraShard.java | 2 +- hugegraph-core/pom.xml | 1 + .../hugegraph/analyzer/AnsjAnalyzer.java | 2 +- .../hugegraph/analyzer/HanLPAnalyzer.java | 2 +- .../apache/hugegraph/analyzer/IKAnalyzer.java | 2 +- .../hugegraph/analyzer/JcsegAnalyzer.java | 2 +- .../hugegraph/analyzer/JiebaAnalyzer.java | 2 +- .../hugegraph/analyzer/MMSeg4JAnalyzer.java | 2 +- .../hugegraph/analyzer/SmartCNAnalyzer.java | 2 +- .../optimize/HugeScriptTraversal.java | 24 ++++++++------- .../org/apache/hugegraph/type/Nameable.java | 29 +++++++++---------- .../hugegraph/type/define/Cardinality.java | 29 +++++++++---------- .../apache/hugegraph/util/CompressUtil.java | 3 -- .../org/apache/hugegraph/util/GZipUtil.java | 3 -- .../apache/hugegraph/util/StringEncoding.java | 29 +++++++++---------- 16 files changed, 61 insertions(+), 76 deletions(-) diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java index aef8fbcfbc..6a47ec5ad9 100644 --- a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java +++ b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java @@ -150,9 +150,6 @@ public String name() { return firstLine; } - /* - * Reference https://stackoverflow.com/questions/3576754/truncating-strings-by-bytes - */ CharsetDecoder decoder = charset.newDecoder(); decoder.onMalformedInput(CodingErrorAction.IGNORE); decoder.reset(); diff --git a/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java index 1bb218e18b..14c9f44ac3 100644 --- a/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java +++ b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java @@ -61,7 +61,7 @@ */ public class CassandraShard { - // The minimal shard size should >= 1M to prevent too many number of shards + /* The minimal shard size should >= 1M to prevent too many number of shards */ private static final int MIN_SHARD_SIZE = (int) Bytes.MB; private CassandraSessionPool.Session session; diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml index 9cba2157d2..e1140188f4 100644 --- a/hugegraph-core/pom.xml +++ b/hugegraph-core/pom.xml @@ -199,6 +199,7 @@ com.janeluo ikanalyzer ${ikanalyzer.version} + provided diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java index 84fd950aa8..9c8d6c01bd 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java @@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableList; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://github.com/NLPchina/ansj_seg/wiki */ public class AnsjAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java index 393bd027e5..fdd33a0977 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java @@ -33,7 +33,7 @@ import com.hankcs.hanlp.tokenizer.StandardTokenizer; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://github.com/hankcs/HanLP/wiki */ public class HanLPAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java index 30cb91dd37..f1d0ba5aee 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableList; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://github.com/yyn0210/IKAnalyzer */ public class IKAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java index 9e0d8998fb..8fbb606b3f 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java @@ -33,7 +33,7 @@ import com.google.common.collect.ImmutableList; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://github.com/lionsoul2014/jcseg */ public class JcsegAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java index 22cb5e50f4..ce582c0d96 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java @@ -27,7 +27,7 @@ import com.huaban.analysis.jieba.SegToken; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://github.com/huaban/jieba-analysis */ public class JiebaAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java index 73e6b31eda..74eda61fbc 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableList; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://github.com/chenlb/mmseg4j-core */ public class MMSeg4JAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java index f6b4d7117e..e261431594 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java @@ -29,7 +29,7 @@ import org.apache.hugegraph.util.InsertionOrderUtil; /** - * Reference from https://my.oschina.net/apdplat/blog/412921 + * Reference from https://lucene.apache.org/core/8_11_2/analyzers-smartcn/index.html */ public class SmartCNAnalyzer implements Analyzer { diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java index d6d8de4cf1..a6582850d8 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java @@ -1,17 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations * under the License. */ diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java index ad9de81131..f14c19dd25 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java @@ -1,19 +1,16 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ +// Copyright 2017 JanusGraph Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package org.apache.hugegraph.type; diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java index b6d78dab61..96c8095cd4 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java @@ -1,19 +1,16 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ +// Copyright 2017 JanusGraph Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package org.apache.hugegraph.type.define; diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java index 7fcbeea822..2a01ba6a04 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java @@ -56,9 +56,6 @@ public final class CompressUtil { - /** - * Reference: https://mkyong.com/java/how-to-create-tar-gz-in-java/ - */ public static void compressTar(String inputDir, String outputFile, Checksum checksum) throws IOException { LZ4Factory factory = LZ4Factory.fastestInstance(); diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java index e07b0d5b8a..e351c92f5a 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java @@ -26,9 +26,6 @@ import org.apache.hugegraph.backend.BackendException; import org.apache.hugegraph.backend.serializer.BytesBuffer; -/** - * Reference from https://dzone.com/articles/how-compress-and-uncompress - */ public final class GZipUtil { private static final int BUF_SIZE = (int) (4 * Bytes.KB); diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java b/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java index 2461765fa8..6d92c4bf9f 100644 --- a/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java +++ b/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java @@ -1,19 +1,16 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ +// Copyright 2017 JanusGraph Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package org.apache.hugegraph.util; From 41fbb9a8d09ddd130f55287fa04c225b3cffcb1e Mon Sep 17 00:00:00 2001 From: vaughn Date: Tue, 31 Jan 2023 01:28:14 +0800 Subject: [PATCH 02/10] fix(ci): license check and dependency check --- .licenserc.yaml | 4 ++++ hugegraph-dist/scripts/dependency/known-dependencies.txt | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index b87b7c8e4b..0953675655 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -89,6 +89,10 @@ header: # `header` section is configurations for source codes license header. - '**/META-INF/MANIFEST.MF' - '.repository/**' - '**/.flattened-pom.xml' + - '**/optimize/HugeScriptTraversal.java' + - '**/type/Nameable.java' + - '**/define/Cardinality.java' + - '**/util/StringEncoding.java' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. # license-location-threshold specifies the index threshold where the license header can be located, diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt index 610c34e34b..a0f955ff5f 100644 --- a/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -97,7 +97,6 @@ hppc-0.7.1.jar htrace-core4-4.2.0-incubating.jar httpclient-4.5.13.jar httpcore-4.4.13.jar -ikanalyzer-2012_u6.jar ivy-2.4.0.jar j2objc-annotations-1.1.jar jackson-annotations-2.12.5.jar @@ -193,9 +192,6 @@ lookout-api-1.4.1.jar lucene-analyzers-common-8.11.2.jar lucene-analyzers-smartcn-8.11.2.jar lucene-core-8.11.2.jar -lucene-queries-4.7.2.jar -lucene-queryparser-4.7.2.jar -lucene-sandbox-4.7.2.jar lz4-1.3.0.jar lz4-java-1.8.0.jar metrics-annotation-4.2.4.jar From e5a5902efb45823bd1ba682c0b5fa015f2a8c9f2 Mon Sep 17 00:00:00 2001 From: vaughn Date: Tue, 31 Jan 2023 10:37:55 +0800 Subject: [PATCH 03/10] fix(ci): unit test and api test need ik jar --- hugegraph-dist/src/assembly/travis/run-api-test.sh | 4 ++++ hugegraph-test/pom.xml | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/hugegraph-dist/src/assembly/travis/run-api-test.sh b/hugegraph-dist/src/assembly/travis/run-api-test.sh index 965f832f0a..3122f52d3d 100755 --- a/hugegraph-dist/src/assembly/travis/run-api-test.sh +++ b/hugegraph-dist/src/assembly/travis/run-api-test.sh @@ -35,6 +35,10 @@ mvn package -DskipTests # add mysql dependency 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 +fi + # config rest-server sed -i 's/#auth.authenticator=/auth.authenticator=org.apache.hugegraph.auth.StandardAuthenticator/' $REST_SERVER_CONF sed -i 's/#auth.admin_token=/auth.admin_token=pa/' $REST_SERVER_CONF diff --git a/hugegraph-test/pom.xml b/hugegraph-test/pom.xml index 714a0defea..96b57201be 100644 --- a/hugegraph-test/pom.xml +++ b/hugegraph-test/pom.xml @@ -103,6 +103,13 @@ 8.0.28 test + + + com.janeluo + ikanalyzer + 2012_u6 + test + From c0f061d62132c75d754421f3c5f4609e261d61cb Mon Sep 17 00:00:00 2001 From: vaughn Date: Tue, 31 Jan 2023 10:53:21 +0800 Subject: [PATCH 04/10] fix(ci): third-party dependency check --- hugegraph-test/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hugegraph-test/pom.xml b/hugegraph-test/pom.xml index 96b57201be..0bda198c4a 100644 --- a/hugegraph-test/pom.xml +++ b/hugegraph-test/pom.xml @@ -109,6 +109,16 @@ ikanalyzer 2012_u6 test + + + lucene-analyzers-common + org.apache.lucene + + + lucene-core + org.apache.lucene + + From 6423e8d388ce5ba5c1a5084f95376ec977f73cb8 Mon Sep 17 00:00:00 2001 From: vaughn Date: Thu, 2 Feb 2023 00:07:01 +0800 Subject: [PATCH 05/10] chore: modify LICENSE and NOTICE and fix binary package include licenses --- LICENSE | 11 +++++++ NOTICE | 31 +++++++++++++++++++ .../src/assembly/descriptor/assembly.xml | 4 --- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 8f71f43fee..7f3ee8a8f9 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,14 @@ See the License for the specific language governing permissions and limitations under the License. +======================================================================== +Apache 2.0 licenses +======================================================================== + +The following components are provided under the Apache License. See project link for details. +The text of each license is the standard Apache 2.0 license. + +hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java from https://github.com/JanusGraph/janusgraph +hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java from https://github.com/JanusGraph/janusgraph +hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java from https://github.com/JanusGraph/janusgraph +hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java from https://github.com/apache/tinkerpop diff --git a/NOTICE b/NOTICE index 42f88212ea..597bea70a0 100644 --- a/NOTICE +++ b/NOTICE @@ -5,3 +5,34 @@ 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. + + +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for JanusGraph +// ------------------------------------------------------------------ + +JanusGraph +Copyright (C) 2002, 2016, Oracle and/or its affiliates. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License") reproduced below or available at: + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for Apache TinkerPop +// ------------------------------------------------------------------ + +Apache TinkerPop +Copyright 2015-2022 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/hugegraph-dist/src/assembly/descriptor/assembly.xml b/hugegraph-dist/src/assembly/descriptor/assembly.xml index 1b055ac132..a5b300216b 100644 --- a/hugegraph-dist/src/assembly/descriptor/assembly.xml +++ b/hugegraph-dist/src/assembly/descriptor/assembly.xml @@ -51,10 +51,6 @@ ${top.level.dir}/hugegraph-dist/release-docs/ / - - LICENSE* - NOTICE* - ${top.level.dir} From be81bf0aa3bf03a2ce72ced425f5eb4d4915c369 Mon Sep 17 00:00:00 2001 From: vaughn Date: Thu, 2 Feb 2023 00:15:31 +0800 Subject: [PATCH 06/10] chore: remove unnecessary license --- hugegraph-dist/release-docs/LICENSE | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index 5e261ae55e..0d1ad06fdc 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -296,7 +296,6 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Guava: Google Core Libraries for Java (com.google.guava:guava:25.1-jre - https://github.com/google/guava/guava) (Apache License, Version 2.0) * HPPC Collections (com.carrotsearch:hppc:0.7.1 - http://labs.carrotsearch.com/hppc.html/hppc) (Apache License, Version 2.0) * HanLP (com.hankcs:hanlp:portable-1.8.3 - https://github.com/hankcs/HanLP) - (Apache License, Version 2.0) * IKAnalyzer (com.janeluo:ikanalyzer:2012_u6 - https://github.com/yangyining/IKAnalyzer) (Apache License, Version 2.0) * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.1 - https://github.com/google/j2objc/) (Apache License, Version 2.0) * JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations) (Apache License, Version 2.0) * JJWT :: API (io.jsonwebtoken:jjwt-api:0.11.5 - https://github.com/jwtk/jjwt/jjwt-api) @@ -340,9 +339,6 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * LZ4 and xxHash (org.lz4:lz4-java:1.8.0 - https://github.com/lz4/lz4-java) (Apache License, Version 2.0) * Lucene Common Analyzers (org.apache.lucene:lucene-analyzers-common:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-common) (Apache License, Version 2.0) * Lucene Core (org.apache.lucene:lucene-core:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-core) - (Apache License, Version 2.0) * Lucene Queries (org.apache.lucene:lucene-queries:4.7.2 - http://lucene.apache.org/lucene-parent/lucene-queries) - (Apache License, Version 2.0) * Lucene QueryParsers (org.apache.lucene:lucene-queryparser:4.7.2 - http://lucene.apache.org/lucene-parent/lucene-queryparser) - (Apache License, Version 2.0) * Lucene Sandbox (org.apache.lucene:lucene-sandbox:4.7.2 - http://lucene.apache.org/lucene-parent/lucene-sandbox) (Apache License, Version 2.0) * Lucene Smart Chinese Analyzer (org.apache.lucene:lucene-analyzers-smartcn:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-smartcn) (Apache License, Version 2.0) * Metrics Core (com.codahale.metrics:metrics-core:3.0.2 - http://metrics.codahale.com/metrics-core/) (Apache License, Version 2.0) * Metrics Core (io.dropwizard.metrics:metrics-core:3.1.5 - http://metrics.codahale.com/metrics-core/) From ed9af9ed465ec477ee3b35383e7bbf8c7315f987 Mon Sep 17 00:00:00 2001 From: vaughn Date: Thu, 2 Feb 2023 21:01:54 +0800 Subject: [PATCH 07/10] chore: modify notice for binary package --- hugegraph-dist/release-docs/NOTICE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hugegraph-dist/release-docs/NOTICE b/hugegraph-dist/release-docs/NOTICE index e99bd0207d..f5a08d7e6f 100644 --- a/hugegraph-dist/release-docs/NOTICE +++ b/hugegraph-dist/release-docs/NOTICE @@ -8,6 +8,26 @@ The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017 ======================================================================== +JanusGraph NOTICE + +======================================================================== +This product contains code form the JanusGraph Project: + +JanusGraph +Copyright (C) 2002, 2016, Oracle and/or its affiliates. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License") reproduced below or available at: + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +======================================================================== + audience-annotations NOTICE ======================================================================== @@ -73,6 +93,7 @@ The Apache Software Foundation (http://www.apache.org/). gremlin-core NOTICE ======================================================================== +This product contains code form the JanusGraph Project: Apache TinkerPop :: Gremlin Core Copyright 2013-2021 Apache Software Foundation From 7710519dfa2e0a4f5dab72860343bda45ce7c4dc Mon Sep 17 00:00:00 2001 From: vaughn Date: Thu, 2 Feb 2023 21:52:51 +0800 Subject: [PATCH 08/10] chore: add JanusGraph license for binary package --- hugegraph-dist/release-docs/LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index 0d1ad06fdc..9884d661e6 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -263,6 +263,7 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-core/) (Apache License, Version 2.0) * Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/) (Apache License, Version 2.0) * Apache Thrift (org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org) + (Apache License, Version 2.0) * JanusGraph (https://github.com/apache/tinkerpop) (Apache License, Version 2.0) * Apache TinkerPop :: Gremlin Console (org.apache.tinkerpop:gremlin-console:3.5.1 - http://tinkerpop.apache.org/gremlin-console/) (Apache License, Version 2.0) * Apache TinkerPop :: Gremlin Core (org.apache.tinkerpop:gremlin-core:3.5.1 - http://tinkerpop.apache.org/gremlin-core/) (Apache License, Version 2.0) * Apache TinkerPop :: Gremlin Driver (org.apache.tinkerpop:gremlin-driver:3.5.1 - http://tinkerpop.apache.org/gremlin-driver/) From 9309c6292f94c6c2913f39e9fa1fe18fab363b0a Mon Sep 17 00:00:00 2001 From: vaughn Date: Mon, 6 Feb 2023 09:29:22 +0800 Subject: [PATCH 09/10] chore: modify binary release license for 3rd party source file --- hugegraph-dist/release-docs/LICENSE | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index 9884d661e6..a423b6236a 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -210,6 +210,18 @@ subcomponents is subject to the terms and conditions of the following licenses. +======================================================================== +Apache 2.0 licenses +======================================================================== + +The following components are provided under the Apache License. See project link for details. +The text of each license is the standard Apache 2.0 license. + +hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java from https://github.com/JanusGraph/janusgraph +hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java from https://github.com/JanusGraph/janusgraph +hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java from https://github.com/JanusGraph/janusgraph +hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java from https://github.com/apache/tinkerpop + ======================================================================== Third party Apache 2.0 licenses @@ -263,7 +275,6 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-core/) (Apache License, Version 2.0) * Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/) (Apache License, Version 2.0) * Apache Thrift (org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org) - (Apache License, Version 2.0) * JanusGraph (https://github.com/apache/tinkerpop) (Apache License, Version 2.0) * Apache TinkerPop :: Gremlin Console (org.apache.tinkerpop:gremlin-console:3.5.1 - http://tinkerpop.apache.org/gremlin-console/) (Apache License, Version 2.0) * Apache TinkerPop :: Gremlin Core (org.apache.tinkerpop:gremlin-core:3.5.1 - http://tinkerpop.apache.org/gremlin-core/) (Apache License, Version 2.0) * Apache TinkerPop :: Gremlin Driver (org.apache.tinkerpop:gremlin-driver:3.5.1 - http://tinkerpop.apache.org/gremlin-driver/) From e3394b6738bdb3c1f99106cd6260428d7e1a84d0 Mon Sep 17 00:00:00 2001 From: vaughn Date: Tue, 7 Feb 2023 22:22:02 +0800 Subject: [PATCH 10/10] improve code --- LICENSE | 2 +- NOTICE | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/LICENSE b/LICENSE index 7f3ee8a8f9..153270d9bb 100644 --- a/LICENSE +++ b/LICENSE @@ -207,7 +207,7 @@ Apache 2.0 licenses The following components are provided under the Apache License. See project link for details. The text of each license is the standard Apache 2.0 license. +hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java from https://github.com/apache/tinkerpop hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java from https://github.com/JanusGraph/janusgraph hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java from https://github.com/JanusGraph/janusgraph hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java from https://github.com/JanusGraph/janusgraph -hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java from https://github.com/apache/tinkerpop diff --git a/NOTICE b/NOTICE index 597bea70a0..362f3166af 100644 --- a/NOTICE +++ b/NOTICE @@ -7,6 +7,18 @@ The Apache Software Foundation (http://www.apache.org/). The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021. +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for Apache TinkerPop +// ------------------------------------------------------------------ + +Apache TinkerPop +Copyright 2015-2022 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + // ------------------------------------------------------------------ // NOTICE file corresponding to the section 4d of The Apache License, // Version 2.0, in this case for JanusGraph @@ -24,15 +36,3 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - -// ------------------------------------------------------------------ -// NOTICE file corresponding to the section 4d of The Apache License, -// Version 2.0, in this case for Apache TinkerPop -// ------------------------------------------------------------------ - -Apache TinkerPop -Copyright 2015-2022 The Apache Software Foundation. - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/).