commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1164992 - /commons/proper/commons-parent/trunk/pom.xml
Date Sun, 04 Sep 2011 11:17:19 GMT
Author: sebb
Date: Sun Sep  4 11:17:18 2011
New Revision: 1164992

URL: http://svn.apache.org/viewvc?rev=1164992&view=rev
Log:
Fix resources and testReources to include default directories

Modified:
    commons/proper/commons-parent/trunk/pom.xml

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1164992&r1=1164991&r2=1164992&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Sun Sep  4 11:17:18 2011
@@ -109,7 +109,15 @@
     </mailingList>
   </mailingLists>
   <build>
+    <!-- TODO find a better way to add N&L files to jars and test jars
+         See also maven-remote-resources-plugin configuration below. 
+    -->
     <resources>
+      <!-- This is the default setting from the super-pom -->
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <!-- hack to ensure the N&L appear in jars -->
       <resource>
         <directory>${basedir}</directory>
         <targetPath>META-INF</targetPath>
@@ -121,6 +129,11 @@
     </resources>
     <!-- ensure test jars also get NOTICE & LICENSE files -->
     <testResources>
+      <!-- This is the default setting from the super-pom -->
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+      <!-- hack to ensure the N&L appear in jars -->
       <testResource>
         <directory>${basedir}</directory>
         <targetPath>META-INF</targetPath>
@@ -208,6 +221,7 @@
           <version>2.2.1</version>
         </plugin>
         <plugin>
+          <!-- TODO see above - find better way to add N&L files to jars and test
jars -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-remote-resources-plugin</artifactId>
           <configuration>



Mime
View raw message