From 5876b39115c57e435b1ffecc082e8e41e00f0848 Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Thu, 23 May 2013 15:43:57 +0000
Subject: [PATCH] fix dependencies so logging works from replicator/ tests:
 Maven config; downgrade commons-logging from v1.1.3 to v1.1.1: httpcore
 dependency

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1485755 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/maven/lucene/replicator/pom.xml.template | 10 ----------
 lucene/licenses/commons-logging-1.1.1.jar.sha1     |  1 +
 lucene/licenses/commons-logging-1.1.3.jar.sha1     |  1 -
 lucene/replicator/ivy.xml                          |  2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)
 create mode 100644 lucene/licenses/commons-logging-1.1.1.jar.sha1
 delete mode 100644 lucene/licenses/commons-logging-1.1.3.jar.sha1

diff --git a/dev-tools/maven/lucene/replicator/pom.xml.template b/dev-tools/maven/lucene/replicator/pom.xml.template
index 46a5d517827..20896e26a42 100644
--- a/dev-tools/maven/lucene/replicator/pom.xml.template
+++ b/dev-tools/maven/lucene/replicator/pom.xml.template
@@ -62,12 +62,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -87,10 +81,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>${module-path}/src/java</sourceDirectory>
diff --git a/lucene/licenses/commons-logging-1.1.1.jar.sha1 b/lucene/licenses/commons-logging-1.1.1.jar.sha1
new file mode 100644
index 00000000000..a9209e50b52
--- /dev/null
+++ b/lucene/licenses/commons-logging-1.1.1.jar.sha1
@@ -0,0 +1 @@
+5043bfebc3db072ed80fbd362e7caf00e885d8ae
diff --git a/lucene/licenses/commons-logging-1.1.3.jar.sha1 b/lucene/licenses/commons-logging-1.1.3.jar.sha1
deleted file mode 100644
index c8756c43832..00000000000
--- a/lucene/licenses/commons-logging-1.1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
diff --git a/lucene/replicator/ivy.xml b/lucene/replicator/ivy.xml
index 58c8569892e..0fa8dd76de1 100644
--- a/lucene/replicator/ivy.xml
+++ b/lucene/replicator/ivy.xml
@@ -39,7 +39,7 @@
     <dependency org="org.eclipse.jetty" name="jetty-io" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
     <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
     <dependency org="org.eclipse.jetty" name="jetty-http" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
-    <dependency org="commons-logging" name="commons-logging" rev="1.1.3" transitive="false" conf="logging->default"/>
+    <dependency org="commons-logging" name="commons-logging" rev="1.1.1" transitive="false" conf="logging->default"/>
     <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
       <artifact name="javax.servlet" type="orbit" ext="jar"/>
     </dependency>