Author: rding
Date: Wed Jul 28 18:37:00 2010
New Revision: 980148

URL: http://svn.apache.org/viewvc?rev=980148&view=rev
Log:
PIG-1500: guava.jar should be removed from the lib folder

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
    hadoop/pig/trunk/ivy/pig.pom

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=980148&r1=980147&r2=980148&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Wed Jul 28 18:37:00 2010
@@ -106,6 +106,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
 
 BUG FIXES
 
+PIG-1500: guava.jar should be removed from the lib folder (niraj via rding)
+
 PIG-1034: Pig does not support ORDER ... BY group alias (zjffdu)
 
 PIG-1445: Pig error: ERROR 2013: Moving LOLimit in front of LOStream is not 
implemented (daijy)

Modified: hadoop/pig/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=980148&r1=980147&r2=980148&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Wed Jul 28 18:37:00 2010
@@ -51,7 +51,6 @@
     <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" />
-       <property name="guava.jarfile" value="guava-r03.jar" />
        
     <!-- javac properties -->
     <property name="javac.debug" value="on" />
@@ -130,6 +129,7 @@
     <property name="ivy.dir" location="ivy" />
     <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
     <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"/>
     <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml" />
     <property name="ivy.org" value="org.apache.pig"/>
@@ -168,7 +168,6 @@
        <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}/${hbase.test.jarfile}" />
        <fileset file="${lib.dir}/${zookeeper.jarfile}"/>
        <fileset 
file="${ivy.lib.dir}/jackson-mapper-asl-${jackson.version}.jar"/>
@@ -474,7 +473,8 @@
             <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}/joda-time-${joda-time.version}.jar" /> 
+            <zipfileset src="${ivy.lib.dir}/${guava.jar}" /> 
         </jar>
         <copy file="${output.jarfile}" tofile="${output.jarfile.backcompat}"/>
     </target>

Modified: hadoop/pig/trunk/ivy.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy.xml?rev=980148&r1=980147&r2=980148&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy.xml (original)
+++ hadoop/pig/trunk/ivy.xml Wed Jul 28 18:37:00 2010
@@ -72,6 +72,7 @@
     <dependency org="org.codehaus.jackson" name="jackson-core-asl" 
rev="${jackson.version}"
       conf="compile->master"/>
     <dependency org="joda-time" name="joda-time" rev="${joda-time.version}" 
conf="compile->master"/>
+    <dependency org="com.google.guava" name="guava" rev="${guava.version}" 
conf="compile->master" />
        <dependency org="org.python" name="jython" rev="${jython.version}" 
conf="compile->master"/>
     <!--ATM hbase, hbase-test.jar, hadoop.jar are resolved from the lib dir--> 
        
     <dependency org="hsqldb" name="hsqldb" rev="${hsqldb.version}"

Modified: hadoop/pig/trunk/ivy/ivysettings.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/ivysettings.xml?rev=980148&r1=980147&r2=980148&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/ivysettings.xml (original)
+++ hadoop/pig/trunk/ivy/ivysettings.xml Wed Jul 28 18:37:00 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=980148&r1=980147&r2=980148&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/libraries.properties (original)
+++ hadoop/pig/trunk/ivy/libraries.properties Wed Jul 28 18:37:00 2010
@@ -22,10 +22,9 @@ commons-cli.version=1.0
 commons-logging.version=1.0.3
 checkstyle.version=4.2
 
+ivy.version=2.2.0-rc1
 hsqldb.version=1.8.0.10
 
-ivy.version=2.0.0-rc2
-
 javacc.version=4.2
 jline.version=0.9.94
 jsch.version=0.1.38
@@ -39,3 +38,4 @@ xerces.version=1.4.4
 jackson.version=1.0.1
 joda-time.version=1.6
 jython.version=2.5.0
+guava.version=r06

Modified: hadoop/pig/trunk/ivy/pig.pom
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/pig.pom?rev=980148&r1=980147&r2=980148&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/pig.pom (original)
+++ hadoop/pig/trunk/ivy/pig.pom Wed Jul 28 18:37:00 2010
@@ -100,6 +100,11 @@
            <artifactId>jython</artifactId>
            <version>${jython.version}/version>
        </dependency>
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+    </dependency>
 
   </dependencies> 
 </project>


Reply via email to