This is an automated email from the ASF dual-hosted git repository.
ming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/master by this push:
new f0b13952a chore(dist): fix the JSON license issue (#2697)
f0b13952a is described below
commit f0b13952aa5a9d737de8ce6234b7d057ff7bd041
Author: V_Galaxy <[email protected]>
AuthorDate: Mon Nov 25 17:20:43 2024 +0800
chore(dist): fix the JSON license issue (#2697)
* setup
* chore: change json scope to 'test' in pd.pom
* update license
---------
Co-authored-by: imbajin <[email protected]>
---
hugegraph-store/hg-store-core/pom.xml | 4 ++-
install-dist/release-docs/LICENSE | 8 ------
.../licenses/LICENSE-json-20210307.txt | 1 -
.../scripts/dependency/known-dependencies.txt | 29 +++++++++++-----------
4 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/hugegraph-store/hg-store-core/pom.xml
b/hugegraph-store/hg-store-core/pom.xml
index e59298efa..17a53380f 100644
--- a/hugegraph-store/hg-store-core/pom.xml
+++ b/hugegraph-store/hg-store-core/pom.xml
@@ -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>
diff --git a/install-dist/release-docs/LICENSE
b/install-dist/release-docs/LICENSE
index bebcf355a..c9af87fde 100644
--- a/install-dist/release-docs/LICENSE
+++ b/install-dist/release-docs/LICENSE
@@ -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
========================================================================
diff --git a/install-dist/release-docs/licenses/LICENSE-json-20210307.txt
b/install-dist/release-docs/licenses/LICENSE-json-20210307.txt
deleted file mode 100644
index 3cb0f7e7c..000000000
--- a/install-dist/release-docs/licenses/LICENSE-json-20210307.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://json.org/license.html
diff --git a/install-dist/scripts/dependency/known-dependencies.txt
b/install-dist/scripts/dependency/known-dependencies.txt
index e1c47ee3c..6acee8235 100644
--- a/install-dist/scripts/dependency/known-dependencies.txt
+++ b/install-dist/scripts/dependency/known-dependencies.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
