You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/04/10 04:34:25 UTC
svn commit: r1311558 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/maven/ solr/ solr/core/ solr/lib/ solr/solrj/
Author: hossman
Date: Tue Apr 10 02:34:24 2012
New Revision: 1311558
URL: http://svn.apache.org/viewvc?rev=1311558&view=rev
Log:
SOLR-3302: Upgraded SLF4j to version 1.6.4 (hossman)
Added:
lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1
lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1
lucene/dev/trunk/solr/lib/slf4j-api-1.6.4.jar.sha1
lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.4.jar.sha1
Removed:
lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1
lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1
lucene/dev/trunk/solr/lib/slf4j-api-1.6.1.jar.sha1
lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.1.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
lucene/dev/trunk/solr/solrj/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=1311558&r1=1311557&r2=1311558&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Tue Apr 10 02:34:24 2012
@@ -109,10 +109,10 @@
<classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
- <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.4.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.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=1311558&r1=1311557&r2=1311558&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Tue Apr 10 02:34:24 2012
@@ -43,7 +43,7 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.2.v20120308</jetty.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.6.4</slf4j.version>
<tika.version>1.0</tika.version>
<httpcomponents.version>4.1.3</httpcomponents.version>
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1311558&r1=1311557&r2=1311558&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Apr 10 02:34:24 2012
@@ -482,6 +482,7 @@ Other Changes
* SOLR-3329: Dropped getSourceID() from SolrInfoMBean and using
getClass().getPackage().getSpecificationVersion() for Version. (ryan)
+* SOLR-3302: Upgraded SLF4j to version 1.6.4 (hossman)
Documentation
----------------------
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1311558&r1=1311557&r2=1311558&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Tue Apr 10 02:34:24 2012
@@ -25,14 +25,14 @@
<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1.4" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.3" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpmime" rev="4.1.3" transitive="false"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.4" transitive="false"/>
<dependency org="commons-io" name="commons-io" rev="2.1" 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="org.codehaus.woodstox" name="wstx-asl" rev="3.2.7" transitive="false"/>
<dependency org="org.easymock" name="easymock" rev="2.2" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.4" transitive="false"/>
<dependency org="com.spatial4j" name="spatial4j" rev="0.2" transitive="false"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
Added: lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1?rev=1311558&view=auto
==============================================================================
--- lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1 Tue Apr 10 02:34:24 2012
@@ -0,0 +1 @@
+aad8e9df65ebb68e3ba6f269e3312707f7f1065f
Added: lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1?rev=1311558&view=auto
==============================================================================
--- lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1 Tue Apr 10 02:34:24 2012
@@ -0,0 +1 @@
+ddfe7c1606881837039903db7bee486c1336c15e
Added: lucene/dev/trunk/solr/lib/slf4j-api-1.6.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/slf4j-api-1.6.4.jar.sha1?rev=1311558&view=auto
==============================================================================
--- lucene/dev/trunk/solr/lib/slf4j-api-1.6.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/lib/slf4j-api-1.6.4.jar.sha1 Tue Apr 10 02:34:24 2012
@@ -0,0 +1 @@
+2396d74b12b905f780ed7966738bb78438e8371a
Added: lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.4.jar.sha1?rev=1311558&view=auto
==============================================================================
--- lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.4.jar.sha1 Tue Apr 10 02:34:24 2012
@@ -0,0 +1 @@
+6b32bc7c42b2509525ce812cb49bf96e7bf64141
Modified: lucene/dev/trunk/solr/solrj/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/ivy.xml?rev=1311558&r1=1311557&r2=1311558&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/ivy.xml (original)
+++ lucene/dev/trunk/solr/solrj/ivy.xml Tue Apr 10 02:34:24 2012
@@ -21,15 +21,15 @@
<dependencies>
<dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.4" transitive="false"/>
- <dependency org="org.slf4j" name="log4j-over-slf4j" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="log4j-over-slf4j" rev="1.6.4" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1.4" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.3" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpmime" rev="4.1.3" transitive="false"/>
<dependency org="commons-io" name="commons-io" rev="2.1" transitive="false"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.4" transitive="false"/>
<dependency org="org.codehaus.woodstox" name="wstx-asl" rev="3.2.7" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.4" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>