Author: jdcasey
Date: Tue Sep 9 16:36:03 2008
New Revision: 693654
URL: http://svn.apache.org/viewvc?rev=693654&view=rev
Log:
[MNG-3748] Roll back modello plugin version to alpha-13 (the one 2.0.9 used) to
avoid problems with strict checking.
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.1.0-M1-RC/pom.xml
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=693654&r1=693653&r2=693654&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Tue Sep 9 16:36:03 2008
@@ -351,7 +351,7 @@
}
catch ( XmlPullParserException e )
{
- throw new SettingsConfigurationException( e.getMessage(),
e.getDetail(), e.getLineNumber(),
+ throw new SettingsConfigurationException( e.getMessage(), e,
e.getLineNumber(),
e.getColumnNumber() );
}
Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/pom.xml?rev=693654&r1=693653&r2=693654&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-M1-RC/pom.xml (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/pom.xml Tue Sep 9 16:36:03 2008
@@ -177,7 +177,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-20</version>
+ <version>1.0-alpha-13</version>
<executions>
<execution>
<id>site-docs</id>
@@ -216,6 +216,14 @@
<exclude>org/apache/maven/project/inheritance/ModelInheritanceAssembler*</exclude>
<exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
<exclude>org/apache/maven/plugin/DefaultPluginManager*</exclude>
+
<exclude>org/apache/maven/settings/io/xpp3/SettingsXpp3Reader*</exclude>
+
<exclude>org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader*</exclude>
+
<exclude>org/apache/maven/model/io/xpp3/MavenXpp3Reader*</exclude>
+
<exclude>org/apache/maven/usability/plugin/io/xpp3/ParamdocXpp3Reader*</exclude>
+
<exclude>org/apache/maven/profiles/io/xpp3/ProfilesXpp3Reader*</exclude>
+
<exclude>org/apache/maven/plugin/registry/io/xpp3/PluginRegistryXpp3Reader*</exclude>
+
<exclude>org/apache/maven/plugin/lifecycle/io/xpp3/LifecycleMappingsXpp3Reader*</exclude>
+
<exclude>org/apache/maven/toolchain/model/io/xpp3/MavenToolchainsXpp3Reader*</exclude>
</excludes>
</configuration>
</plugin>
