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 2012/08/08 22:27:39 UTC

svn commit: r1370949 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/maven/solr/test-framework/pom.xml.template lucene/ solr/

Author: sarowe
Date: Wed Aug  8 20:27:38 2012
New Revision: 1370949

URL: http://svn.apache.org/viewvc?rev=1370949&view=rev
Log:
Add new test-framework dependencies introduced by Mark Miller's r1370864 commit: javax.servlet:servlet-api; org.eclipse.jetty:jetty-servlet; and org.eclipse.jetty:jetty-util (jetty-util was previously runtime scope, but is now compile scope) (merge r1370944 from trunk)

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/solr/test-framework/pom.xml.template
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1370949&r1=1370948&r2=1370949&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template Wed Aug  8 20:27:38 2012
@@ -55,19 +55,26 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-    <!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
-         you can exclude the three Jetty dependencies below. -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <scope>runtime</scope>
+      <artifactId>jetty-servlet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
+    </dependency>
+    <!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
+         you can exclude the two Jetty dependencies below. -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>