Return-Path: 
 <rat-commits-return-238-apmail-incubator-rat-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-rat-commits-archive@minotaur.apache.org
Received: (qmail 7840 invoked from network); 19 Mar 2009 12:29:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Mar 2009 12:29:06 -0000
Received: (qmail 63159 invoked by uid 500); 19 Mar 2009 12:29:06 -0000
Delivered-To: apmail-incubator-rat-commits-archive@incubator.apache.org
Received: (qmail 63137 invoked by uid 500); 19 Mar 2009 12:29:06 -0000
Mailing-List: contact rat-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:rat-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:rat-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:rat-commits@incubator.apache.org>
List-Id: <rat-commits.incubator.apache.org>
Reply-To: rat-dev@incubator.apache.org
Delivered-To: mailing list rat-commits@incubator.apache.org
Received: (qmail 63128 invoked by uid 99); 19 Mar 2009 12:29:06 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Mar 2009 05:29:06 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Mar 2009 12:29:05 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 73911238896B; Thu, 19 Mar 2009 12:28:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r755973 - in /incubator/rat/main/trunk/apache-rat:
 pom.xml
 src/assemble/bin.xml
Date: Thu, 19 Mar 2009 12:28:45 -0000
To: rat-commits@incubator.apache.org
From: jochen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090319122845.73911238896B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jochen
Date: Thu Mar 19 12:28:44 2009
New Revision: 755973

URL: http://svn.apache.org/viewvc?rev=755973&view=rev
Log:
- Making sure, that the LICENSE and NOTICE files from the
  remote-resources-plugin aren't overwritten when unpacking
  dependencies.
- Changing tar file mode to GNU in order to avoid warnings.
- Removing the empty apache-rat-<version>-sources.jar from
  the distribution.
  

Modified:
    incubator/rat/main/trunk/apache-rat/pom.xml
    incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml

Modified: incubator/rat/main/trunk/apache-rat/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat/pom.xml?rev=755973&r1=755972&r2=755973&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat/pom.xml Thu Mar 19 12:28:44 2009
@@ -61,6 +61,12 @@
     </resources>    
     <plugins>
       <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <attach>false</attach>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
@@ -72,26 +78,7 @@
               <includeScope>runtime</includeScope>
               <outputDirectory>${project.build.outputDirectory}</outputDirectory>
               <overWriteIfNewer>false</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-              </resourceBundles>
-              <properties>
-                  <addLicense>true</addLicense>
-              </properties>
+              <excludes>META-INF/LICENSE,META-INF/NOTICE,META-INF/LICENSE.*,META-INF/NOTICE.*</excludes>
             </configuration>
           </execution>
         </executions>
@@ -100,8 +87,6 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>**/LICENSE</exclude>
-            <exclude>**/NOTICE</exclude>
             <exclude>META-INF/maven</exclude>
           </excludes>
           <archive>
@@ -129,16 +114,17 @@
         <plugins>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2-beta-2</version>
+            <version>2.2-beta-3</version>
             <configuration>
               <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+              <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
             <executions>
               <execution>
                 <id>make-assembly</id>
                   <phase>package</phase> <!-- append to the packaging phase. -->
                   <goals>
-                    <goal>attached</goal>
+                    <goal>single</goal>
                   </goals>
               </execution>
             </executions>

Modified: incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml?rev=755973&r1=755972&r2=755973&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml (original)
+++ incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml Thu Mar 19 12:28:44 2009
@@ -31,7 +31,9 @@
       <directory>${project.basedir}/..</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
+        <include>LICENSE</include>
         <include>LICENSE.*</include>
+        <include>NOTICE</include>
         <include>NOTICE.*</include>
         <include>RELEASE_NOTES.txt</include>
         <include>DISCLAIMER.txt</include>
@@ -57,6 +59,9 @@
       <includes>
         <include>apache-rat*.jar</include>
       </includes>
+      <excludes>
+        <exclude>apache-rat-*-source.jar</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>target</directory>