Author: rding Date: Wed Aug 18 17:28:56 2010 New Revision: 986805 URL: http://svn.apache.org/viewvc?rev=986805&view=rev Log: PIG-1452: to remove hadoop20.jar from lib and use hadoop from the apache maven repo.
Removed: hadoop/pig/trunk/lib/hadoop20.jar Modified: hadoop/pig/trunk/CHANGES.txt hadoop/pig/trunk/build.xml hadoop/pig/trunk/contrib/piggybank/java/build.xml hadoop/pig/trunk/contrib/zebra/build-contrib.xml hadoop/pig/trunk/contrib/zebra/build.xml hadoop/pig/trunk/ivy.xml hadoop/pig/trunk/ivy/libraries.properties Modified: hadoop/pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/CHANGES.txt (original) +++ hadoop/pig/trunk/CHANGES.txt Wed Aug 18 17:28:56 2010 @@ -26,6 +26,9 @@ PIG-1249: Safe-guards against misconfigu IMPROVEMENTS +PIG-1452: to remove hadoop20.jar from lib and use hadoop from the apache maven +repo. (rding) + PIG-1295: Binary comparator for secondary sort (azaroth via daijy) PIG-1448: Detach tuple from inner plans of physical operator (thejas) Modified: hadoop/pig/trunk/build.xml URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/build.xml (original) +++ hadoop/pig/trunk/build.xml Wed Aug 18 17:28:56 2010 @@ -47,7 +47,6 @@ <!-- property name="build.encoding" value="ISO-8859-1" / --> <property name="build.encoding" value="UTF8" /> <!-- TODO with only one version of hadoop in the lib folder we do not need that anymore --> - <property name="hadoop.jarfile" value="hadoop20.jar" /> <property name="automaton.jarfile" value="automaton.jar" /> <property name="hbase.jarfile" value="hbase-0.20.0.jar" /> <property name="hbase.test.jarfile" value="hbase-0.20.0-test.jar" /> @@ -130,6 +129,7 @@ <!-- IVY properteis set here --> <property name="ivy.dir" location="ivy" /> <loadproperties srcfile="${ivy.dir}/libraries.properties"/> + <property name="hadoop.jar" value="hadoop-core-${hadoop-core.version}.jar" /> <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/> <property name="guava.jar" value="guava-${guava.version}.jar"/> <property name="ivy_repo_url" value="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/> @@ -168,16 +168,10 @@ <!-- setup the classpath --> <path id="classpath"> <path refid="compile.classpath"/> - <fileset file="${lib.dir}/${hadoop.jarfile}" /> <fileset file="${lib.dir}/${automaton.jarfile}" /> <fileset file="${lib.dir}/${hbase.jarfile}" /> <fileset file="${lib.dir}/${hbase.test.jarfile}" /> <fileset file="${lib.dir}/${zookeeper.jarfile}"/> - <fileset file="${ivy.lib.dir}/jackson-mapper-asl-${jackson.version}.jar"/> - <fileset file="${ivy.lib.dir}/jackson-core-asl-${jackson.version}.jar"/> - <fileset file="${ivy.lib.dir}/joda-time-${joda-time.version}.jar" /> - <fileset file="${ivy.lib.dir}/jython-${jython.version}.jar" /> - <!-- <fileset file="${lib.dir}/commons-collections-3.2.jar" /> --> </path> <!-- javadoc-classpath --> @@ -465,15 +459,18 @@ <attribute name="Svn-Revision" value="${svnString}" /> </section> </manifest> - <zipfileset src="${lib.dir}/${hadoop.jarfile}" /> + <zipfileset src="${ivy.lib.dir}/hadoop-core-${hadoop-core.version}.jar" /> <zipfileset src="${lib.dir}/${automaton.jarfile}" /> <zipfileset src="${ivy.lib.dir}/junit-${junit.version}.jar" /> <zipfileset src="${ivy.lib.dir}/jsch-${jsch.version}.jar" /> <zipfileset src="${ivy.lib.dir}/jline-${jline.version}.jar" /> <zipfileset src="${ivy.lib.dir}/jackson-mapper-asl-${jackson.version}.jar" /> <zipfileset src="${ivy.lib.dir}/jackson-core-asl-${jackson.version}.jar" /> - <zipfileset src="${ivy.lib.dir}/joda-time-${joda-time.version}.jar" /> - <zipfileset src="${ivy.lib.dir}/${guava.jar}" /> + <zipfileset src="${ivy.lib.dir}/joda-time-${joda-time.version}.jar" /> + <zipfileset src="${ivy.lib.dir}/${guava.jar}" /> + <zipgroupfileset dir="${ivy.lib.dir}" includes="commons*.jar"/> + <zipgroupfileset dir="${ivy.lib.dir}" includes="log4j*.jar"/> + <zipgroupfileset dir="${ivy.lib.dir}" includes="jsp-api*.jar"/> </jar> <copy file="${output.jarfile}" tofile="${output.jarfile.backcompat}"/> </target> Modified: hadoop/pig/trunk/contrib/piggybank/java/build.xml URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/piggybank/java/build.xml?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/contrib/piggybank/java/build.xml (original) +++ hadoop/pig/trunk/contrib/piggybank/java/build.xml Wed Aug 18 17:28:56 2010 @@ -33,7 +33,6 @@ <property name="build.javadoc" value="${build.docs}/api" /> <property name="pigjar" value="../../../pig.jar" /> <property name="pigjar-withouthadoop" value="../../../pig-withouthadoop.jar" /> - <property name="hadoopjar" value="../../../lib/hadoop20.jar" /> <property name="pigtest" value="../../../build/test/classes" /> <property name="udfjar" value="piggybank.jar" /> <property name="src.dir" value="src/main/java/org/apache/pig/piggybank" /> @@ -68,10 +67,12 @@ <pathelement location="${build.classes}"/> <pathelement location="${pigjar}"/> <pathelement location="${pigjar-withouthadoop}"/> - <pathelement location="${hadoopjar}"/> <pathelement location="${pigtest}"/> <pathelement location="${hive_execjar}"/> <pathelement location="${hsqldb.jar}"/> + <fileset dir="../../../build/ivy/lib"> + <include name="**/*.jar"/> + </fileset> </path> <path id="test.classpath"> Modified: hadoop/pig/trunk/contrib/zebra/build-contrib.xml URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/build-contrib.xml?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/contrib/zebra/build-contrib.xml (original) +++ hadoop/pig/trunk/contrib/zebra/build-contrib.xml Wed Aug 18 17:28:56 2010 @@ -100,7 +100,6 @@ <!-- the normal classpath --> <path id="classpath"> <fileset dir="${pig.root}/lib"> - <include name="${hadoop.jarfile}" /> <include name="${hbase.jarfile}" /> <include name="${hbase.test.jarfile}" /> </fileset> @@ -150,7 +149,7 @@ <!-- ====================================================== --> <!-- Compile a Pig contrib's files --> <!-- ====================================================== --> - <target name="compile" depends="init, cc-compile, hadoop-jar-exists" unless="skip.contrib"> + <target name="compile" depends="init, cc-compile" unless="skip.contrib"> <echo message="contrib: ${name}"/> <javac encoding="${build.encoding}" Modified: hadoop/pig/trunk/contrib/zebra/build.xml URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/build.xml?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/contrib/zebra/build.xml (original) +++ hadoop/pig/trunk/contrib/zebra/build.xml Wed Aug 18 17:28:56 2010 @@ -45,10 +45,6 @@ to call at top-level: ant deploy-contrib <attribute name="Svn-Revision" value="${svn.revision}" /> </section> </manifest> - - <zipfileset src="${pig.root}/lib/${hadoop.jarfile}"> - <include name="${hadoop.includes}" /> - </zipfileset> </jar> </target> Modified: hadoop/pig/trunk/ivy.xml URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy.xml?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/ivy.xml (original) +++ hadoop/pig/trunk/ivy.xml Wed Aug 18 17:28:56 2010 @@ -48,8 +48,20 @@ conf="checkstyle->master"/> <dependency org="commons-beanutils" name="commons-beanutils-core" rev="${commons-beanutils.version}" conf="checkstyle->master"/> + <dependency org="commons-el" name="commons-el" rev="${commons-el.version}" + conf="compile->master"/> + <dependency org="log4j" name="log4j" rev="${log4j.version}" + conf="compile->master"/> + <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}" + conf="compile->default;test->default"/> + <dependency org="org.apache.hadoop" name="hadoop-test" rev="${hadoop-test.version}" + conf="compile->default;test->default"/> + <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}" + conf="compile->master"/> <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" - conf="checkstyle->master"/> + conf="compile->master"/> + <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" + conf="compile->master;test->master"/> <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}" conf="checkstyle->master"/> Modified: hadoop/pig/trunk/ivy/libraries.properties URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/libraries.properties?rev=986805&r1=986804&r2=986805&view=diff ============================================================================== --- hadoop/pig/trunk/ivy/libraries.properties (original) +++ hadoop/pig/trunk/ivy/libraries.properties Wed Aug 18 17:28:56 2010 @@ -19,18 +19,27 @@ antlr.version=2.7.6 commons-beanutils.version=1.7.0 commons-cli.version=1.0 +commons-el.version=1.0 commons-logging.version=1.0.3 checkstyle.version=4.2 ivy.version=2.2.0-rc1 +hadoop-core.version=0.20.2 +hadoop-test.version=0.20.2 hsqldb.version=1.8.0.10 javacc.version=4.2 +jetty-util.version=6.1.14 jline.version=0.9.94 jsch.version=0.1.38 junit.version=4.5 jdiff.version=1.0.9 +log4j.version=1.2.14 + +slf4j-api.version=1.4.3 +slf4j-log4j12.version=1.4.3 + rats-lib.version=0.5.1 xerces.version=1.4.4