svn commit: r1651823 - in /lucene/dev/branches/branch_5x: ./ dev-tools/ dev-tools/maven/solr/contrib/velocity/pom.xml.template

[sa...@apache.org]

Author: sarowe
Date: Wed Jan 14 21:01:44 2015
New Revision: 1651823

URL: http://svn.apache.org/r1651823
Log:
SOLR-1723,SOLR-2035: maven config (merged trunk r1651543 and r1651553)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/dev-tools/   (props changed)
    lucene/dev/branches/branch_5x/dev-tools/maven/solr/contrib/velocity/pom.xml.template

Modified: lucene/dev/branches/branch_5x/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1651823&r1=1651822&r2=1651823&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/branches/branch_5x/dev-tools/maven/solr/contrib/velocity/pom.xml.template Wed Jan 14 21:01:44 2015
@@ -62,12 +62,23 @@
   </dependencies>
   <build>
     <sourceDirectory>${module-path}/src/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>${module-path}/src/resources</directory>
+      </resource>
+    </resources>
     <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
     <testResources>
       <testResource>
         <directory>${module-path}/src/test-files</directory>
       </testResource>
       <testResource>
+        <directory>${module-path}/src/test</directory>
+        <includes>
+          <include>velocity/*.properties</include>
+        </includes>
+      </testResource>
+      <testResource>
         <directory>${top-level}/dev-tools/maven/solr</directory>
         <includes>
           <include>maven.testlogging.properties</include>