diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 6bceee1..ae21509 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -115,8 +115,21 @@ org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator curator-framework - ${curator.version} + ${curator.version} + true + + + org.apache.curator + curator-recipes + ${curator.version} + true org.apache.zookeeper @@ -219,6 +232,34 @@ + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + org.apache.curator:curator-framework + + + + false + + + org.apache.curator + org.apache.hive.org.apache.curator + + + + + + + org.apache.maven.plugins maven-javadoc-plugin ${maven.javadoc.plugin.version} diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 8710a8b..a4660bd 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -100,8 +100,21 @@ org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator curator-framework ${curator.version} + true + + + org.apache.curator + curator-recipes + ${curator.version} + true org.apache.hadoop diff --git a/llap-client/pom.xml b/llap-client/pom.xml index aa2cf32..b440053 100644 --- a/llap-client/pom.xml +++ b/llap-client/pom.xml @@ -52,14 +52,28 @@ org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator curator-framework ${curator.version} + true + + + org.apache.curator + curator-recipes + ${curator.version} + true org.apache.curator apache-curator ${curator.version} pom + true org.apache.curator @@ -186,6 +200,35 @@ + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + org.apache.curator:apache-curator + org.apache.curator:curator-framework + + + + false + + + org.apache.curator + org.apache.hive.org.apache.curator + + + + + + diff --git a/llap-common/pom.xml b/llap-common/pom.xml index a4771c2..5159ff5 100644 --- a/llap-common/pom.xml +++ b/llap-common/pom.xml @@ -52,6 +52,24 @@ ${commons-lang3.version} + org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator + curator-framework + ${curator.version} + true + + + org.apache.curator + curator-recipes + ${curator.version} + true + + org.apache.hadoop hadoop-common ${hadoop.version} @@ -250,6 +268,36 @@ + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + org.apache.curator:curator-client + org.apache.curator:curator-framework + org.apache.curator:curator-recipes + + + + false + + + org.apache.curator + org.apache.hive.org.apache.curator + + + + + + + org.apache.maven.plugins maven-jar-plugin diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml index 69fbea3..da5cd22 100644 --- a/llap-tez/pom.xml +++ b/llap-tez/pom.xml @@ -51,23 +51,6 @@ ${zookeeper.version} - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - apache-curator - ${curator.version} - pom - - - org.apache.curator - curator-test - ${curator.version} - test - - org.apache.commons commons-lang3 ${commons-lang3.version} diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml index 84686ee..a668a04 100644 --- a/packaging/src/main/assembly/bin.xml +++ b/packaging/src/main/assembly/bin.xml @@ -39,6 +39,8 @@ true true + + org.apache.curator:* org.apache.hadoop:* org.apache.hive.hcatalog:* org.slf4j:* diff --git a/pom.xml b/pom.xml index 006e8f8..52f92d8 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ 3.4.6 1.1 2.4.0 - 2.7.1 + 2.10.0 3.0.0 0.6.0 2.2.4 @@ -576,21 +576,6 @@ - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - org.codehaus.groovy groovy-all ${groovy.version} diff --git a/ql/pom.xml b/ql/pom.xml index 7ed8f27..bac4181 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -310,14 +310,28 @@ org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator curator-framework ${curator.version} + true + + + org.apache.curator + curator-recipes + ${curator.version} + true org.apache.curator apache-curator ${curator.version} pom + true org.apache.curator @@ -917,6 +931,10 @@ org.apache.orc:orc-core org.apache.orc:orc-tools joda-time:joda-time + org.apache.curator:apache-curator + org.apache.curator:curator-client + org.apache.curator:curator-framework + org.apache.curator:curator-recipes @@ -925,6 +943,10 @@ org.apache.hive.com.esotericsoftware + org.apache.curator + org.apache.hive.org.apache.curator + + org.objenesis org.apache.hive.org.objenesis diff --git a/service/pom.xml b/service/pom.xml index 412bde5..92c96ba 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -161,13 +161,21 @@ org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator curator-framework ${curator.version} + true org.apache.curator curator-recipes ${curator.version} + true org.apache.hadoop @@ -377,6 +385,35 @@ + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + org.apache.curator:curator-framework + org.apache.curator:curator-recipes + + + + false + + + org.apache.curator + org.apache.hive.org.apache.curator + + + + + + org.apache.maven.plugins diff --git a/shims/common/pom.xml b/shims/common/pom.xml index 209271b..e50740a 100644 --- a/shims/common/pom.xml +++ b/shims/common/pom.xml @@ -72,10 +72,6 @@ ${libthrift.version} - org.apache.curator - curator-framework - - org.apache.zookeeper zookeeper ${zookeeper.version} diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 924286f..37a77c0 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -54,6 +54,7 @@ 0.8.0.RELEASE 1.4 3.2 + 2.10.0 4.2.4 4.1.17 3.2.0-m3 @@ -148,6 +149,24 @@ ${commons-lang3.version} + org.apache.curator + curator-client + ${curator.version} + true + + + org.apache.curator + curator-framework + ${curator.version} + true + + + org.apache.curator + curator-recipes + ${curator.version} + true + + org.apache.derby derby ${derby.version} @@ -534,6 +553,36 @@ ${basedir}/src/main/java + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + org.apache.curator:curator-client + org.apache.curator:curator-framework + org.apache.curator:curator-recipes + + + + false + + + org.apache.curator + org.apache.hive.org.apache.curator + + + + + +