From 7b2bb13ecc6f951efefee9ef8ea53f29712dfa9f Mon Sep 17 00:00:00 2001
From: Zoltan Borok-Nagy <boroknagyz@cloudera.com>
Date: Tue, 20 Jul 2021 14:39:04 +0200
Subject: [PATCH] IMPALA-10810: Bump json-smart from 2.3 to 2.4.7

I noticed that our json-smart dependency is stale and we could
pick up a newer version.

This patch upgrades it to 2.4.7 which is the newest version at
the time of writing.

Change-Id: I6b43f606f40e172aa267b55c564fa64d68515bd5
Reviewed-on: http://gerrit.cloudera.org:8080/17702
Reviewed-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
---
 fe/pom.xml                         | 4 ++--
 java/datagenerator/pom.xml         | 2 +-
 java/executor-deps/pom.xml         | 4 ++--
 java/pom.xml                       | 1 +
 java/shaded-deps/hive-exec/pom.xml | 4 ++--
 java/test-hive-udfs/pom.xml        | 2 +-
 java/yarn-extras/pom.xml           | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/fe/pom.xml b/fe/pom.xml
index 46dae7b9f..a22d1264e 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -33,11 +33,11 @@ under the License.
   <name>Apache Impala Query Engine Frontend</name>
 
   <dependencies>
-    <!-- Pin json-smart dependency to version 2.3 -->
+    <!-- Pin json-smart dependency. -->
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>
-      <version>2.3</version>
+      <version>${json-smart.version}</version>
     </dependency>
 
     <dependency>
diff --git a/java/datagenerator/pom.xml b/java/datagenerator/pom.xml
index b14a6e42d..dcc1a1dd6 100644
--- a/java/datagenerator/pom.xml
+++ b/java/datagenerator/pom.xml
@@ -38,7 +38,7 @@ under the License.
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>
-      <version>2.3</version>
+      <version>${json-smart.version}</version>
     </dependency>
 
     <dependency>
diff --git a/java/executor-deps/pom.xml b/java/executor-deps/pom.xml
index 50dc4137f..502a02366 100644
--- a/java/executor-deps/pom.xml
+++ b/java/executor-deps/pom.xml
@@ -45,11 +45,11 @@ under the License.
 
   <dependencies>
 
-    <!-- Pin json-smart dependency to version 2.3 -->
+    <!-- Pin json-smart dependency. -->
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>
-      <version>2.3</version>
+      <version>${json-smart.version}</version>
     </dependency>
 
     <dependency>
diff --git a/java/pom.xml b/java/pom.xml
index 7f9498d38..702b367f9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -71,6 +71,7 @@ under the License.
     <xmlsec.version>2.2.1</xmlsec.version>
     <bcprov-jdk15on.version>1.64</bcprov-jdk15on.version>
     <springframework.version>4.3.29.RELEASE</springframework.version>
+    <json-smart.version>2.4.7</json-smart.version>
   </properties>
 
   <repositories>
diff --git a/java/shaded-deps/hive-exec/pom.xml b/java/shaded-deps/hive-exec/pom.xml
index 866786212..7fd6a7292 100644
--- a/java/shaded-deps/hive-exec/pom.xml
+++ b/java/shaded-deps/hive-exec/pom.xml
@@ -35,12 +35,12 @@ the same dependencies
   <packaging>jar</packaging>
 
   <dependencies>
-    <!-- Pin json-smart dependency to version 2.3
+    <!-- Pin json-smart dependency.
          (this is not included in the shaded jar) -->
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>
-      <version>2.3</version>
+      <version>${json-smart.version}</version>
     </dependency>
 
     <dependency>
diff --git a/java/test-hive-udfs/pom.xml b/java/test-hive-udfs/pom.xml
index 6ef7f2447..d4f9c03e2 100644
--- a/java/test-hive-udfs/pom.xml
+++ b/java/test-hive-udfs/pom.xml
@@ -42,7 +42,7 @@ under the License.
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>
-      <version>2.3</version>
+      <version>${json-smart.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/java/yarn-extras/pom.xml b/java/yarn-extras/pom.xml
index 68ba84dbc..1fded2a4a 100644
--- a/java/yarn-extras/pom.xml
+++ b/java/yarn-extras/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart</artifactId>
-      <version>2.3</version>
+      <version>${json-smart.version}</version>
     </dependency>
 
     <dependency>