Author: cws Date: Mon Jun 18 19:54:03 2012 New Revision: 1351467 URL: http://svn.apache.org/viewvc?rev=1351467&view=rev Log: HIVE-3019 [jira] Add JUnit to list of test dependencies managed by Ivy
Summary: HIVE-3019. Add JUnit to list of test dependencies managed by Ivy Test Plan: EMPTY Reviewers: JIRA, ashutoshc Reviewed By: ashutoshc Differential Revision: https://reviews.facebook.net/D3171 Modified: hive/trunk/cli/ivy.xml hive/trunk/contrib/ivy.xml hive/trunk/hbase-handler/ivy.xml hive/trunk/hwi/ivy.xml hive/trunk/jdbc/ivy.xml hive/trunk/metastore/ivy.xml hive/trunk/pdk/ivy.xml hive/trunk/ql/ivy.xml hive/trunk/serde/ivy.xml hive/trunk/service/ivy.xml hive/trunk/shims/ivy.xml Modified: hive/trunk/cli/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/cli/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/cli/ivy.xml (original) +++ hive/trunk/cli/ivy.xml Mon Jun 18 19:54:03 2012 @@ -48,6 +48,9 @@ conf="runtime" transitive="false"/> <!-- Test Dependencies --> - <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}" /> + <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> Modified: hive/trunk/contrib/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/contrib/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/contrib/ivy.xml (original) +++ hive/trunk/contrib/ivy.xml Mon Jun 18 19:54:03 2012 @@ -36,5 +36,9 @@ 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> Modified: hive/trunk/hbase-handler/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/hbase-handler/ivy.xml (original) +++ hive/trunk/hbase-handler/ivy.xml Mon Jun 18 19:54:03 2012 @@ -46,5 +46,9 @@ transitive="false"/> <dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="${jackson.version}"/> <dependency org="org.codehaus.jackson" name="jackson-xc" rev="${jackson.version}"/> + + <!-- Test Dependencies --> + <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" /> + </dependencies> </ivy-module> Modified: hive/trunk/hwi/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/hwi/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/hwi/ivy.xml (original) +++ hive/trunk/hwi/ivy.xml Mon Jun 18 19:54:03 2012 @@ -33,6 +33,9 @@ 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}" Modified: hive/trunk/jdbc/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/jdbc/ivy.xml (original) +++ hive/trunk/jdbc/ivy.xml Mon Jun 18 19:54:03 2012 @@ -33,5 +33,9 @@ transitive="false"/> <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" transitive="false"/> + + <!-- Test Dependencies --> + <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" /> + </dependencies> </ivy-module> Modified: hive/trunk/metastore/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/metastore/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/metastore/ivy.xml (original) +++ hive/trunk/metastore/ivy.xml Mon Jun 18 19:54:03 2012 @@ -62,5 +62,9 @@ <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> Modified: hive/trunk/pdk/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/pdk/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/pdk/ivy.xml (original) +++ hive/trunk/pdk/ivy.xml Mon Jun 18 19:54:03 2012 @@ -29,5 +29,7 @@ <dependencies> <dependency org="org.apache.hive" name="hive-cli" rev="${version}" conf="compile->default" transitive="false" /> + <dependency org="junit" name="junit" rev="${junit.version}" + conf="compile->default" /> </dependencies> </ivy-module> Modified: hive/trunk/ql/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/ql/ivy.xml (original) +++ hive/trunk/ql/ivy.xml Mon Jun 18 19:54:03 2012 @@ -63,7 +63,6 @@ transitive="false"/> <dependency org="org.apache.derby" name="derby" rev="${derby.version}"/> <dependency org="com.googlecode.javaewah" name="JavaEWAH" rev="${javaewah.version}"/> - <dependency org="junit" name="junit" rev="${junit.version}"/> <dependency org="org.datanucleus" name="datanucleus-connectionpool" rev="${datanucleus-connectionpool.version}" transitive="false"/> @@ -82,5 +81,9 @@ <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> Modified: hive/trunk/serde/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/serde/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/serde/ivy.xml (original) +++ hive/trunk/serde/ivy.xml Mon Jun 18 19:54:03 2012 @@ -49,5 +49,8 @@ transitive="false"/> <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}" transitive="false"/> + + <!-- Test Dependencies --> + <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" /> </dependencies> </ivy-module> Modified: hive/trunk/service/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/service/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/service/ivy.xml (original) +++ hive/trunk/service/ivy.xml Mon Jun 18 19:54:03 2012 @@ -37,5 +37,8 @@ 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" /> </dependencies> </ivy-module> Modified: hive/trunk/shims/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/ivy.xml?rev=1351467&r1=1351466&r2=1351467&view=diff ============================================================================== --- hive/trunk/shims/ivy.xml (original) +++ hive/trunk/shims/ivy.xml Mon Jun 18 19:54:03 2012 @@ -120,6 +120,9 @@ <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM--> </dependency> + <!-- Test Dependencies --> + <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" /> + <conflict manager="all" /> </dependencies> </ivy-module>
