Author: aheritier
Date: Mon Oct 9 09:13:34 2006
New Revision: 454415
URL: http://svn.apache.org/viewvc?view=rev&rev=454415
Log:
MAVEN-1755 : Backward Incompability : Usage of xml entities in the POM doesn't
work in maven 1.1 beta 1 & 2
Upgrade to a maven-model 3.0.2 SNAPSHOT which allow us to read the POM from an
URL with DOM4J
It fixes the problem of relative entities. We have to check if it doesn't
reduce significantly performances.
Modified:
maven/maven-1/core/trunk/project.xml
maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/entities-in-project.xml/project.xml
maven/maven-1/plugins/trunk/artifact/project.xml
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
maven/maven-1/plugins/trunk/changelog/project.xml
maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml
maven/maven-1/plugins/trunk/dist/project.xml
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
maven/maven-1/plugins/trunk/eclipse/project.xml
maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml
maven/maven-1/plugins/trunk/ejb/project.xml
maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
maven/maven-1/plugins/trunk/linkcheck/project.xml
maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml
maven/maven-1/plugins/trunk/multiproject/project.xml
maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
maven/maven-1/plugins/trunk/plugins-parent/project.properties
maven/maven-1/plugins/trunk/source/project.xml
maven/maven-1/plugins/trunk/source/xdocs/changes.xml
maven/maven-1/plugins/trunk/xdoc/project.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/core/trunk/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Mon Oct 9 09:13:34 2006
@@ -683,7 +683,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java Mon Oct
9 09:13:34 2006
@@ -186,31 +186,32 @@
{
// 1)
Project project = null;
- FileReader fr = null;
+ //FileReader fr = null;
try
{
- fr = new FileReader( projectDescriptor );
- project = new Project( fr );
+ //fr = new FileReader( projectDescriptor );
+ //project = new Project( fr );
+ project = new Project(projectDescriptor.toURL());
}
catch ( Exception e )
{
throw new MavenException( "Error parsing project.xml '" +
projectDescriptor.getAbsolutePath() + "'", e );
}
- finally
- {
- if ( fr != null )
- {
- try
- {
- fr.close();
- }
- catch ( IOException e )
- {
- LOGGER.debug( "WARNING: Cannot close stream!", e );
- }
- fr = null;
- }
- }
+// finally
+// {
+// if ( fr != null )
+// {
+// try
+// {
+// fr.close();
+// }
+// catch ( IOException e )
+// {
+// LOGGER.debug( "WARNING: Cannot close stream!", e );
+// }
+// fr = null;
+// }
+// }
// 2)
MavenJellyContext context = MavenUtils.createContextNoDefaults(
projectDescriptor.getParentFile(),
@@ -361,6 +362,8 @@
String projectString = project.getProjectAsString();
Expression e = JellyUtils.decomposeExpression( projectString, context
);
String newProjectString = e.evaluateAsString( context );
+ // We can use a Reader an d not an URL here to read
+ // the POM because this is a memory model without XML entities.
project = new Project( new StringReader( newProjectString ) );
return project;
}
Modified:
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java Mon
Oct 9 09:13:34 2006
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -40,8 +41,8 @@
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.UnknownPluginException;
-import org.apache.maven.project.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.project.io.xpp3.MavenXpp3Writer;
+import org.apache.maven.project.io.dom4j.MavenDom4jReader;
+import org.apache.maven.project.io.dom4j.MavenDom4jWriter;
import org.apache.maven.verifier.ChecksumVerificationException;
import org.apache.maven.verifier.DependencyVerifier;
import org.apache.maven.verifier.RepoConfigException;
@@ -130,13 +131,29 @@
public Project( Reader in )
throws Exception
{
- MavenXpp3Reader reader = new MavenXpp3Reader();
+ MavenDom4jReader reader = new MavenDom4jReader();
model = reader.read( in );
resolveDependencies();
resolveVersions();
}
/**
+ * Constructor with prebuilt model.
+ *
+ * @param url the input url
+ * @throws Exception an error occured reading the file
+ * @todo should not have to throw Exception
+ */
+ public Project( URL url )
+ throws Exception
+ {
+ MavenDom4jReader reader = new MavenDom4jReader();
+ model = reader.read( url );
+ resolveDependencies();
+ resolveVersions();
+ }
+
+ /**
* @return the maven.xml file
*/
public File getMavenXml()
@@ -1520,7 +1537,7 @@
OutputStreamWriter w = new OutputStreamWriter( projectStream );
try
{
- MavenXpp3Writer writer = new MavenXpp3Writer();
+ MavenDom4jWriter writer = new MavenDom4jWriter();
writer.write( w, model );
}
finally
Modified: maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/maven.xml Mon Oct 9
09:13:34 2006
@@ -221,9 +221,8 @@
<attainGoal name="test-plugin-getset" />
<attainGoal name="test-dot-property" />
<attainGoal name="test-overlappedCalls" /> <!-- MAVEN-1691 -->
- <!-- TO FIX -->
- <!-- <attainGoal name="test-entities-in-project" /> -->
- <attainGoal name="test-entities-in-maven" />
+ <attainGoal name="test-entities-in-project" /> <!-- MAVEN-1755 -->
+ <attainGoal name="test-entities-in-maven" /> <!-- MAVEN-1756 -->
<!-- TODO - this is still broken (as in RC1)
<attainGoal name="test-reactor-maven-username" />
-->
@@ -902,4 +901,5 @@
</goal>
</project>
+
Modified:
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/entities-in-project.xml/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/entities-in-project.xml/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
---
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/entities-in-project.xml/project.xml
(original)
+++
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/entities-in-project.xml/project.xml
Mon Oct 9 09:13:34 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by () -->
+
<!--
/*
* Copyright 2001-2006 The Apache Software Foundation.
Modified: maven/maven-1/plugins/trunk/artifact/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/project.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/project.xml Mon Oct 9 09:13:34 2006
@@ -239,7 +239,15 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
+ <properties>
+ <comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.7-20060614</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
(original)
+++
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
Mon Oct 9 09:13:34 2006
@@ -29,11 +29,11 @@
import org.apache.maven.MavenException;
import org.apache.maven.MavenUtils;
import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.apache.maven.project.Dependency;
+import org.apache.maven.project.Model;
import org.apache.maven.project.Project;
+import org.apache.maven.project.io.dom4j.MavenDom4jReader;
+import org.apache.maven.project.io.dom4j.MavenDom4jWriter;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -52,7 +52,7 @@
FileWriter w = null;
try
{
- final MavenXpp3Writer writer = new MavenXpp3Writer();
+ final MavenDom4jWriter writer = new MavenDom4jWriter();
final File f = File.createTempFile( "maven-artifact-plugin.", null
);
f.deleteOnExit();
w = new FileWriter( f );
@@ -114,7 +114,7 @@
final String asString = p.getProjectAsString();
- final MavenXpp3Reader reader = new MavenXpp3Reader();
+ final MavenDom4jReader reader = new MavenDom4jReader();
model = reader.read( new StringReader( asString ) );
model.setId( null );
Modified:
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
(original)
+++
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
Mon Oct 9 09:13:34 2006
@@ -22,8 +22,8 @@
import junit.framework.TestCase;
import org.apache.maven.MavenConstants;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
+import org.apache.maven.project.Dependency;
+import org.apache.maven.project.Model;
/**
* Test the POM rewriter.
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Mon Oct 9 09:13:34
2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.8.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="aheritier" type="update" issue="MAVEN-1789">Change the
default repository to http://repo1.maven.org/maven/ for dependencies url in the
manifest.</action>
<action dev="ltheussl" type="fix" issue="MPARTIFACT-72">Creating an
upload-bundle for a plugin without any java code does not work.</action>
<action dev="aheritier" type="update">Use a custom build of velocity
(1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the
issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to
closed appender named [null]").</action>
Modified: maven/maven-1/plugins/trunk/changelog/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/changelog/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/project.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/project.xml Mon Oct 9 09:13:34 2006
@@ -214,7 +214,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml Mon Oct 9 09:13:34
2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.10-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="ltheussl" type="add">New property
<code>maven.changelog.useDeveloperConnection</code>.</action>
<action dev="ltheussl" type="add" issue="MPCHANGELOG-86"
due-to="Christoph Jerolimov">Support time period in MKS changelog
parser.</action>
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to
Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the
xml-resolver dependency for xerces.</action>
Modified: maven/maven-1/plugins/trunk/dist/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/dist/project.xml (original)
+++ maven/maven-1/plugins/trunk/dist/project.xml Mon Oct 9 09:13:34 2006
@@ -115,7 +115,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Mon Oct 9 09:13:34 2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.7.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="ltheussl" type="fix" issue="MPDIST-20" due-to="Phil
Steitz">Fix combined javadoc classpath in
<code>dist:multiproject-bin</code>.</action>
<action dev="ltheussl" type="update" issue="MPDIST-20" due-to="Phil
Steitz">New
<code>maven.dist.src.includes</code> and
<code>maven.dist.bin.includes</code> properties.
Modified: maven/maven-1/plugins/trunk/eclipse/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/project.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/project.xml Mon Oct 9 09:13:34 2006
@@ -132,7 +132,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml Mon Oct 9 09:13:34
2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.11.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="snicoll" type="update" issue="MPECLIPSE-109" due-to="Gilles
Dodinet">Updated FAQ with multiproject entries.</action>
<action dev="snicoll" type="fix" issue="MPECLIPSE-119">Fixed broken test
cases.</action>
<action dev="snicoll" type="fix" issue="MPECLIPSE-123" due-to="Nicolas
De Loof">Download and attach javadoc archives to .classpath when no source
archive is available.</action>
Modified: maven/maven-1/plugins/trunk/ejb/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/ejb/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/project.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/project.xml Mon Oct 9 09:13:34 2006
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -90,7 +89,7 @@
</developers>
<contributors>
<contributor>
- <name>HÃ?Æ?Ã?Â¥vard BjÃ?Æ?Ã?Â¥stad</name>
+ <name>HÃ?Ã?Ã?ÃÂ¥vard BjÃ?Ã?Ã?ÃÂ¥stad</name>
</contributor>
</contributors>
<dependencies>
@@ -119,7 +118,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml Mon Oct 9 09:13:34 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7.3-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
</release>
<release version="1.7.2" date="2006-03-05">
<action dev="shinobu" type="fix" issue="MPEJB-23">Java sources are not
compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</action>
Modified: maven/maven-1/plugins/trunk/linkcheck/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/linkcheck/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/project.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/project.xml Mon Oct 9 09:13:34 2006
@@ -184,7 +184,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml Mon Oct 9 09:13:34
2006
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="ltheussl" type="update">Update jelly dependency to match
the ones in maven 1.1 core.</action>
<action dev="aheritier" type="fix" issue="MPLINKCHECK-27" due-to="Dennis
Lundberg">Maven 1.0.x : The report is incomplete if one or more files has
errors in them.</action>
</release>
Modified: maven/maven-1/plugins/trunk/multiproject/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/multiproject/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/project.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/project.xml Mon Oct 9 09:13:34
2006
@@ -132,7 +132,7 @@
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
<type>jar</type>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml Mon Oct 9
09:13:34 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="aheritier" type="update">Use a custom build of velocity
(1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the
issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to
closed appender named [null]").</action>
<action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-68"
due-to="Shinobu Kawai">Only register the dependency convergence report if there
are child projects.</action>
<action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-67"
due-to="Shinobu Kawai">maven-multiproject-plugin:deregister does not
work.</action>
Modified: maven/maven-1/plugins/trunk/plugins-parent/project.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/plugins-parent/project.properties?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/plugins-parent/project.properties (original)
+++ maven/maven-1/plugins/trunk/plugins-parent/project.properties Mon Oct 9
09:13:34 2006
@@ -75,7 +75,7 @@
maven.jar.jaxen=1.1-beta-9
maven.jar.forehead=1.0-beta-5
maven.jar.log4j=1.2.13
-maven.jar.maven-model=3.0.1
+maven.jar.maven-model=3.0.2-20061008.232644
maven.jar.plexus-utils=1.0.3
maven.jar.wagon-file=1.0-beta-1
maven.jar.wagon-http=1.0-beta-1
Modified: maven/maven-1/plugins/trunk/source/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/source/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/source/project.xml (original)
+++ maven/maven-1/plugins/trunk/source/project.xml Mon Oct 9 09:13:34 2006
@@ -53,7 +53,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
@@ -88,13 +88,13 @@
<artifactId>commons-jelly-tags-interaction</artifactId>
<version>1.1</version>
</dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.5</version>
- <properties>
- <comment>This library is used by
commons-jelly-tags-interaction.</comment>
- </properties>
- </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.5</version>
+ <properties>
+ <comment>This library is used by
commons-jelly-tags-interaction.</comment>
+ </properties>
+ </dependency>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/source/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/source/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/source/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/source/xdocs/changes.xml Mon Oct 9 09:13:34
2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.1-SNAPSHOT" date="in SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="ltheussl" type="update">Update jelly dependency to match
the ones in maven 1.1 core.</action>
<action dev="aheritier" type="update">Update dependencies to unify them
between plugins. The following dependencies are updated :
commons-jelly-tags-interaction v1.0 to v1.1. The dependency to jline is added
for commons-jelly-tags-interaction v1.1.</action>
</release>
Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/project.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Mon Oct 9 09:13:34 2006
@@ -247,7 +247,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-20061008.232644</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to
use the same version number as in the core.</comment>
</properties>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?view=diff&rev=454415&r1=454414&r2=454415
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Mon Oct 9 09:13:34 2006
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="dennisl" type="fix" issue="MPXDOC-198">Wrong margin around
organization/name when no organization/logo is present.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-197">Report fails if
there is no connection element in repository.</action>
<action dev="aheritier" type="update">Use a custom build of velocity
(1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the
issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to
closed appender named [null]").</action>
