Skip to content

Commit

Permalink
Merge branch 'master' into fix_kneighbor_api
Browse files Browse the repository at this point in the history
  • Loading branch information
imbajin authored Nov 27, 2024
2 parents a22320e + f0b1395 commit 95484e9
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ For example:

<!-- DO NOT REMOVE THIS SECTION. CHECK THE PROPER BOX ONLY. -->

- [ ] Dependencies ([add/update license](https://hugegraph.apache.org/docs/contribution-guidelines/contribute/#321-check-licenses) info & [regenerate_dependencies](../hugegraph-server/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh)) <!-- Don't forget to add/update the info in "LICENSE" & "NOTICE" files (both in root & dist module) -->
- [ ] Dependencies ([add/update license](https://hugegraph.apache.org/docs/contribution-guidelines/contribute/#321-check-licenses) info & [regenerate_known_dependencies.sh](../install-dist/scripts/dependency/regenerate_known_dependencies.sh)) <!-- Don't forget to add/update the info in "LICENSE" & "NOTICE" files (both in root & dist module) -->
- [ ] Modify configurations
- [ ] The public API
- [ ] Other affects (typed here)
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ Note: To be consistent with the code style easily, if you use [IDEA](https://www
##### 3.2.1 Check licenses
If we want to add new third-party dependencies to the `HugeGraph` project, we need to do the following things:
1. Find the third-party dependent repository, put the dependent `license` file into [./hugegraph-dist/release-docs/licenses/](https://github.com/apache/incubator-hugegraph/tree/master/hugegraph-dist/release-docs/licenses) path.
2. Declare the dependency in [./hugegraph-server/hugegraph-dist/release-docs/LICENSE](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/release-docs/LICENSE) `LICENSE` information.
3. Find the NOTICE file in the repository and append it to [./hugegraph-server/hugegraph-dist/release-docs/NOTICE](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/release-docs/NOTICE) file (skip this step if there is no NOTICE file).
4. Execute locally [./hugegraph-server/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh) to update the dependency list [known-dependencies.txt](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt) (or manually update).
2. Declare the dependency in [./install-dist/release-docs/LICENSE](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/release-docs/LICENSE) `LICENSE` information.
3. Find the NOTICE file in the repository and append it to [./install-dist/release-docs/NOTICE](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/release-docs/NOTICE) file (skip this step if there is no NOTICE file).
4. Execute locally [./install-dist/scripts/dependency/regenerate_known_dependencies.sh](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/scripts/dependency/regenerate_known_dependencies.sh) to update the dependency list [known-dependencies.txt](https://github.com/apache/incubator-hugegraph/blob/master/install-dist/scripts/dependency/known-dependencies.txt) (or manually update).

**Example**: A new third-party dependency is introduced into the project -> `ant-1.9.1.jar`
- The project source code is located at: https://github.com/apache/ant/tree/rel/1.9.1
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-server/hugegraph-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.fury</groupId>
<artifactId>fury-core</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>

<!-- jraft -->
Expand Down
4 changes: 3 additions & 1 deletion hugegraph-store/hg-store-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<!-- TODO: replace it by jackson(com.fasterxml.jackson.core:jackson-databind) -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
<version>20240303</version>
<scope>test</scope>
</dependency>

<dependency>
Expand Down
8 changes: 0 additions & 8 deletions install-dist/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -807,14 +807,6 @@ The text of each license is also included in licenses/LICENSE-[project].txt.

https://central.sonatype.com/artifact/org.mindrot/jbcrypt/0.4 -> ISC

========================================================================
Third party The JSON License licenses
========================================================================
The following components are provided under the The JSON License License. See project link for details.
The text of each license is also included in licenses/LICENSE-[project].txt.

https://central.sonatype.com/artifact/org.json/json/20210307 -> The JSON License

========================================================================
Third party EPL 1.0 licenses
========================================================================
Expand Down

This file was deleted.

31 changes: 15 additions & 16 deletions install-dist/scripts/dependency/known-dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
HdrHistogram-2.1.12.jar
HdrHistogram-2.1.9.jar
LatencyUtils-2.0.3.jar
ST4-4.0.8.jar
accessors-smart-1.2.jar
airline-0.8.jar
android-json-0.0.20131108.vaadin1.jar
Expand Down Expand Up @@ -91,7 +87,7 @@ fastparse_2.12-2.0.4.jar
fastutil-8.5.9.jar
findbugs-annotations-1.3.9-1.jar
front-end-9.0-9.0.20190305.jar
fury-core-0.9.0-SNAPSHOT.jar
fury-core-0.9.0.jar
gremlin-console-3.5.1.jar
gremlin-core-3.5.1.jar
gremlin-driver-3.5.1.jar
Expand Down Expand Up @@ -147,6 +143,8 @@ hamcrest-2.2.jar
hamcrest-core-1.3.jar
hanlp-portable-1.8.3.jar
hbase-shaded-endpoint-2.0.6.jar
HdrHistogram-2.1.12.jar
HdrHistogram-2.1.9.jar
hessian-3.3.6.jar
hessian-3.3.7.jar
high-scale-lib-1.0.6.jar
Expand Down Expand Up @@ -205,12 +203,12 @@ javassist-3.21.0-GA.jar
javassist-3.24.0-GA.jar
javassist-3.28.0-GA.jar
javatuples-1.2.jar
javax-websocket-client-impl-9.4.46.v20220331.jar
javax-websocket-server-impl-9.4.46.v20220331.jar
javax.activation-api-1.2.0.jar
javax.annotation-api-1.3.2.jar
javax.inject-1.jar
javax.json-1.0.jar
javax-websocket-client-impl-9.4.46.v20220331.jar
javax-websocket-server-impl-9.4.46.v20220331.jar
jaxb-api-2.3.1.jar
jaxb-core-3.0.2.jar
jaxb-impl-3.0.2.jar
Expand Down Expand Up @@ -253,8 +251,8 @@ jetty-util-9.4.46.v20220331.jar
jetty-util-ajax-9.4.46.v20220331.jar
jetty-webapp-9.4.46.v20220331.jar
jetty-xml-9.4.46.v20220331.jar
jffi-1.2.16-native.jar
jffi-1.2.16.jar
jffi-1.2.16-native.jar
jflex-1.8.2.jar
jieba-analysis-1.0.2.jar
jjwt-api-0.11.5.jar
Expand All @@ -270,11 +268,10 @@ joda-time-2.10.8.jar
jraft-core-1.3.11.jar
jraft-core-1.3.13.jar
jraft-core-1.3.9.jar
json-20210307.jar
jsonassert-1.5.0.jar
json-path-2.5.0.jar
json-simple-1.1.jar
json-smart-2.3.jar
jsonassert-1.5.0.jar
jsr305-3.0.1.jar
jsr305-3.0.2.jar
jul-to-slf4j-1.7.36.jar
Expand Down Expand Up @@ -305,6 +302,7 @@ kotlin-stdlib-1.6.20.jar
kotlin-stdlib-common-1.5.31.jar
kotlin-stdlib-jdk7-1.6.10.jar
kotlin-stdlib-jdk8-1.6.10.jar
LatencyUtils-2.0.3.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-api-2.15.0.jar
log4j-api-2.17.0.jar
Expand Down Expand Up @@ -354,10 +352,10 @@ netty-buffer-4.1.52.Final.jar
netty-buffer-4.1.72.Final.jar
netty-codec-4.1.52.Final.jar
netty-codec-4.1.72.Final.jar
netty-codec-http-4.1.52.Final.jar
netty-codec-http-4.1.72.Final.jar
netty-codec-http2-4.1.52.Final.jar
netty-codec-http2-4.1.72.Final.jar
netty-codec-http-4.1.52.Final.jar
netty-codec-http-4.1.72.Final.jar
netty-codec-socks-4.1.52.Final.jar
netty-codec-socks-4.1.72.Final.jar
netty-common-4.1.52.Final.jar
Expand Down Expand Up @@ -405,20 +403,20 @@ powermock-module-junit4-2.0.0-RC.3.jar
powermock-module-junit4-common-2.0.0-RC.3.jar
powermock-module-junit4-rule-2.0.0-RC.3.jar
powermock-reflect-2.0.0-RC.3.jar
proto-google-common-protos-1.17.0.jar
proto-google-common-protos-2.0.1.jar
protobuf-java-3.11.0.jar
protobuf-java-3.17.2.jar
protobuf-java-3.21.7.jar
protobuf-java-3.5.1.jar
protobuf-java-util-3.17.2.jar
proto-google-common-protos-1.17.0.jar
proto-google-common-protos-2.0.1.jar
protostuff-api-1.6.0.jar
protostuff-collectionschema-1.6.0.jar
protostuff-core-1.6.0.jar
protostuff-runtime-1.6.0.jar
psjava-0.1.19.jar
reporter-config-base-3.0.3.jar
reporter-config3-3.0.3.jar
reporter-config-base-3.0.3.jar
rewriting-9.0-9.0.20190305.jar
rocksdbjni-6.29.5.jar
rocksdbjni-7.2.2.jar
Expand All @@ -435,9 +433,9 @@ sjk-cli-0.22.jar
sjk-core-0.14.jar
sjk-core-0.22.jar
sjk-hflame-0.22.jar
sjk-jfr-standalone-0.7.jar
sjk-jfr5-0.5.jar
sjk-jfr6-0.7.jar
sjk-jfr-standalone-0.7.jar
sjk-json-0.14.jar
sjk-json-0.22.jar
sjk-nps-0.9.jar
Expand Down Expand Up @@ -481,6 +479,7 @@ spring-expression-5.3.20.jar
spring-jcl-5.3.20.jar
spring-web-5.3.20.jar
spring-webmvc-5.3.20.jar
ST4-4.0.8.jar
stream-2.5.2.jar
swagger-annotations-1.5.18.jar
swagger-annotations-jakarta-2.2.18.jar
Expand Down

0 comments on commit 95484e9

Please sign in to comment.