Author: tv
Date: Mon Nov 5 14:39:13 2012
New Revision: 1405810
URL: http://svn.apache.org/viewvc?rev=1405810&view=rev
Log:
Add customization of apache-release profile
Modified:
turbine/maven/turbine-parent/trunk/pom.xml
turbine/maven/turbine-parent/trunk/src/changes/changes.xml
Modified: turbine/maven/turbine-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/pom.xml?rev=1405810&r1=1405809&r2=1405810&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/pom.xml (original)
+++ turbine/maven/turbine-parent/trunk/pom.xml Mon Nov 5 14:39:13 2012
@@ -358,39 +358,37 @@
<!-- profile to update the Apache parent pom profile of the same name
to better suit the requirements of Apache Turbine. (Thanks to Apache
Commons) -->
<profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>apache-release</releaseProfiles>
- <mavenExecutorId>forked-path</mavenExecutorId>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
- </plugin>
- <!-- plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>create-javadoc-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <source>${maven.compile.source}</source>
- </configuration>
- </execution>
- </executions>
- </plugin -->
- </plugins>
- </build>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <releaseProfiles>apache-release</releaseProfiles>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <!-- Disable Apache Parent POM built-in source assembly -->
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
@@ -401,11 +399,6 @@
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
- <!-- configuration bits for cutting a release candidate, must be
overridden by components -->
- <!-- must agree with project.version above -->
- <turbine.release.version>2</turbine.release.version>
- <turbine.rc.version>RC1</turbine.rc.version>
-
<!-- Compiler and surefire plugin settings for "java" profiles -->
<turbine.compiler.fork>false</turbine.compiler.fork>
<turbine.compiler.compilerVersion>1.6</turbine.compiler.compilerVersion>
Modified: turbine/maven/turbine-parent/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/src/changes/changes.xml?rev=1405810&r1=1405809&r2=1405810&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/src/changes/changes.xml (original)
+++ turbine/maven/turbine-parent/trunk/src/changes/changes.xml Mon Nov 5
14:39:13 2012
@@ -25,6 +25,12 @@
<body>
<release version="2" date="as in SVN">
+ <action dev="tv" type="add" date="2012-11-05">
+ Add customization of apache-release profile
+ </action>
+ <action dev="tv" type="remove" date="2012-11-05">
+ Remove old release and rc profiles
+ </action>
<action dev="tv" type="update" date="2012-09-13">
Move changelog to standard location
</action>
