SOLR-3344: Maven configuration: Add Jetty dependencies to the Solr test-framework POM template, so that those dependencies are transitively included when the Solr test-framework is used externally; remove the Jetty dependencies from the dataimporthandler and clustering Solr contribs' POM templates. The optional Jetty dependencies in the solr-core module's POM template are left as-is, to facilitate JettySolrRunner's use as a cmdline utility.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1311905 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2012-04-10 18:24:50 +00:00
parent e8d967aa80
commit 33cdb0c9a9
3 changed files with 14 additions and 30 deletions

View File

@ -93,21 +93,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>

View File

@ -72,21 +72,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>

View File

@ -63,6 +63,20 @@
<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>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>