From 2ca85527fd9f927add9127f91f3f3ef0c98fed6e Mon Sep 17 00:00:00 2001
From: Boglarka Egyed <bogi@apache.org>
Date: Thu, 10 May 2018 18:49:13 +0200
Subject: [PATCH] SQOOP-3322: Version differences between ivy configurations

(Daniel Voros via Boglarka Egyed)
---
 ivy.xml                  | 13 ++++++++++++-
 ivy/libraries.properties |  8 ++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 6af94d9d..1f587f3e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -87,9 +87,14 @@ under the License.
     <dependency org="commons-cli" name="commons-cli"
       rev="${commons-cli.version}" conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging"
-      rev="${commons-logging.version}" conf="common->default"/>
+      rev="${commons-logging.version}" conf="common->default;redist->default"/>
     <dependency org="commons-net" name="commons-net"
       rev="${commons-net.version}" conf="common->default"/>
+    <dependency org="commons-pool" name="commons-pool"
+      rev="${commons-pool.version}" conf="common->default"/>
+    <dependency org="commons-codec" name="commons-codec"
+      rev="${commons-codec.version}" conf="common->default;redist->default"/>
+
     <dependency org="log4j" name="log4j" rev="${log4j.version}"
       conf="common->master" />
     <dependency org="junit" name="junit" rev="${junit.version}"
@@ -119,6 +124,12 @@ under the License.
       <exclude org="org.apache.avro" module="avro" />
     </dependency>
 
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${jackson-databind.version}"
+          conf="common->default;redist->default" />
+
+    <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
+                conf="common->default;redist->default" />
+
     <!-- dependencies for static analysis -->
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
       conf="checkstyle->default" />
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index c44b50bc..565a8bf5 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -26,11 +26,13 @@ checkstyle.version=5.0
 
 commons-cli.version=1.2
 commons-collections.version=3.2.2
-commons-io.version=1.4
+commons-io.version=2.4
 commons-lang.version=2.4
 commons-lang3.version=3.4
-commons-logging.version=1.0.4
+commons-logging.version=1.2
 commons-net.version=3.1
+commons-pool.version=1.6
+commons-codec.version=1.9
 
 hsqldb.version=1.8.0.10
 
@@ -58,3 +60,5 @@ slf4j.version=1.7.7
 hadoop.version=2.6.0
 hbase.version=1.2.4
 hcatalog.version=1.2.1
+
+jackson-databind.version=2.9.5