Author: billbarker
Date: Sun Apr 29 23:05:00 2012
New Revision: 1332017

URL: http://svn.apache.org/viewvc?rev=1332017&view=rev
Log:
Update references to guava to use Gump's. Only jython currently builds of these, and the change can be reverted if it breaks jython

Modified:
    gump/metadata/project/htmlunit.xml
    gump/metadata/project/jython.xml
    gump/metadata/project/lucene-java.xml

Modified: gump/metadata/project/htmlunit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/htmlunit.xml?rev=1332017&r1=1332016&r2=1332017&view=diff
==============================================================================
--- gump/metadata/project/htmlunit.xml (original)
+++ gump/metadata/project/htmlunit.xml Sun Apr 29 23:05:00 2012
@@ -50,6 +50,7 @@
     <option project="commons-logging"/>
     <option project="htmlunit-core-js"/>
     <option project="httpcomponents-client"/>
+    <option project="google-guava" />
     <option project="junit" />
     <option project="logging-log4j-12"/>
     <option project="nekohtml" />

Modified: gump/metadata/project/jython.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jython.xml?rev=1332017&r1=1332016&r2=1332017&view=diff
==============================================================================
--- gump/metadata/project/jython.xml (original)
+++ gump/metadata/project/jython.xml Sun Apr 29 23:05:00 2012
@@ -36,6 +36,7 @@
 
     <depend project="ant" inherit="runtime"/>
     <depend project="antlr"/>
+    <depend project="google-guava" />
     <depend project="jakarta-servletapi-5-servlet"/>
     <depend project="jline"/>
     <depend project="junit"/>
@@ -48,7 +49,6 @@
     <work nested="extlibs/asm-3.1.jar"/>
     <work nested="extlibs/asm-commons-3.1.jar"/>
     <work nested="extlibs/constantine.jar"/>
-    <work nested="extlibs/guava-r07.jar"/>
     <work nested="extlibs/jffi.jar" />
     <work nested="extlibs/jnr-posix.jar"/>
     <work nested="extlibs/libreadline-java-0.8.jar"/>

Modified: gump/metadata/project/lucene-java.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/lucene-java.xml?rev=1332017&r1=1332016&r2=1332017&view=diff
==============================================================================
--- gump/metadata/project/lucene-java.xml (original)
+++ gump/metadata/project/lucene-java.xml Sun Apr 29 23:05:00 2012
@@ -314,6 +314,8 @@
     <depend project="commons-httpclient"/>
     <depend project="commons-io"/>
     <depend project="commons-lang"/>
+    <depend project="google-guava" />
+    <depend project="ivy" inherit="runtime" />
     <depend project="jakarta-servletapi-5-servlet"/>
     <depend project="javamail"/>
     <depend project="junit"/>
@@ -328,7 +330,6 @@
     <depend project="velocity-tools-generic"/>
     <depend project="xml-apis"/>
     <depend project="xml-xerces"/>
-    <depend project="ivy" inherit="runtime" />
 
     <work nested="lucene/build/classes/test"/>
     <work nested="solr/build/solr"/>
@@ -342,7 +343,6 @@
     <work nested="solr/contrib/clustering/lib/simple-xml-2.3.5.jar"/>
     <work nested="solr/lib/apache-solr-noggit-r944541.jar"/>
     <work nested="solr/lib/easymock.jar"/>
-    <work nested="solr/lib/guava-r05.jar"/>
     <work nested="solr/lib/zookeeper-3.3.1.jar"/>
 
     <home nested="solr/dist"/>
@@ -375,6 +375,8 @@
     <depend project="commons-io"/>
     <depend project="commons-lang"/>
     <depend project="commons-logging"/>
+    <depend project="google-guava" />
+    <depend project="ivy" inherit="runtime" />
     <depend project="jakarta-servletapi-5-servlet"/>
     <depend project="javamail"/>
     <depend project="junit"/>
@@ -390,7 +392,6 @@
     <depend project="velocity-tools-generic"/>
     <depend project="xml-apis"/>
     <depend project="xml-xerces"/>
-    <depend project="ivy" inherit="runtime" />
 
     <work nested="lucene/build/classes/test"/>
     <work nested="solr/build/tests"/>
@@ -400,7 +401,6 @@
     <work nested="solr/contrib/clustering/lib/simple-xml-2.3.5.jar"/>
     <work nested="solr/lib/apache-solr-noggit-r944541.jar"/>
     <work nested="solr/lib/easymock.jar"/>
-    <work nested="solr/lib/guava-r05.jar"/>
 
   </project>
 </module>