You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/11/28 19:31:14 UTC
svn commit: r1414853 - in /lucene/dev/trunk: dev-tools/eclipse/dot.classpath
dev-tools/maven/pom.xml.template solr/CHANGES.txt solr/core/ivy.xml
solr/licenses/guava-13.0.1.jar.sha1 solr/licenses/guava-r05.jar.sha1
Author: markrmiller
Date: Wed Nov 28 18:31:13 2012
New Revision: 1414853
URL: http://svn.apache.org/viewvc?rev=1414853&view=rev
Log:
SOLR-4119: Update Guava to 13.0.1
Added:
lucene/dev/trunk/solr/licenses/guava-13.0.1.jar.sha1
Removed:
lucene/dev/trunk/solr/licenses/guava-r05.jar.sha1
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/ivy.xml
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1414853&r1=1414852&r2=1414853&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Wed Nov 28 18:31:13 2012
@@ -118,7 +118,7 @@
<classpathentry kind="lib" path="solr/solrj/lib/commons-io-2.1.jar"/>
<classpathentry kind="lib" path="solr/core/lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="solr/core/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/core/lib/guava-r05.jar"/>
+ <classpathentry kind="lib" path="solr/core/lib/guava-13.0.1.jar"/>
<classpathentry kind="lib" path="solr/core/lib/metrics-core-2.1.2.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/jcl-over-slf4j-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/log4j-over-slf4j-1.6.4.jar"/>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1414853&r1=1414852&r2=1414853&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Wed Nov 28 18:31:13 2012
@@ -147,7 +147,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>r05</version>
+ <version>13.0.1</version>
</dependency>
<dependency>
<groupId>com.yammer.metrics</groupId>
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1414853&r1=1414852&r2=1414853&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Nov 28 18:31:13 2012
@@ -314,6 +314,8 @@ Other Changes
* SOLR-2141: Better test coverage for Evaluators (James Dyer)
+* SOLR-4119: Update Guava to 13.0.1 (Mark Miller)
+
================== 4.0.0 ==================
Versions of Major Components
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1414853&r1=1414852&r2=1414853&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Wed Nov 28 18:31:13 2012
@@ -24,7 +24,7 @@
<dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" transitive="false"/>
<dependency org="commons-cli" name="commons-cli" rev="1.2" transitive="false"/>
<dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
- <dependency org="com.google.guava" name="guava" rev="r05" transitive="false"/>
+ <dependency org="com.google.guava" name="guava" rev="13.0.1" transitive="false"/>
<dependency org="org.easymock" name="easymock" rev="2.2" transitive="false"/>
<dependency org="com.spatial4j" name="spatial4j" rev="0.3" transitive="false"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
Added: lucene/dev/trunk/solr/licenses/guava-13.0.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/guava-13.0.1.jar.sha1?rev=1414853&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/guava-13.0.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/guava-13.0.1.jar.sha1 Wed Nov 28 18:31:13 2012
@@ -0,0 +1 @@
+0d6f22b1e60a2f1ef99e22c9f5fde270b2088365