You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/08/23 20:19:41 UTC
svn commit: r1376630 - in /commons/proper/commons-parent/trunk: pom.xml
src/changes/changes.xml
Author: sebb
Date: Thu Aug 23 18:19:40 2012
New Revision: 1376630
URL: http://svn.apache.org/viewvc?rev=1376630&view=rev
Log:
Fix discrepancy in Maven site plugin versions
Use properties for all reporting section entries to help avoid this in future
Modified:
commons/proper/commons-parent/trunk/pom.xml
commons/proper/commons-parent/trunk/src/changes/changes.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1376630&r1=1376629&r2=1376630&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Thu Aug 23 18:19:40 2012
@@ -29,30 +29,18 @@
<artifactId>commons-parent</artifactId>
<packaging>pom</packaging>
<!-- Must agree with commons.release.version below -->
- <version>26-SNAPSHOT</version>
+ <version>27-SNAPSHOT</version>
<name>Commons Parent</name>
<url>http://commons.apache.org/</url>
<description>The Apache Commons Parent Pom provides common settings for all Apache Commons components.</description>
<!--
-Version 26:
- FELIX-3037 has been fixed so the profile java-1.5-detected is no longer needed.
-
- Updated various plugin versions:
- maven-changes-plugin: 2.6 => 2.7.1
- maven-clean-plugin: 2.4.1 => 2.5
- maven-compiler-plugin: 2.3.2 => 2.5.1
- maven-project-info-reports-plugin: 2.4 => 2.5
- maven-release-plugin: 2.2.2 => 2.3.2
- maven-remote-resources-plugin: 1.2.1 => 1.3
- maven-site-plugin: 3.0 => 3.1
- maven-source-plugin: 2.1.2 => 2.2
- maven-surefire-plugin: 2.12 => 2.12.2
- maven-surefire-report-plugin: 2.12 => 2.12.2
- org.codehaus.mojo:buildnumber-maven-plugin: 1.0 => 1.1
-
+Version 27:
+ update maven-site-plugin to 3.1 in reporting section
+ use properties for all reporting plugins to ensure consistency
+
For full details see:
-http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-26/RELEASE-NOTES.txt
+http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-27/RELEASE-NOTES.txt
-->
<!-- Now required by versions plugin -->
@@ -307,7 +295,7 @@ http://svn.apache.org/repos/asf/commons/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>$(commons.site-plugin.version)</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -563,7 +551,7 @@ http://svn.apache.org/repos/asf/commons/
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ <version>${commons.site-plugin.version}</version>
<configuration>
<!-- Exclude the navigation file for Maven 1 sites
and the changes file used by the changes-plugin,
@@ -590,7 +578,7 @@ http://svn.apache.org/repos/asf/commons/
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${commons.cobertura.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -603,7 +591,7 @@ http://svn.apache.org/repos/asf/commons/
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
+ <version>${commons.jdepend.version}</version>
</plugin>
</plugins>
</reporting>
@@ -1140,6 +1128,9 @@ http://svn.apache.org/repos/asf/commons/
<commons.jxr.version>2.3</commons.jxr.version>
<commons.project-info.version>2.5</commons.project-info.version>
<commons.wagon-ssh.version>2.2</commons.wagon-ssh.version>
+ <commons.site-plugin.version>3.1</commons.site-plugin.version>
+ <commons.cobertura.version>2.5.1</commons.cobertura.version>
+ <commons.jdepend.version>2.0-beta2</commons.jdepend.version>
<!-- Default values for the download-page generation by commons-build-plugin -->
Modified: commons/proper/commons-parent/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/src/changes/changes.xml?rev=1376630&r1=1376629&r2=1376630&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/src/changes/changes.xml (original)
+++ commons/proper/commons-parent/trunk/src/changes/changes.xml Thu Aug 23 18:19:40 2012
@@ -56,7 +56,13 @@ The <action> type attribute can be add,u
-->
<body>
- <release version="26" date="2012-??-??" description="Update plugins">
+ <release version="27" date="2012-??-??" description="Update plugins">
+ <action type="update">
+ update maven-site-plugin to 3.1 in reporting section
+ use properties for all reporting plugins to ensure consistency
+ </action>
+ </release>
+ <release version="26" date="2012-08-23" description="Update plugins">
<action type="update">
FELIX-3037 has been fixed so the profile java-1.5-detected is no longer needed
(in fact it causes problems, because it reverts bndlib to a version that is missing some required new methods)