Permalink
Browse files

HIVE-4148 : Cleanup aisle ivy (Gunther Hagleitner via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1455551 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 37d4446 commit 82157335da424a14ed576bf85e16b120b61e20f9 @ashutoshc ashutoshc committed Mar 12, 2013
Showing with 2 additions and 226 deletions.
  1. +0 −2 builtins/ivy.xml
  2. +0 −15 cli/ivy.xml
  3. +0 −48 common/ivy.xml
  4. +0 −12 contrib/ivy.xml
  5. +0 −41 hbase-handler/ivy.xml
  6. +0 −5 hwi/ivy.xml
  7. +2 −10 jdbc/ivy.xml
  8. +0 −18 metastore/ivy.xml
  9. +0 −43 ql/ivy.xml
  10. +0 −23 serde/ivy.xml
  11. +0 −9 service/ivy.xml
View
@@ -27,8 +27,6 @@
<include file="${ivy.conf.dir}/common-configurations.xml"/>
</configurations>
<dependencies>
- <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
- conf="compile->default" />
<dependency org="org.apache.hive" name="hive-pdk" rev="${version}"
conf="compile->default" transitive="false" />
View
@@ -29,28 +29,13 @@
<dependencies>
<!-- Runtime Dependencies -->
- <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
- <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
<dependency org="jline" name="jline" rev="${jline.version}"
transitive="false"/>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
-
<dependency org="org.apache.hive" name="hive-service" rev="${version}"
conf="compile->default" />
<dependency org="org.apache.hive" name="hive-shims" rev="${version}"
conf="runtime" transitive="false"/>
<dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
conf="runtime" transitive="false"/>
-
- <!-- Test Dependencies -->
- <dependency org="junit" name="junit"
- rev="${junit.version}" conf="test->default" />
- <dependency org="org.mockito" name="mockito-all"
- rev="${mockito-all.version}" conf="test->default" />
</dependencies>
</ivy-module>
View
@@ -27,69 +27,21 @@
<include file="${ivy.conf.dir}/common-configurations.xml"/>
</configurations>
<dependencies>
- <dependency org="org.apache.hadoop" name="hadoop-common"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.compile->default" transitive="false">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
<dependency org="org.apache.hadoop" name="hadoop-auth"
rev="${hadoop-0.23.version}"
conf="hadoop23.compile->default" transitive="false">
<include type="jar"/>
<exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
<exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
</dependency>
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.compile->default" transitive="false">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
- <dependency org="org.apache.hadoop" name="hadoop-archives"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.compile->default" transitive="false">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
<dependency org="org.apache.avro" name="avro" rev="${avro.version}"
conf="hadoop23.compile->default" transitive="false" />
- <dependency org="org.apache.hadoop" name="hadoop-core"
- rev="${hadoop-0.20.version}"
- conf="hadoop20.compile->default" transitive="false">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
-
- <dependency org="org.apache.hadoop" name="hadoop-test"
- rev="${hadoop-0.20.version}"
- conf="hadoop20.compile->default" transitive="false">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
- <dependency org="org.apache.hadoop" name="hadoop-tools"
- rev="${hadoop-0.20.version}"
- conf="hadoop20.compile->default" transitive="false">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
-
<dependency org="org.apache.hive" name="hive-shims" rev="${version}"
conf="compile->default" transitive="false" />
<dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
<dependency org="org.apache.commons" name="commons-compress" rev="${commons-compress.version}"/>
<dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}"
transitive="false"/>
</dependencies>
View
@@ -28,17 +28,5 @@
<dependencies>
<dependency org="org.apache.hive" name="hive-exec" rev="${version}"
conf="compile->default" />
- <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
- conf="compile->default" transitive="false" />
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
- <dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}"
- transitive="false"/>
-
- <!-- Test Dependencies -->
- <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
</dependencies>
</ivy-module>
View
@@ -28,12 +28,6 @@
<dependencies>
<dependency org="org.apache.hive" name="hive-exec" rev="${version}"
conf="compile->default" />
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
- <dependency org="log4j" name="log4j" rev="${log4j.version}"
- transitive="false"/>
<dependency org="org.apache.hbase" name="hbase" rev="${hbase.version}"
transitive="false">
<artifact name="hbase" type="jar"/>
@@ -42,42 +36,7 @@
</dependency>
<dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="1.1.1"
transitive="false"/>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="${zookeeper.version}"
- transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="${jackson.version}"/>
<dependency org="org.codehaus.jackson" name="jackson-xc" rev="${jackson.version}"/>
-
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default" transitive="false">
- <artifact name="hadoop-mapreduce-client-jobclient" ext="jar" />
- <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
- <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default">
- <artifact name="hadoop-yarn-server-tests" type="tests" ext="jar" m:classifier="tests"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-app"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default">
- <include type="jar"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
</dependencies>
</ivy-module>
View
@@ -29,13 +29,8 @@
<dependency org="org.apache.hive" name="hive-cli" rev="${version}"
conf="compile->default" />
<dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" />
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
<!-- Test Dependencies -->
- <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
<dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
conf="test->default" transitive="false"/>
<dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}"
View
@@ -27,17 +27,9 @@
<include file="${ivy.conf.dir}/common-configurations.xml"/>
</configurations>
<dependencies>
- <dependency org="org.apache.hive" name="hive-service" rev="${version}"
- conf="compile->default" />
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
<dependency org="sqlline" name="sqlline" rev="${sqlline.version}" branch="${sqlline.branch}"
transitive="false"/>
-
- <!-- Test Dependencies -->
- <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
+ <dependency org="org.apache.hive" name="hive-cli" rev="${version}"
+ conf="compile->default" />
</dependencies>
</ivy-module>
View
@@ -28,16 +28,8 @@
<dependencies>
<dependency org="org.apache.hive" name="hive-serde" rev="${version}"
conf="compile->default" />
- <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
- conf="compile->default" transitive="false" />
<dependency org="org.antlr" name="antlr" rev="${antlr.version}"/>
<dependency org="org.antlr" name="antlr-runtime" rev="${antlr-runtime.version}"/>
- <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
- <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
<dependency org="commons-dbcp" name="commons-dbcp" rev="${commons-dbcp.version}">
<exclude module="commons-pool" />
<exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
@@ -54,17 +46,7 @@
<dependency org="javax.jdo" name="jdo2-api" rev="${jdo-api.version}"
transitive="false"/>
<dependency org="org.apache.derby" name="derby" rev="${derby.version}"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
- transitive="false"/>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}" transitive="false" />
-
- <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}" transitive="false" />
-
<dependency org="asm" name="asm" rev="${asm.version}"/>
- <!-- Test Dependencies -->
- <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
</dependencies>
</ivy-module>
View
@@ -28,71 +28,28 @@
<dependencies>
<dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
conf="compile->default" />
- <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
- conf="runtime" transitive="false"/>
<dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
conf="test->default,runtime" transitive="false"/>
<dependency org="org.apache.hive" name="hive-hbase-handler" rev="${version}"
conf="test->default" transitive="false"/>
<dependency org="org.apache.hive" name="hive-contrib" rev="${version}"
conf="test->default" transitive="false"/>
- <dependency org="org.antlr" name="antlr" rev="${antlr.version}"
- transitive="false"/>
<dependency org="com.google.protobuf" name="protobuf-java"
rev="${protobuf.version}" transitive="false"/>
<dependency org="org.iq80.snappy" name="snappy"
rev="${snappy.version}" transitive="false"/>
<!-- hadoop specific guava -->
- <dependency org="com.google.guava" name="guava" rev="${guava-hadoop20.version}"
- conf="hadoop20.compile->default" transitive="false"/>
- <dependency org="com.google.guava" name="guava" rev="${guava-hadoop23.version}"
- conf="hadoop23.compile->default" transitive="false"/>
-
- <dependency org="org.antlr" name="antlr-runtime" rev="${antlr-runtime.version}"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
- transitive="false"/>
- <dependency org="org.apache.zookeeper" name="zookeeper"
- rev="${zookeeper.version}" transitive="false">
- <include type="jar"/>
- </dependency>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
- <dependency org="log4j" name="log4j" rev="${log4j.version}" transitive="false"/>
<dependency org="org.json" name="json" rev="${json.version}"/>
<dependency org="commons-collections" name="commons-collections" rev="${commons-collections.version}"/>
- <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
<dependency org="commons-configuration" name="commons-configuration" rev="${commons-configuration.version}"
transitive="false"/>
- <dependency org="org.apache.derby" name="derby" rev="${derby.version}"/>
<dependency org="com.googlecode.javaewah" name="JavaEWAH" rev="${javaewah.version}"/>
- <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${jackson.version}"/>
-
- <dependency org="org.datanucleus" name="datanucleus-connectionpool" rev="${datanucleus-connectionpool.version}"
- transitive="false"/>
- <dependency org="org.datanucleus" name="datanucleus-core" rev="${datanucleus-core.version}"
- transitive="false"/>
- <dependency org="org.datanucleus" name="datanucleus-enhancer" rev="${datanucleus-enhancer.version}"
- transitive="false"/>
- <dependency org="org.datanucleus" name="datanucleus-rdbms" rev="${datanucleus-rdbms.version}"
- transitive="false"/>
<dependency org="javolution" name="javolution" rev="${javolution.version}"/>
<dependency org="jline" name="jline" rev="${jline.version}" transitive="false"/>
<!-- Hack to get jobclient tests dependency in. -->
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default" transitive="false">
- <artifact name="hadoop-mapreduce-client-jobclient" ext="jar" />
- <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
<dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests"
rev="${hadoop-0.23.version}"
conf="hadoop23.test->default">
View
@@ -28,21 +28,12 @@
<dependencies>
<dependency org="org.apache.hive" name="hive-common" rev="${version}"
conf="compile->default" />
- <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
- conf="compile->default" transitive="false" />
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
transitive="false"/>
<dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}"/>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
<dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
transitive="false"/>
- <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
- <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
- transitive="false"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
- transitive="false"/>
<dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}"
transitive="false"/>
<dependency org="org.apache.avro" name="avro" rev="${avro.version}"
@@ -51,20 +42,6 @@
transitive="false"/>
<!-- Test Dependencies -->
- <dependency org="org.apache.hadoop" name="hadoop-common"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default">
- <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs"
- rev="${hadoop-0.23.version}"
- conf="hadoop23.test->default">
- <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
- <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
- <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
- </dependency>
<dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
</dependencies>
</ivy-module>
Oops, something went wrong.

0 comments on commit 8215733

Please sign in to comment.