LUCENE-3490: Maven configuration

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197734 13f79535-47bb-0310-9956-ffa450edef68

dev-tools/maven/lucene/contrib/misc/pom.xml.template

@@ -53,6 +53,11 @@
     <outputDirectory>${build-directory}/classes/java</outputDirectory>
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
     <sourceDirectory>src/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
     <testSourceDirectory>src/test</testSourceDirectory>
     <testResources>
       <testResource>

dev-tools/maven/lucene/contrib/spatial/pom.xml.template

@@ -36,17 +36,17 @@
     <build-directory>../../build/contrib/spatial</build-directory>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-queries</artifactId>

dev-tools/maven/lucene/src/pom.xml.template

@@ -57,16 +57,24 @@
     <outputDirectory>${build-directory}/classes/java</outputDirectory>
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
     <sourceDirectory>java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
+    </resources>
     <testSourceDirectory>test</testSourceDirectory>
     <testResources>
       <testResource>
-        <directory>${project.build.testSourceDirectory}</directory>
+        <directory>test-framework/resources</directory>
+      </testResource>
+      <testResource>
+        <directory>test-framework/java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
       </testResource>
       <testResource>
-        <directory>test-framework</directory>
+        <directory>${project.build.testSourceDirectory}</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>

dev-tools/maven/lucene/src/test-framework/pom.xml.template

@@ -53,8 +53,11 @@
   <build>
     <directory>${build-directory}</directory>
     <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
-    <sourceDirectory>.</sourceDirectory>
+    <sourceDirectory>java</sourceDirectory>
     <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
       <resource>
         <directory>${project.build.sourceDirectory}</directory>
         <excludes>

dev-tools/maven/solr/core/pom.xml.template

@@ -36,6 +36,12 @@
     <build-directory>../build/solr-maven</build-directory>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-test-framework</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>solr-solrj</artifactId>