Skip to content

fix: some reference url and 3rd-party file license #2100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imbajin merged 10 commits into from
Feb 7, 2023
Merged

fix: some reference url and 3rd-party file license #2100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd8d63c
fix: some reference url and third file license
zyxxoo Jan 30, 2023
41fbb9a
fix(ci): license check and dependency check
zyxxoo Jan 30, 2023
e5a5902
fix(ci): unit test and api test need ik jar
zyxxoo Jan 31, 2023
c0f061d
fix(ci): third-party dependency check
zyxxoo Jan 31, 2023
6423e8d
chore: modify LICENSE and NOTICE and fix binary package include licenses
zyxxoo Feb 1, 2023
be81bf0
chore: remove unnecessary license
zyxxoo Feb 1, 2023
ed9af9e
chore: modify notice for binary package
zyxxoo Feb 2, 2023
7710519
chore: add JanusGraph license for binary package
zyxxoo Feb 2, 2023
9309c62
chore: modify binary release license for 3rd party source file
zyxxoo Feb 6, 2023
e3394b6
improve code
zyxxoo Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .licenserc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 11 additions & 0 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
31 changes: 31 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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
// ------------------------------------------------------------------

JanusGraph
Copyright (C) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
Comment on lines +23 to +28
Copy link
Copy Markdown
Member

@imbajin imbajin Feb 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we add it in binary release NOTICE file?

Copy link
Copy Markdown
Contributor

@javeme javeme Feb 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this comment addressed?

Copy link
Copy Markdown
Contributor Author

@zyxxoo zyxxoo Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, i have added it in binary release


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.
3 changes: 0 additions & 3 deletions hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ...-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions hugegraph-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
<groupId>com.janeluo</groupId>
<artifactId>ikanalyzer</artifactId>
<version>${ikanalyzer.version}</version>
<scope>provided</scope>
</dependency>

<!-- fastutil: https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/AnsjAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/HanLPAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/IKAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JcsegAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/JiebaAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/analyzer/SmartCNAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
24 changes: 13 additions & 11 deletions ...graph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*/

Expand Down
29 changes: 13 additions & 16 deletions hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
29 changes: 13 additions & 16 deletions hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
3 changes: 0 additions & 3 deletions hugegraph-core/src/main/java/org/apache/hugegraph/util/CompressUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions hugegraph-core/src/main/java/org/apache/hugegraph/util/GZipUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
29 changes: 13 additions & 16 deletions hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
16 changes: 12 additions & 4 deletions hugegraph-dist/release-docs/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -296,7 +308,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)
Expand Down Expand Up @@ -340,9 +351,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/)
Expand Down
21 changes: 21 additions & 0 deletions hugegraph-dist/release-docs/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

========================================================================
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions hugegraph-dist/scripts/dependency/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading