geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422587 - in /geronimo/sandbox/svkmerge/m2migration: ./ applications/console/console-standard/ m2-plugins/car-maven-plugin/ modules/axis-builder/ modules/axis/ modules/client-builder/ modules/connector-builder/ modules/directory/ modules/je...
Date Mon, 17 Jul 2006 01:12:13 GMT
Author: jdillon
Date: Sun Jul 16 18:12:13 2006
New Revision: 422587

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

Modified:
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml
    geronimo/sandbox/svkmerge/m2migration/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml Sun
Jul 16 18:12:13 2006
@@ -144,6 +144,15 @@
     <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/conf</directory>
                 <filtering>true</filtering>
             </resource>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml Sun Jul 16 18:12:13
2006
@@ -126,7 +126,17 @@
     <build>
         <!-- FIXME: Remove when the default is to use the m2 standard layout -->
         <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        
         <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/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml Sun Jul 16 18:12:13
2006
@@ -133,6 +133,15 @@
     
     <build>
         <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
             <!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder
-->
             <resource>
                 <directory>src/schema</directory>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml Sun Jul 16 18:12:13 2006
@@ -127,6 +127,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/resources2</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml Sun Jul 16 18:12:13
2006
@@ -74,6 +74,15 @@
     <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/resources2</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml Sun Jul 16 18:12:13
2006
@@ -101,6 +101,15 @@
     <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/schema</directory>
                 <targetPath>META-INF</targetPath>
                 <includes>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml Sun Jul 16 18:12:13 2006
@@ -184,6 +184,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/resources2</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml Sun Jul 16 18:12:13 2006
@@ -114,6 +114,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/resources2</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml Sun Jul 16 18:12:13 2006
@@ -90,6 +90,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/META-INF</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml Sun Jul 16 18:12:13 2006
@@ -80,7 +80,16 @@
         
         <resources>
             <resource>
-                <directory>src/schema</directory>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}/src/schema</directory>
                 <targetPath>META-INF/schema</targetPath>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml Sun Jul 16 18:12:13
2006
@@ -139,8 +139,16 @@
     </dependencies>
     
     <build>
-        <!-- move this to parent pom -->
         <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
             <resource>
                 <directory>src/schema</directory>
                 <targetPath>META-INF</targetPath>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml Sun Jul 16 18:12:13 2006
@@ -267,6 +267,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/resources2</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml Sun Jul 16 18:12:13
2006
@@ -48,6 +48,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/resources2</directory>
             </resource>
         </resources>

Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=422587&r1=422586&r2=422587&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sun Jul 16 18:12:13 2006
@@ -611,6 +611,15 @@
         
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>src/resources</directory>
             </resource>
         </resources>



Mime
View raw message