From fb58386561af82213f571140b8f8ab84e2ce288a Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Mon, 9 Nov 2009 15:03:04 +0000
Subject: [PATCH] o Synced source distro creation with 2.x branch

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834095 13f79535-47bb-0310-9956-ffa450edef68
---
 apache-maven/pom.xml                          | 44 ++++++++++++++-----
 .../src}/main/assembly/src.xml                | 20 +++++++--
 pom.xml                                       | 29 +-----------
 3 files changed, 51 insertions(+), 42 deletions(-)
 rename {src => apache-maven/src}/main/assembly/src.xml (63%)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index d25d72b6a4..a120ff04b2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -70,6 +70,24 @@
           </systemProperties>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-distro</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/bin.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -83,30 +101,36 @@
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>once</forkMode>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
               <execution>
-                <id>create-distro</id>
+                <id>make-src-assembly</id>
                 <phase>package</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
                 <configuration>
                   <descriptors>
-                    <descriptor>src/main/assembly/bin.xml</descriptor>
+                    <descriptor>src/main/assembly/src.xml</descriptor>
                   </descriptors>
-                  <finalName>apache-maven-${pom.version}</finalName>
+                  <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <forkMode>once</forkMode>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/src/main/assembly/src.xml b/apache-maven/src/main/assembly/src.xml
similarity index 63%
rename from src/main/assembly/src.xml
rename to apache-maven/src/main/assembly/src.xml
index 8f53436013..b98a88df28 100644
--- a/src/main/assembly/src.xml
+++ b/apache-maven/src/main/assembly/src.xml
@@ -22,19 +22,31 @@ under the License.
   <formats>
     <format>zip</format>
     <format>tar.gz</format>
-    <format>tar.bz2</format>
   </formats>
   <fileSets>
     <fileSet>
-      <directory>.</directory>
+      <directory>${project.basedir}/..</directory>
       <outputDirectory>/</outputDirectory>
       <excludes>
-        <exclude>**/target/**</exclude>
+        <exclude>%regex[(?!.*src/).*target.*]</exclude>
+        <exclude>**/*.log</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target/maven-shared-archive-resources/META-INF</directory>
+      <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
       <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>DEPENDENCIES</include>
+        <!-- exclude the license and notice as they are not as accurate as the ones below -->
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+      </includes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/pom.xml b/pom.xml
index bb8498cbe7..8183f62bc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,7 +403,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-2</version>
+          <version>2.2-beta-4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -420,33 +420,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <inherited>false</inherited>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/src.xml</descriptor>
-              </descriptors>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <finalName>maven-${project.version}-src</finalName>
-            </configuration>
-            <executions>
-              <execution>
-                <id>make-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>maven-repo-local</id>
       <activation>