You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/11/15 15:15:23 UTC
svn commit: r714269 - /maven/components/branches/maven-2.1.x/pom.xml
Author: hboutemy
Date: Sat Nov 15 06:15:22 2008
New Revision: 714269
URL: http://svn.apache.org/viewvc?rev=714269&view=rev
Log:
fixed reporting-aggregate profile plugins configuration consistently with inherited reporting profile (merged from 2.0.10-RC branch r714265)
Modified:
maven/components/branches/maven-2.1.x/pom.xml
Modified: maven/components/branches/maven-2.1.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=714269&r1=714268&r2=714269&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/pom.xml Sat Nov 15 06:15:22 2008
@@ -209,7 +209,7 @@
<!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
<comparisonVersion>2.0.9</comparisonVersion>
<excludes>
- <!-- TODO: These represent method ADDITIONS from 2.0.9, and should be removed after
+ <!-- TODO: These represent method ADDITIONS from 2.0.9, and should be removed after
2.0.10 is released. -->
<exclude>org/apache/maven/lifecycle/LifecycleExecutor*</exclude>
<exclude>org/apache/maven/artifact/metadata/AbstractArtifactMetadata*</exclude>
@@ -220,7 +220,7 @@
<exclude>org/apache/maven/project/inheritance/ModelInheritanceAssembler*</exclude>
<exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
<exclude>org/apache/maven/plugin/DefaultPluginManager*</exclude>
-
+
<!-- these are differences in methods that SHOULD BE PRIVATE -->
<exclude>org/apache/maven/settings/io/xpp3/SettingsXpp3Reader*</exclude>
<exclude>org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader*</exclude>
@@ -523,7 +523,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -531,12 +531,13 @@
<version>2.1</version>
<configuration>
<aggregate>true</aggregate>
+ <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<links>
<link>http://java.sun.com/j2se/1.4.2/docs/api</link>