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 2011/10/31 23:23:02 UTC
svn commit: r1195705 - in /lucene/dev/trunk: dev-tools/maven/
dev-tools/maven/lucene/contrib/demo/
dev-tools/maven/lucene/contrib/highlighter/
dev-tools/maven/lucene/contrib/instantiated/
dev-tools/maven/lucene/contrib/memory/ dev-tools/maven/lucene/co...
Author: sarowe
Date: Mon Oct 31 22:23:01 2011
New Revision: 1195705
URL: http://svn.apache.org/viewvc?rev=1195705&view=rev
Log:
SOLR-2849: Fix dependencies in Maven POMs.
Modified:
lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/facet/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/join/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/queries/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/suggest/pom.xml.template
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/solr/CHANGES.txt
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -62,11 +62,6 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -54,11 +54,6 @@
<artifactId>lucene-memory</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -55,11 +55,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -51,11 +51,6 @@
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -59,11 +59,6 @@
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -58,11 +58,6 @@
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -58,11 +58,6 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -73,6 +73,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
@@ -92,15 +97,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/facet/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/facet/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/facet/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -54,11 +54,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/join/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/join/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/join/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/join/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -52,11 +52,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/queries/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/queries/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/queries/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -57,11 +57,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/modules/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/suggest/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/suggest/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/suggest/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -52,11 +52,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
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=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -356,11 +356,6 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -625,7 +620,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>org.apache.lucene</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-xercesImpl</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -49,11 +49,6 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-icu</artifactId>
<version>${project.version}</version>
</dependency>
@@ -67,27 +62,6 @@
<artifactId>lucene-analyzers-stempel</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -48,31 +48,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
<exclusions>
@@ -99,11 +74,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>test</scope>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -60,21 +60,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
@@ -86,19 +71,6 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -42,46 +42,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -51,42 +51,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -1,114 +1,98 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-parent</artifactId>
- <version>@version@</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-langid</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Language Identifier</name>
- <description>
- This module is intended to be used while indexing documents.
- It is implemented as an UpdateProcessor to be placed in an UpdateChain.
- Its purpose is to identify language from documents and tag the document with language code.
- </description>
- <properties>
- <module-directory>solr/contrib/solr-langid</module-directory>
- <build-directory>../../build/contrib/solr-langid</build-directory>
- </properties>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-jsonic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-langdetect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/classes/java</outputDirectory>
- <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test-files</directory>
- </testResource>
- <testResource>
- <directory>../../core/src/test-files</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-langid</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Solr Language Identifier</name>
+ <description>
+ This module is intended to be used while indexing documents.
+ It is implemented as an UpdateProcessor to be placed in an UpdateChain.
+ Its purpose is to identify language from documents and tag the document with language code.
+ </description>
+ <properties>
+ <module-directory>solr/contrib/solr-langid</module-directory>
+ <build-directory>../../build/contrib/solr-langid</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-jsonic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-langdetect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/java</outputDirectory>
+ <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test-files</directory>
+ </testResource>
+ <testResource>
+ <directory>../../core/src/test-files</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -48,17 +48,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
@@ -67,11 +56,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.uima</groupId>
<artifactId>AlchemyAPIAnnotator</artifactId>
</dependency>
@@ -91,15 +75,6 @@
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -48,28 +48,60 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sslext</groupId>
+ <artifactId>sslext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-tiles</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -47,9 +47,8 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -80,6 +79,12 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -116,6 +121,16 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -126,6 +141,10 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
@@ -138,17 +157,9 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
@@ -162,12 +173,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <!-- compile scope; solr-core is a jar not a war -->
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -76,6 +76,23 @@
</mailingList>
</mailingLists>
<inceptionYear>2006</inceptionYear>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<directory>build/solr-parent</directory>
<pluginManagement>
Modified: lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -37,12 +37,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<exclusions>
@@ -58,19 +52,50 @@
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </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>
+ </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <!-- Technically, this is optional in SolrJ; but it's fast. SOLR-2852 -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/trunk/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/test-framework/pom.xml.template Mon Oct 31 22:23:01 2011
@@ -36,6 +36,7 @@
<build-directory>../build/solr-test-framework</build-directory>
</properties>
<dependencies>
+ <!-- These dependencies are compile scope because this is a test framework. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>solr-core</artifactId>
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=1195705&r1=1195704&r2=1195705&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 Mon Oct 31 22:23:01 2011
@@ -40,68 +40,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>solr-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-taglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-tiles</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sslext</groupId>
- <artifactId>sslext</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -109,22 +47,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Oct 31 22:23:01 2011
@@ -748,7 +748,11 @@ Test Cases
they ignored AssertionError. With this fix now entire test framework
(every test) fails if assertions are disabled, unless
-Dtests.asserts.gracious=true is specified. (Doron Cohen)
-
+
+Build
+
+* SOLR-2849: Fix dependencies in Maven POMs. (David Smiley via Steve Rowe)
+
======================= Lucene 3.4.0 =======================
Bug fixes
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1195705&r1=1195704&r2=1195705&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Oct 31 22:23:01 2011
@@ -444,6 +444,8 @@ Bug Fixes
* SOLR-2862: More explicit lexical resources location logged if Carrot2 clustering
extension is used. Fixed solr. impl. of IResource and IResourceLookup. (Dawid Weiss)
+* SOLR-2849: Fix dependencies in Maven POMs. (David Smiley via Steve Rowe)
+
================== 3.4.0 ==================
Upgrading from Solr 3.3