incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1075752 - in /sling/trunk/launchpad: testing-war/ testing-war/src/main/appended-resources/ testing-war/src/main/appended-resources/META-INF/ testing-war/src/main/resources/META-INF/ testing/ testing/src/main/appended-resources/ testing/src...
Date Tue, 01 Mar 2011 09:48:49 GMT
Author: fmeschbe
Date: Tue Mar  1 09:48:48 2011
New Revision: 1075752

URL: http://svn.apache.org/viewvc?rev=1075752&view=rev
Log:
SLING-2003 Have LICENSE and NOTICE files automatically generated

Added:
    sling/trunk/launchpad/testing-war/src/main/appended-resources/
    sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/
      - copied from r1075715, sling/trunk/launchpad/testing-war/src/main/resources/META-INF/
    sling/trunk/launchpad/testing/src/main/appended-resources/
    sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/
      - copied from r1075741, sling/trunk/launchpad/testing/src/main/resources/META-INF/
Removed:
    sling/trunk/launchpad/testing-war/LICENSE
    sling/trunk/launchpad/testing-war/NOTICE
    sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/LICENSE
    sling/trunk/launchpad/testing-war/src/main/resources/META-INF/
    sling/trunk/launchpad/testing/LICENSE
    sling/trunk/launchpad/testing/NOTICE
    sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/LICENSE
    sling/trunk/launchpad/testing/src/main/resources/META-INF/
Modified:
    sling/trunk/launchpad/testing-war/pom.xml
    sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/NOTICE
    sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/NOTICE

Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1075752&r1=1075751&r2=1075752&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Tue Mar  1 09:48:48 2011
@@ -202,6 +202,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
+                    <packagingExcludes>WEB-INF/classes/META-INF/*</packagingExcludes>
                     <webResources>
                         <!-- the configuration resources -->
                         <resource>
@@ -212,12 +213,8 @@
                         </resource>
                         <!-- Legal stuff -->
                         <resource>
-                            <directory>${basedir}</directory>
+                            <directory>${project.build.outputDirectory}/META-INF</directory>
                             <targetPath>META-INF</targetPath>
-                            <includes>
-                                <include>LICENSE*</include>
-                                <include>NOTICE*</include>
-                            </includes>
                         </resource>
                     </webResources>
                 </configuration>

Modified: sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/NOTICE?rev=1075752&r1=1075715&r2=1075752&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/NOTICE (original)
+++ sling/trunk/launchpad/testing-war/src/main/appended-resources/META-INF/NOTICE Tue Mar
 1 09:48:48 2011
@@ -1,8 +1,2 @@
-Apache Sling Launchpad Testing
-Copyright 2008-2009 The Apache Software Foundation
-
 Apache Sling is based on source code originally developed 
 by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

Modified: sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/NOTICE?rev=1075752&r1=1075741&r2=1075752&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/NOTICE (original)
+++ sling/trunk/launchpad/testing/src/main/appended-resources/META-INF/NOTICE Tue Mar  1 09:48:48
2011
@@ -1,8 +1,2 @@
-Apache Sling Launchpad Testing
-Copyright 2008-2009 The Apache Software Foundation
-
 Apache Sling is based on source code originally developed 
 by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).



Mime
View raw message