Skip to content

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

Merged
imbajin merged 10 commits intomasterfrom
zy_dev
Feb 7, 2023
Merged

fix: some reference url and 3rd-party file license#2100
imbajin merged 10 commits intomasterfrom
zy_dev

Conversation

@zyxxoo
Copy link
Copy Markdown
Contributor

@zyxxoo zyxxoo commented Jan 30, 2023

reference: #1632

Copy link
Copy Markdown

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

license-eye has totally checked 888 files.

Valid Invalid Ignored Fixed
670 3 215 0
Click to see the invalid file list
  • hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java
  • hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java
  • hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 31, 2023

Codecov Report

Merging #2100 (e3394b6) into master (e4633e1) will decrease coverage by 20.69%.
The diff coverage is n/a.

@@              Coverage Diff              @@
##             master    #2100       +/-   ##
=============================================
- Coverage     68.70%   48.01%   -20.69%     
+ Complexity      979      379      -600     
=============================================
  Files           479      479               
  Lines         39655    39655               
  Branches       5578     5578               
=============================================
- Hits          27243    19041     -8202     
- Misses         9770    18485     +8715     
+ Partials       2642     2129      -513     
Impacted Files Coverage Δ
.../java/org/apache/hugegraph/api/job/GremlinAPI.java 50.72% <ø> (ø)
...egraph/backend/store/cassandra/CassandraShard.java 0.00% <ø> (-54.55%) ⬇️
...va/org/apache/hugegraph/analyzer/AnsjAnalyzer.java 0.00% <ø> (-60.87%) ⬇️
...a/org/apache/hugegraph/analyzer/HanLPAnalyzer.java 0.00% <ø> (-68.30%) ⬇️
...java/org/apache/hugegraph/analyzer/IKAnalyzer.java 71.42% <ø> (ø)
...a/org/apache/hugegraph/analyzer/JcsegAnalyzer.java 0.00% <ø> (-78.95%) ⬇️
...a/org/apache/hugegraph/analyzer/JiebaAnalyzer.java 41.66% <ø> (-41.67%) ⬇️
...org/apache/hugegraph/analyzer/MMSeg4JAnalyzer.java 0.00% <ø> (-65.22%) ⬇️
...org/apache/hugegraph/analyzer/SmartCNAnalyzer.java 0.00% <ø> (-85.72%) ⬇️
...egraph/traversal/optimize/HugeScriptTraversal.java 85.36% <ø> (ø)
... and 201 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

javeme
javeme previously approved these changes Jan 31, 2023
@zyxxoo zyxxoo changed the title fix: some reference url and third file license fix: some reference url and 3rd-party file license Feb 1, 2023
Comment on lines +11 to +28
// 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.
Copy link
Copy Markdown
Member

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

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

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

@imbajin imbajin added dependencies Incompatible dependencies of package apache labels Feb 1, 2023
@imbajin imbajin added this to the 1.0.0 milestone Feb 1, 2023
(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)
Copy link
Copy Markdown
Contributor Author

@zyxxoo zyxxoo Feb 2, 2023

Choose a reason for hiding this comment

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

@WillemJiang
hi,
Our source code refers to the janusGraph source file, but doesn't refer the jar dependency.
I have modified the source license & notice and binary license & notice to declare it, but I'm a little unsure if i write the binary license in the write way. The binary artifact doesn't have java source file. We don't refer to the janusGraph's binary artifact (we only copy its source file, which becomes class file in binary artifact).
For example:
we source code refers to the A project a.java source file

  1. Wether the binary license needs to declare"a.class from https://githu.com/A"
  2. If we don't refer to A.jar (only source file), do we write "A (https://github.com/A" or "A (org.A:A:0.0.1 - https://github.com/A)"?
  3. If archive file path is different between source path and binary artifact, can we only copy source license to binary license?

I am looking forward to your suggestions to write these situations better.
Thanks a lot

imbajin
imbajin previously approved these changes Feb 6, 2023
Copy link
Copy Markdown
Member

@imbajin imbajin left a comment

Choose a reason for hiding this comment

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

need double check it

javeme
javeme previously approved these changes Feb 6, 2023
Comment on lines +11 to +28
// 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.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

is this comment addressed?

@zyxxoo zyxxoo dismissed stale reviews from javeme and imbajin via e3394b6 February 7, 2023 14:23
@zyxxoo zyxxoo requested review from imbajin and javeme February 7, 2023 14:25
@imbajin imbajin merged commit eed6103 into master Feb 7, 2023
@imbajin imbajin deleted the zy_dev branch February 7, 2023 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

apache dependencies Incompatible dependencies of package

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants