From 2493780acbfe7c49bd1feac908e9071f3c99d9b5 Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Thu, 17 Feb 2011 22:14:08 +0000
Subject: [PATCH] SOLR-2373: update to slf4j 1.6.1

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1071812 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/eclipse/dot.classpath     | 8 ++++----
 dev-tools/maven/pom.xml.template    | 2 +-
 solr/lib/jcl-over-slf4j-1.5.5.jar   | 2 --
 solr/lib/jcl-over-slf4j-1.6.1.jar   | 2 ++
 solr/lib/log4j-over-slf4j-1.5.5.jar | 2 --
 solr/lib/log4j-over-slf4j-1.6.1.jar | 2 ++
 solr/lib/slf4j-api-1.5.5.jar        | 2 --
 solr/lib/slf4j-api-1.6.1.jar        | 2 ++
 solr/lib/slf4j-jdk14-1.5.5.jar      | 2 --
 solr/lib/slf4j-jdk14-1.6.1.jar      | 2 ++
 10 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 solr/lib/jcl-over-slf4j-1.5.5.jar
 create mode 100644 solr/lib/jcl-over-slf4j-1.6.1.jar
 delete mode 100644 solr/lib/log4j-over-slf4j-1.5.5.jar
 create mode 100644 solr/lib/log4j-over-slf4j-1.6.1.jar
 delete mode 100644 solr/lib/slf4j-api-1.5.5.jar
 create mode 100644 solr/lib/slf4j-api-1.6.1.jar
 delete mode 100644 solr/lib/slf4j-jdk14-1.5.5.jar
 create mode 100644 solr/lib/slf4j-jdk14-1.6.1.jar

diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 9f2c3286d05..5e86db866cc 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -107,12 +107,12 @@
 	<classpathentry kind="lib" path="solr/lib/easymock.jar"/>
 	<classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
-	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.5.5.jar"/>
+	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/junit-4.7.jar"/>
-	<classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.5.5.jar"/>
+	<classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/servlet-api-2.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/slf4j-api-1.5.5.jar"/>
-	<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.5.5.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/velocity-1.6.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/>
 	<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 9bf98955a61..b47726ba880 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -42,7 +42,7 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <java.compat.version>1.5</java.compat.version>
     <jetty.version>6.1.26</jetty.version>
-    <slf4j.version>1.5.5</slf4j.version>
+    <slf4j.version>1.6.1</slf4j.version>
     <tika.version>0.8</tika.version>
     <uima.version>${project.version}</uima.version>
   </properties>
diff --git a/solr/lib/jcl-over-slf4j-1.5.5.jar b/solr/lib/jcl-over-slf4j-1.5.5.jar
deleted file mode 100644
index 9a5e656a289..00000000000
--- a/solr/lib/jcl-over-slf4j-1.5.5.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[6b8ddd6339582fa3e6bce99a74f4186918f3f4d8] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/jcl-over-slf4j-1.6.1.jar b/solr/lib/jcl-over-slf4j-1.6.1.jar
new file mode 100644
index 00000000000..052c22acc57
--- /dev/null
+++ b/solr/lib/jcl-over-slf4j-1.6.1.jar
@@ -0,0 +1,2 @@
+AnyObjectId[79e1ec2ca7179a2be9ef42db978285c6da4d9cb4] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/log4j-over-slf4j-1.5.5.jar b/solr/lib/log4j-over-slf4j-1.5.5.jar
deleted file mode 100644
index cfc2b224028..00000000000
--- a/solr/lib/log4j-over-slf4j-1.5.5.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[d32987769b4827a9c539009e804415b09b39e3ed] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/log4j-over-slf4j-1.6.1.jar b/solr/lib/log4j-over-slf4j-1.6.1.jar
new file mode 100644
index 00000000000..1b45587b92c
--- /dev/null
+++ b/solr/lib/log4j-over-slf4j-1.6.1.jar
@@ -0,0 +1,2 @@
+AnyObjectId[504541e9cd627b8ae616e37442958713a192e1a0] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/slf4j-api-1.5.5.jar b/solr/lib/slf4j-api-1.5.5.jar
deleted file mode 100644
index ffc1fa34ed4..00000000000
--- a/solr/lib/slf4j-api-1.5.5.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[4bb4abbb0f75c1bdfb81a44c3a2dd078c1656832] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/slf4j-api-1.6.1.jar b/solr/lib/slf4j-api-1.6.1.jar
new file mode 100644
index 00000000000..46d734aa603
--- /dev/null
+++ b/solr/lib/slf4j-api-1.6.1.jar
@@ -0,0 +1,2 @@
+AnyObjectId[42e0ad0de7773da9b94b12f503deda7f5a506015] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/slf4j-jdk14-1.5.5.jar b/solr/lib/slf4j-jdk14-1.5.5.jar
deleted file mode 100644
index 03386fff862..00000000000
--- a/solr/lib/slf4j-jdk14-1.5.5.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[d58ef5a16b4ae2aa82cf725d510bd0c8c8d4097f] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/solr/lib/slf4j-jdk14-1.6.1.jar b/solr/lib/slf4j-jdk14-1.6.1.jar
new file mode 100644
index 00000000000..6ac0b5c5c15
--- /dev/null
+++ b/solr/lib/slf4j-jdk14-1.6.1.jar
@@ -0,0 +1,2 @@
+AnyObjectId[f4eb2f8afafda6920828ac6bdac5b14c22f0fa11] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file