Author: gkesavan
Date: Tue Jul 13 17:19:24 2010
New Revision: 963793

URL: http://svn.apache.org/viewvc?rev=963793&view=rev
Log:
PIG-1452: To remove hadoop20.jar from lib and resolve from maven repository. 
Contributed by Giridharan Kesavan

Modified:
    hadoop/pig/trunk/CHANGES.txt
    hadoop/pig/trunk/build.xml
    hadoop/pig/trunk/ivy.xml
    hadoop/pig/trunk/ivy/ivysettings.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=963793&r1=963792&r2=963793&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Tue Jul 13 17:19:24 2010
@@ -92,6 +92,8 @@ create a local copy of test-patch.sh (gk
 PIG-1302: Include zebra's "pigtest" ant target as a part of pig's 
 ant test target. (gkesavan)
 
+PIG-1452: To remove hadoop20.jar from lib and resolve from maven 
repository.(gkesavan)
+
 OPTIMIZATIONS
 
 PIG-1353: Map-side joins (ashutoshc)

Modified: hadoop/pig/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=963793&r1=963792&r2=963793&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Tue Jul 13 17:19:24 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="hbase.jarfile" value="hbase-0.20.0.jar" />
     <property name="hbase.test.jarfile" value="hbase-0.20.0-test.jar" />
        <property name="zookeeper.jarfile" value="zookeeper-hbase-1329.jar" />
@@ -129,6 +128,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="ivy_repo_url" 
value="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
     <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml" />
@@ -166,15 +166,10 @@
     <!-- setup the classpath -->
     <path id="classpath">
        <path refid="compile.classpath"/>       
-        <fileset file="${lib.dir}/${hadoop.jarfile}" />
         <fileset file="${lib.dir}/${hbase.jarfile}" />
-               <fileset file="${lib.dir}/${guava.jarfile}" />
+       <fileset file="${lib.dir}/${guava.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="${lib.dir}/commons-collections-3.2.jar" />  -->
     </path>
 
     <!-- javadoc-classpath -->
@@ -463,7 +458,7 @@
                     <attribute name="Svn-Revision" value="${svnString}" />
                 </section>
             </manifest>
-            <zipfileset src="${lib.dir}/${hadoop.jarfile}" />
+            <zipfileset src="${ivy.lib.dir}/${hadoop.jar}" />
             <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" />

Modified: hadoop/pig/trunk/ivy.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy.xml?rev=963793&r1=963792&r2=963793&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy.xml (original)
+++ hadoop/pig/trunk/ivy.xml Tue Jul 13 17:19:24 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/ivysettings.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/ivysettings.xml?rev=963793&r1=963792&r2=963793&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/ivysettings.xml (original)
+++ hadoop/pig/trunk/ivy/ivysettings.xml Tue Jul 13 17:19:24 2010
@@ -30,7 +30,6 @@
           http://www.ibiblio.net/pub/packages/maven2
   -->
   <property name="repo.maven.org" value="http://repo1.maven.org/maven2/"; 
override="false"/>
-  <property name="snapshot.apache.org" 
value="http://people.apache.org/repo/m2-snapshot-repository/"; override="false"/>
   <property name="maven2.pattern"  
value="[organisation]/[module]/[revision]/[module]-[revision]"/> 
   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
   <!-- pull in the local repository -->
@@ -38,7 +37,6 @@
   <settings defaultResolver="default"/>
   <resolvers>
     <ibiblio name="maven2" root="${repo.maven.org}" 
pattern="${maven2.pattern.ext}" m2compatible="true"/>
-    <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" 
pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <chain name="default" dual="true">
       <resolver ref="local"/>
       <resolver ref="maven2"/>
@@ -49,10 +47,6 @@
     <chain name="external">
       <resolver ref="maven2"/>
     </chain>
-    <chain name="external-and-snapshots">
-      <resolver ref="maven2"/>
-      <resolver ref="apache-snapshot"/>
-    </chain>
   </resolvers>
   <modules>
     <module organisation="org.apache.pig" name=".*" resolver="internal"/>

Modified: hadoop/pig/trunk/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/libraries.properties?rev=963793&r1=963792&r2=963793&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/libraries.properties (original)
+++ hadoop/pig/trunk/ivy/libraries.properties Tue Jul 13 17:19:24 2010
@@ -19,20 +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.0.0-rc2
+hadoop-core.version=0.20.2
+hadoop-test.version=0.20.2
 
+ivy.version=2.1.0
+
+jackson.version=1.0.1
 javacc.version=4.2
+jdiff.version=1.0.9
+jetty-util.version=6.1.14
 jline.version=0.9.94
+joda-time.version=1.6
 jsch.version=0.1.38
 junit.version=4.5
-jdiff.version=1.0.9
 
-rats-lib.version=0.5.1
+log4j.version=1.2.14
 
+rats-lib.version=0.5.1
+slf4j-api.version=1.4.3
+slf4j-log4j12.version=1.4.3
 xerces.version=1.4.4
-
-jackson.version=1.0.1
-joda-time.version=1.6


Reply via email to