You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/02 22:15:02 UTC
svn commit: r1308529 - in /lucene/dev/trunk/solr: build.xml core/ivy.xml
lib/junit-LICENSE-CPL.txt lib/junit-NOTICE.txt solrj/ivy.xml
test-framework/build.xml
Author: rmuir
Date: Mon Apr 2 20:15:01 2012
New Revision: 1308529
URL: http://svn.apache.org/viewvc?rev=1308529&view=rev
Log:
SOLR-2435: nuke confusing duplicate junit dependency
Removed:
lucene/dev/trunk/solr/lib/junit-LICENSE-CPL.txt
lucene/dev/trunk/solr/lib/junit-NOTICE.txt
Modified:
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/core/ivy.xml
lucene/dev/trunk/solr/solrj/ivy.xml
lucene/dev/trunk/solr/test-framework/build.xml
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1308529&r1=1308528&r2=1308529&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Mon Apr 2 20:15:01 2012
@@ -498,7 +498,7 @@
</subant>
<path id="javadoc.classpath">
- <path refid="classpath"/>
+ <path refid="test.classpath"/>
<fileset dir="${dest}/contrib">
<include name="**/lucene-libs/**/*.jar"/>
</fileset>
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1308529&r1=1308528&r2=1308529&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Mon Apr 2 20:15:01 2012
@@ -34,7 +34,6 @@
<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="com.spatial4j" name="spatial4j" rev="0.2" transitive="false"/>
- <dependency org="junit" name="junit" rev="4.10" 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}"/>
</dependencies>
Modified: lucene/dev/trunk/solr/solrj/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/ivy.xml?rev=1308529&r1=1308528&r2=1308529&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/ivy.xml (original)
+++ lucene/dev/trunk/solr/solrj/ivy.xml Mon Apr 2 20:15:01 2012
@@ -30,7 +30,6 @@
<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="junit" name="junit" rev="4.10" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/trunk/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/build.xml?rev=1308529&r1=1308528&r2=1308529&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/build.xml (original)
+++ lucene/dev/trunk/solr/test-framework/build.xml Mon Apr 2 20:15:01 2012
@@ -21,7 +21,7 @@
<import file="../common-build.xml"/>
<path id="javadoc.classpath">
- <path refid="classpath"/>
+ <path refid="test.classpath"/>
<pathelement location="${common.dir}/build/test-framework/classes/java"/>
<pathelement location="${build.dir}/classes/java"/>
</path>