You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/05/23 18:05:23 UTC

svn commit: r1485762 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/maven/lucene/replicator/ lucene/ lucene/licenses/ lucene/replicator/

Author: sarowe
Date: Thu May 23 16:05:23 2013
New Revision: 1485762

URL: http://svn.apache.org/r1485762
Log:
fix dependencies so logging works from replicator/ tests: Maven config; downgrade commons-logging from v1.1.3 to v1.1.1: httpcore dependency (merged trunk r1485755)

Added:
    lucene/dev/branches/branch_4x/lucene/licenses/commons-logging-1.1.1.jar.sha1
      - copied unchanged from r1485755, lucene/dev/trunk/lucene/licenses/commons-logging-1.1.1.jar.sha1
Removed:
    lucene/dev/branches/branch_4x/lucene/licenses/commons-logging-1.1.3.jar.sha1
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/licenses/   (props changed)
    lucene/dev/branches/branch_4x/lucene/replicator/   (props changed)
    lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template?rev=1485762&r1=1485761&r2=1485762&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/replicator/pom.xml.template Thu May 23 16:05:23 2013
@@ -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>

Modified: lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml?rev=1485762&r1=1485761&r2=1485762&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml Thu May 23 16:05:23 2013
@@ -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>