Author: jdcasey
Date: Thu Nov 5 19:21:45 2009
New Revision: 833135
URL: http://svn.apache.org/viewvc?rev=833135&view=rev
Log:
updating ASF parent POM to include source-release assembly configuration, with
configurable descriptorRef (using expression
${sourceReleaseAssemblyDescriptor}). Also, adding comments in the Maven parent
POM to remove this source-release configuration once the parent version is
upgraded to 7."
Modified:
maven/pom/trunk/asf/pom.xml
maven/pom/trunk/maven/pom.xml
Modified: maven/pom/trunk/asf/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=833135&r1=833134&r2=833135&view=diff
==============================================================================
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Thu Nov 5 19:21:45 2009
@@ -91,6 +91,7 @@
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
</properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf</connection>
@@ -273,6 +274,41 @@
<id>apache-release</id>
<build>
<plugins>
+ <!-- Create a source-release artifact that contains the fully
buildable
+ project directory source structure. This is the artifact which
is
+ the official subject of any release vote. -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+
<artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <!-- NOTE: The fix for PLXUTILS-120 is crucial for the new
assembly descriptor -->
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- We want to sign the artifact, the POM, and all attached
artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: maven/pom/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=833135&r1=833134&r2=833135&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Nov 5 19:21:45 2009
@@ -25,6 +25,10 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
+
+ <!-- NOTE: When we upgrade to version 7, we need to REMOVE the
+ source-release-assembly execution of the assembly plugin,
+ in the apache-release profile below. -->
<version>6</version>
<relativePath>../asf/pom.xml</relativePath>
</parent>
@@ -559,6 +563,8 @@
<id>apache-release</id>
<build>
<plugins>
+ <!-- This is being moved to the ASF parent POM (for release in
version 7).
+ Remove once this has been released. -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<dependencies>
