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/11/21 23:31:05 UTC

svn commit: r1204732 - in /lucene/dev/trunk/dev-tools/maven: lucene/contrib/demo/ lucene/contrib/highlighter/ lucene/contrib/memory/ lucene/contrib/misc/ lucene/contrib/sandbox/ lucene/contrib/spatial/ modules/analysis/common/ modules/analysis/icu/ mod...

Author: sarowe
Date: Mon Nov 21 22:30:54 2011
New Revision: 1204732

URL: http://svn.apache.org/viewvc?rev=1204732&view=rev
Log:
LUCENE-3490: Maven configuration: put lucene-test-framework before lucene-core in the test classpath, via dependency ordering, to allow test-only read/write PreFlexRWCodec to fulfill Lucene3x codec requests instead of lucene-core's read-only Lucene3xCodec

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/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/solr/test-framework/pom.xml.template

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>../../build/contrib/demo</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -38,16 +38,17 @@
     <build-directory>../../build/contrib/highlighter</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -38,20 +38,21 @@
     <build-directory>../../build/contrib/memory</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-queryparser</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-queryparser</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>../../build/contrib/misc</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>../../build/contrib/sandbox</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jakarta-regexp</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,7 +36,8 @@
     <build-directory>../../build/contrib/spatial</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>../build/common</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -39,16 +39,17 @@
     <build-directory>../build/icu</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -38,16 +38,17 @@
     <build-directory>../build/morfologik</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -38,16 +38,17 @@
     <build-directory>../build/phonetic</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>../build/smartcn</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>../build/stempel</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -38,21 +38,22 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-analyzers-common</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,21 +36,22 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-grouping</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-grouping</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,16 +36,17 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,26 +36,27 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-queries</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-sandbox</artifactId>
+      <artifactId>lucene-queries</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-sandbox</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -36,21 +36,22 @@
     <build-directory>build</build-directory>
   </properties>
   <dependencies>
-    <dependency>
+    <dependency> 
+      <!-- lucene-test-framework dependency must be declared before lucene-core -->
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-analyzers-common</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </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=1204732&r1=1204731&r2=1204732&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 Nov 21 22:30:54 2011
@@ -38,13 +38,14 @@
   <dependencies>
     <!-- These dependencies are compile scope because this is a test framework. -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <!-- lucene-test-framework dependency must come before lucene-core -->
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>solr-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>