Author: ate
Date: Thu Apr 1 15:36:19 2010
New Revision: 930008
URL: http://svn.apache.org/viewvc?rev=930008&view=rev
Log:
PORTALS-20: upgrade to latest maven release patterns/use of asssembly plugin
See: http://issues.apache.org/jira/browse/PORTALS-20
- upgrading to apache-7 pom which allows removing most of the custom/temporary
additions
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=930008&r1=930007&r2=930008&view=diff
==============================================================================
--- portals/portals-pom/trunk/pom.xml (original)
+++ portals/portals-pom/trunk/pom.xml Thu Apr 1 15:36:19 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.apache.portals</groupId>
@@ -50,9 +50,6 @@
<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>
@@ -67,12 +64,6 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.6</version>
</plugin>
- <!-- 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-4</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@@ -144,50 +135,5 @@
</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>
