You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/04/21 07:29:53 UTC
svn commit: r1675028 - in /lucene/dev/branches/branch_5x:
lucene/replicator/ivy.xml solr/server/ivy.xml
Author: shalin
Date: Tue Apr 21 05:29:53 2015
New Revision: 1675028
URL: http://svn.apache.org/r1675028
Log:
SOLR-7429: Switch to standard servlet-api instead of orbit to get 5x build working
Modified:
lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml
lucene/dev/branches/branch_5x/solr/server/ivy.xml
Modified: lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml?rev=1675028&r1=1675027&r2=1675028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml Tue Apr 21 05:29:53 2015
@@ -40,9 +40,7 @@
<dependency org="commons-logging" name="commons-logging" rev="${/commons-logging/commons-logging}" conf="logging"/>
- <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" conf="servlet">
- <artifact name="javax.servlet" type="orbit" ext="jar"/>
- </dependency>
+ <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
Modified: lucene/dev/branches/branch_5x/solr/server/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/ivy.xml?rev=1675028&r1=1675027&r2=1675028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/ivy.xml Tue Apr 21 05:29:53 2015
@@ -47,10 +47,8 @@
<dependency org="org.eclipse.jetty" name="jetty-start" rev="${/org.eclipse.jetty/jetty-start}" conf="start"/>
- <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" conf="servlet">
- <artifact name="javax.servlet" type="orbit" ext="jar"/>
- </dependency>
+ <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>