You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@portals.apache.org by dj...@apache.org on 2009/12/11 05:41:46 UTC

svn commit: r889501 - /portals/portals-pom/trunk/pom.xml

Author: djencks
Date: Fri Dec 11 04:41:45 2009
New Revision: 889501

URL: http://svn.apache.org/viewvc?rev=889501&view=rev
Log:
PORTALS-20 steal assembly profile from not-quite-released apache-7 pom

Modified:
    portals/portals-pom/trunk/pom.xml

Modified: portals/portals-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/portals-pom/trunk/pom.xml?rev=889501&r1=889500&r2=889501&view=diff
==============================================================================
--- portals/portals-pom/trunk/pom.xml (original)
+++ portals/portals-pom/trunk/pom.xml Fri Dec 11 04:41:45 2009
@@ -37,19 +37,22 @@
   <packaging>pom</packaging>
 
   <description>Apache Portals is a collaborative software development project dedicated to providing robust, full-featured,
-        commercial-quality, and freely available Portal related software on a wide variety of platforms and programming languages.
-        This project is managed in cooperation with various individuals worldwide (both independent and company-affiliated experts),
-        who use the Internet to communicate, plan, and develop Portal software and related documentation.
+    commercial-quality, and freely available Portal related software on a wide variety of platforms and programming languages.
+    This project is managed in cooperation with various individuals worldwide (both independent and company-affiliated experts),
+    who use the Internet to communicate, plan, and develop Portal software and related documentation.
   </description>
 
   <url>http://portals.apache.org</url>
-  
+
   <inceptionYear>2004</inceptionYear>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/portals/portals-pom/trunk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/portals-pom/trunk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/portals/portals-pom/trunk</url>
   </scm>
+  <properties>
+    <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
+  </properties>
 
   <build>
     <pluginManagement>
@@ -64,43 +67,11 @@
           <artifactId>apache-rat-plugin</artifactId>
           <version>0.6</version>
         </plugin>
-        <!-- basic assembly configuration to create a source archive -->
-        <!-- run the assembly plugin in project root poms, like this: -->
-        <!--
-        <profiles>
-          <profile>
-            <id>apache-release</id>
-            <build>
-              <plugins>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                </plugin>
-              </plugins>
-            </build>
-          </profile>
-        </profiles>
-        -->
         <!-- this should be unnecessary in the apache 7 pom -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <!-- version 2.2-beta-3 does not work, see http://jira.codehaus.org/browse/MASSEMBLY-405 -->
-          <version>2.2-beta-2</version>
-          <configuration>
-            <descriptorRefs>
-              <descriptorRef>project</descriptorRef>
-            </descriptorRefs>
-          </configuration>
-          <executions>
-            <execution>
-              <id>make-project-assembly-source-release</id>
-              <phase>generate-sources</phase>
-              <goals>
-                <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
+          <version>2.2-beta-4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -143,7 +114,7 @@
     We should execute this profile manually to make sure that all files in our source code contain proper licenses.
     This is very important and should not be skipped in any scenario.  It is very importnt for us to follow ASF policy.
     Example:  mvn -P prepare-release install
-    -->    
+    -->
     <profile>
       <id>rat</id>
       <build>
@@ -173,5 +144,50 @@
         </plugins>
       </build>
     </profile>
+    <!-- START SNIPPET: release-profile -->
+    <!-- this is borrowed from an nov 2009 apache-7 pom release attempt-->
+    <profile>
+      <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>
+        </plugins>
+      </build>
+    </profile>
+    <!-- END SNIPPET: release-profile -->
   </profiles>
 </project>