geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r437309 - in /geronimo/genesis/trunk: config/checkstyle-config/pom.xml config/clover-config/pom.xml config/geronimo-skin/pom.xml config/logging-config/pom.xml plugins/pom.xml
Date Sun, 27 Aug 2006 06:30:55 GMT
Author: jdillon
Date: Sat Aug 26 23:30:53 2006
New Revision: 437309

URL: http://svn.apache.org/viewvc?rev=437309&view=rev
Log:
Include LICENSE.txt and NOTICE.txt into jars

Modified:
    geronimo/genesis/trunk/config/checkstyle-config/pom.xml
    geronimo/genesis/trunk/config/clover-config/pom.xml
    geronimo/genesis/trunk/config/geronimo-skin/pom.xml
    geronimo/genesis/trunk/config/logging-config/pom.xml
    geronimo/genesis/trunk/plugins/pom.xml

Modified: geronimo/genesis/trunk/config/checkstyle-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/checkstyle-config/pom.xml?rev=437309&r1=437308&r2=437309&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/checkstyle-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/checkstyle-config/pom.xml Sat Aug 26 23:30:53 2006
@@ -39,5 +39,22 @@
         Provides the common Checkstyle configuration used by all modules.
     </description>
     
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    
 </project>
 

Modified: geronimo/genesis/trunk/config/clover-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/clover-config/pom.xml?rev=437309&r1=437308&r2=437309&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/clover-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/clover-config/pom.xml Sat Aug 26 23:30:53 2006
@@ -39,5 +39,22 @@
         Provides the common Clover configuration used by all modules.
     </description>
     
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    
 </project>
 

Modified: geronimo/genesis/trunk/config/geronimo-skin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/geronimo-skin/pom.xml?rev=437309&r1=437308&r2=437309&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/geronimo-skin/pom.xml (original)
+++ geronimo/genesis/trunk/config/geronimo-skin/pom.xml Sat Aug 26 23:30:53 2006
@@ -39,8 +39,16 @@
     </description>
     
     <build>
-        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
         <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>
             </resource>

Modified: geronimo/genesis/trunk/config/logging-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/logging-config/pom.xml?rev=437309&r1=437308&r2=437309&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/logging-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/logging-config/pom.xml Sat Aug 26 23:30:53 2006
@@ -40,5 +40,22 @@
         primarily used to collect test output into ${basedir}/target/test.log
     </description>
     
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    
 </project>
 

Modified: geronimo/genesis/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=437309&r1=437308&r2=437309&view=diff
==============================================================================
--- geronimo/genesis/trunk/plugins/pom.xml (original)
+++ geronimo/genesis/trunk/plugins/pom.xml Sat Aug 26 23:30:53 2006
@@ -40,29 +40,25 @@
         Custom plugins and support for plugins.
     </description>
     
-    <properties>
-        <maven.version>2.0.4</maven.version>
-    </properties>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>${maven.version}</version>
+            <version>2.0.4</version>
             <type>jar</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
-            <version>${maven.version}</version>
+            <version>2.0.4</version>
             <type>jar</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>${maven.version}</version>
+            <version>2.0.4</version>
             <type>jar</type>
         </dependency>
         
@@ -75,17 +71,32 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+        
         <extensions>
             <extension>
                 <groupId>org.apache.geronimo.genesis.config</groupId>
                 <artifactId>clover-config</artifactId>
-                <version>${pom.version}</version>
+                <version>1.0.0-SNAPSHOT</version>
             </extension>
             
             <extension>
                 <groupId>org.apache.geronimo.genesis.config</groupId>
                 <artifactId>checkstyle-config</artifactId>
-                <version>${pom.version}</version>
+                <version>1.0.0-SNAPSHOT</version>
             </extension>
         </extensions>
         



Mime
View raw message