This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch branch-0.11
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
commit 797c29fe731069faf2bbb171f4db6c2191844d74
Author: PJ Fanning <pjfann...@users.noreply.github.com>
AuthorDate: Sun Mar 10 23:54:44 2024 +0100
[NO-ISSUE] Upgrade org.json jar (#4722)
(cherry picked from commit 9cfc4bd815e355c55c11b88c39143a84ca0cee17)
---
elasticsearch/pom.xml | 5 +++++
flink/flink-scala-2.12/pom.xml | 11 +++++++++++
influxdb/pom.xml | 10 ++++++++++
pom.xml | 7 +++++++
zeppelin-distribution/src/bin_license/LICENSE | 6 ++++++
zeppelin-plugins/notebookrepo/gcs/pom.xml | 9 +++++++++
6 files changed, 48 insertions(+)
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 1478d9e12d..048b78253d 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -83,6 +83,11 @@
<version>${unirest.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
diff --git a/flink/flink-scala-2.12/pom.xml b/flink/flink-scala-2.12/pom.xml
index 4587d8f0e4..13329604c7 100644
--- a/flink/flink-scala-2.12/pom.xml
+++ b/flink/flink-scala-2.12/pom.xml
@@ -254,6 +254,17 @@
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
<version>1.4.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
</dependency>
<dependency>
diff --git a/influxdb/pom.xml b/influxdb/pom.xml
index 745a2e9076..5b63c58c6a 100644
--- a/influxdb/pom.xml
+++ b/influxdb/pom.xml
@@ -44,6 +44,16 @@
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
<version>${influxdb.client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/pom.xml b/pom.xml
index 65bf19dea1..7b5f1bd208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
<flexmark.all.version>0.62.2</flexmark.all.version>
<gson.version>2.8.9</gson.version>
<gson-extras.version>0.2.2</gson-extras.version>
+ <org-json.version>20240205</org-json.version>
<jetty.version>9.4.52.v20230823</jetty.version>
<httpcomponents.core.version>4.4.1</httpcomponents.core.version>
<httpcomponents.client.version>4.5.13</httpcomponents.client.version>
@@ -321,6 +322,12 @@
<version>${gson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${org-json.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.danilopianini</groupId>
<artifactId>gson-extras</artifactId>
diff --git a/zeppelin-distribution/src/bin_license/LICENSE
b/zeppelin-distribution/src/bin_license/LICENSE
index 3fed5e7b54..805fb747a7 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -421,8 +421,14 @@ Creative Commons CC0
(http://creativecommons.org/publicdomain/zero/1.0/)
(CC0 1.0 Universal) JSR166e (com.twitter:jsr166e:1.1.0 -
http://github.com/twitter/jsr166e)
(Public Domain, per Creative Commons CC0) HdrHistogram
(org.hdrhistogram:HdrHistogram:2.1.6 -
http://hdrhistogram.github.io/HdrHistogram/)
+
+========================================================================
+Public Domain
+========================================================================
+
(Public Domain) XZ for Java (org.tukaani:xz:1.0 -
http://tukaani.org/xz/java.html)
(Public Domain) AOP alliance (aopalliance:aopalliance:1.0 -
http://aopalliance.sourceforge.net)
+ (Public Domain) JSON in Java [package org.json] (org.json/json/20240205 -
https://github.com/stleary/JSON-java/blob/master/LICENSE)
========================================================================
Multiple licenses
diff --git a/zeppelin-plugins/notebookrepo/gcs/pom.xml
b/zeppelin-plugins/notebookrepo/gcs/pom.xml
index 94011ca880..c2b7ec9deb 100644
--- a/zeppelin-plugins/notebookrepo/gcs/pom.xml
+++ b/zeppelin-plugins/notebookrepo/gcs/pom.xml
@@ -75,9 +75,18 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio</artifactId>
