Repository: sqoop Updated Branches: refs/heads/trunk 03a895c58 -> 2ca85527f
SQOOP-3322: Version differences between ivy configurations (Daniel Voros via Boglarka Egyed) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/2ca85527 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/2ca85527 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/2ca85527 Branch: refs/heads/trunk Commit: 2ca85527fd9f927add9127f91f3f3ef0c98fed6e Parents: 03a895c Author: Boglarka Egyed <b...@apache.org> Authored: Thu May 10 18:49:13 2018 +0200 Committer: Boglarka Egyed <b...@apache.org> Committed: Thu May 10 18:49:13 2018 +0200 ---------------------------------------------------------------------- ivy.xml | 13 ++++++++++++- ivy/libraries.properties | 8 ++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/2ca85527/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index 6af94d9..1f587f3 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" /> http://git-wip-us.apache.org/repos/asf/sqoop/blob/2ca85527/ivy/libraries.properties ---------------------------------------------------------------------- diff --git a/ivy/libraries.properties b/ivy/libraries.properties index c44b50b..565a8bf 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