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 2013/01/16 17:29:47 UTC
svn commit: r1434022 - in /lucene/dev/trunk: dev-tools/maven/
dev-tools/maven/solr/core/src/test/ dev-tools/maven/solr/solrj/src/java/
dev-tools/maven/solr/solrj/src/test/ dev-tools/maven/solr/webapp/
solr/licenses/
Author: markrmiller
Date: Wed Jan 16 16:29:46 2013
New Revision: 1434022
URL: http://svn.apache.org/viewvc?rev=1434022&view=rev
Log:
SOLR-4308: Remove license files and maven references
Removed:
lucene/dev/trunk/solr/licenses/log4j-over-slf4j-1.6.4.jar.sha1
lucene/dev/trunk/solr/licenses/log4j-over-slf4j-LICENSE-BSD_LIKE.txt
lucene/dev/trunk/solr/licenses/log4j-over-slf4j-NOTICE.txt
Modified:
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
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=1434022&r1=1434021&r2=1434022&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Wed Jan 16 16:29:46 2013
@@ -393,11 +393,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1434022&r1=1434021&r2=1434022&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template Wed Jan 16 16:29:46 2013
@@ -57,11 +57,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<sourceDirectory/>
Modified: lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1434022&r1=1434021&r2=1434022&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template Wed Jan 16 16:29:46 2013
@@ -76,12 +76,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Need log4j api so long as Zookeeper does; see https://issues.apache.org/jira/browse/ZOOKEEPER-850 -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <optional>true</optional> <!-- let the end user decide... they may be using log4j directly! -->
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
Modified: lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1434022&r1=1434021&r2=1434022&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template Wed Jan 16 16:29:46 2013
@@ -52,11 +52,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<sourceDirectory/>
Modified: lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template?rev=1434022&r1=1434021&r2=1434022&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template Wed Jan 16 16:29:46 2013
@@ -64,10 +64,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>