maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r686026 - in /maven/components/branches/maven-2.0.10-RC: apache-maven/pom.xml apache-maven/src/assemble/src.xml pom.xml src/main/assembly/src.xml
Date Thu, 14 Aug 2008 20:39:45 GMT
Author: jdcasey
Date: Thu Aug 14 13:39:44 2008
New Revision: 686026

URL: http://svn.apache.org/viewvc?rev=686026&view=rev
Log:
[MNG-3709] Move the src distro assembly to the apache-maven project, so the artifact-id is
consistent with the binary distro.

Added:
    maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml   (contents,
props changed)
      - copied, changed from r685404, maven/components/branches/maven-2.0.10-RC/src/main/assembly/src.xml
Removed:
    maven/components/branches/maven-2.0.10-RC/src/main/assembly/src.xml
Modified:
    maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml
    maven/components/branches/maven-2.0.10-RC/pom.xml

Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml?rev=686026&r1=686025&r2=686026&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml Thu Aug 14 13:39:44 2008
@@ -97,17 +97,17 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <descriptor>src/assemble/bin.xml</descriptor>
-          <finalName>apache-maven-${project.version}</finalName>
-        </configuration>
+        <version>2.2-beta-2</version>
         <executions>
           <execution>
+            <id>bin-assembly</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+            <configuration>
+              <descriptor>src/assemble/bin.xml</descriptor>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -170,5 +170,30 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>make-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/assemble/src.xml</descriptor>
+                  </descriptors>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
\ No newline at end of file

Copied: maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml (from
r685404, maven/components/branches/maven-2.0.10-RC/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml?p2=maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml&p1=maven/components/branches/maven-2.0.10-RC/src/main/assembly/src.xml&r1=685404&r2=686026&rev=686026&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/src/main/assembly/src.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml Thu Aug 14
13:39:44 2008
@@ -26,14 +26,15 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>.</directory>
+      <directory>..</directory>
       <outputDirectory>/</outputDirectory>
       <excludes>
         <exclude>**/target/**</exclude>
+        <exclude>**/*.log</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target/maven-shared-archive-resources/META-INF</directory>
+      <directory>../target/maven-shared-archive-resources/META-INF</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
   </fileSets>

Propchange: maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/branches/maven-2.0.10-RC/apache-maven/src/assemble/src.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/components/branches/maven-2.0.10-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=686026&r1=686025&r2=686026&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/pom.xml Thu Aug 14 13:39:44 2008
@@ -438,33 +438,6 @@
 
   <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>run-its</id>
       <modules>
         <module>maven-core-it-runner</module>



Mime
View raw message