You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/01/11 01:09:22 UTC
svn commit: r495054 - in /maven/maven-1: core/trunk/
core/trunk/src/java/org/apache/maven/project/
plugins-sandbox/trunk/plugins-parent/ plugins/trunk/artifact/
plugins/trunk/artifact/src/main/org/apache/maven/artifact/
plugins/trunk/artifact/xdocs/ pl...
Author: aheritier
Date: Wed Jan 10 16:09:20 2007
New Revision: 495054
URL: http://svn.apache.org/viewvc?view=rev&rev=495054
Log:
MAVEN-1755 : Backward Incompability : Usage of xml entities in the POM doesn't work in maven 1.1 beta 1 & 2.
Fixed using stax to parse and write the pom.
Modified:
maven/maven-1/core/trunk/project.xml
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
maven/maven-1/plugins-sandbox/trunk/plugins-parent/project.properties
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/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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Wed Jan 10 16:09:20 2007
@@ -2,7 +2,7 @@
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -685,7 +685,22 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>20060502</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
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=495054&r1=495053&r2=495054
==============================================================================
--- 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 Wed Jan 10 16:09:20 2007
@@ -17,6 +17,22 @@
* ====================================================================
*/
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.maven.ArtifactListBuilder;
+import org.apache.maven.DependencyClasspathBuilder;
+import org.apache.maven.MavenConstants;
+import org.apache.maven.MavenUtils;
+import org.apache.maven.jelly.MavenJellyContext;
+import org.apache.maven.plugin.PluginManager;
+import org.apache.maven.plugin.UnknownPluginException;
+import org.apache.maven.project.io.stax.MavenStaxReader;
+import org.apache.maven.project.io.stax.MavenStaxWriter;
+import org.apache.maven.verifier.ChecksumVerificationException;
+import org.apache.maven.verifier.DependencyVerifier;
+import org.apache.maven.verifier.RepoConfigException;
+import org.apache.maven.verifier.UnsatisfiedDependencyException;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -32,22 +48,6 @@
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.maven.ArtifactListBuilder;
-import org.apache.maven.DependencyClasspathBuilder;
-import org.apache.maven.MavenConstants;
-import org.apache.maven.MavenUtils;
-import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.plugin.UnknownPluginException;
-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;
-import org.apache.maven.verifier.UnsatisfiedDependencyException;
-
/**
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
@@ -131,7 +131,7 @@
public Project( Reader in )
throws Exception
{
- MavenDom4jReader reader = new MavenDom4jReader();
+ MavenStaxReader reader = new MavenStaxReader();
model = reader.read( in );
resolveDependencies();
resolveVersions();
@@ -147,13 +147,29 @@
public Project( URL url )
throws Exception
{
- MavenDom4jReader reader = new MavenDom4jReader();
- model = reader.read( url );
+ MavenStaxReader reader = new MavenStaxReader();
+ model = reader.read( url.getFile() );
resolveDependencies();
resolveVersions();
}
/**
+ * Constructor with prebuilt model.
+ *
+ * @param path the input path
+ * @throws Exception an error occured reading the file
+ * @todo should not have to throw Exception
+ */
+ public Project( String path )
+ throws Exception
+ {
+ MavenStaxReader reader = new MavenStaxReader();
+ model = reader.read( path );
+ resolveDependencies();
+ resolveVersions();
+ }
+
+ /**
* @return the maven.xml file
*/
public File getMavenXml()
@@ -1537,7 +1553,9 @@
OutputStreamWriter w = new OutputStreamWriter( projectStream, "UTF-8" );
try
{
- MavenDom4jWriter writer = new MavenDom4jWriter();
+ MavenStaxWriter writer = new MavenStaxWriter();
+ if ( model.getModelEncoding() == null )
+ model.setModelEncoding( "UTF-8" );
writer.write( w, model );
}
finally
Modified: maven/maven-1/plugins-sandbox/trunk/plugins-parent/project.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/plugins-parent/project.properties?view=diff&rev=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugins-parent/project.properties (original)
+++ maven/maven-1/plugins-sandbox/trunk/plugins-parent/project.properties Wed Jan 10 16:09:20 2007
@@ -62,23 +62,28 @@
maven.jar.commons-codec=1.2
maven.jar.commons-collections=3.0
maven.jar.commons-httpclient=3.0
-maven.jar.commons-io=1.0
-maven.jar.commons-jelly=1.0
+maven.jar.commons-io=1.2
+maven.jar.commons-jelly=1.0.1-20060717
maven.jar.commons-jelly-tags-ant=1.1
maven.jar.commons-jelly-tags-define=1.0
maven.jar.commons-jelly-tags-util=1.1.1
maven.jar.commons-jelly-tags-xml=1.1
-maven.jar.commons-jexl=1.0
+maven.jar.commons-jexl=1.1
maven.jar.commons-lang=2.0
maven.jar.commons-logging=1.0.4
-maven.jar.dom4j=1.4
+maven.jar.dom4j=1.7-20060614
+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-SNAPSHOT
maven.jar.plexus-utils=1.0.5
-maven.jar.wagon-file=1.0-alpha-7
-maven.jar.wagon-http=1.0-alpha-6
-maven.jar.wagon-provider-api=1.0-alpha-6
+maven.jar.stax=1.2.0
+maven.jar.stax-api=1.0.1
+maven.jar.stax-utils=20060502
+maven.jar.wagon-file=1.0-beta-1
+maven.jar.wagon-http=1.0-beta-1
+maven.jar.wagon-ssh=1.0-beta-1
+maven.jar.wagon-provider-api=1.0-beta-1
maven.jar.xercesImpl=2.8.0
maven.jar.xml-apis=1.3.03
maven.jar.xml-resolver=1.1
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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/project.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/project.xml Wed Jan 10 16:09:20 2007
@@ -239,11 +239,36 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</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>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</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>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>20060502</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>
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=495054&r1=495053&r2=495054
==============================================================================
--- 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 Wed Jan 10 16:09:20 2007
@@ -18,7 +18,6 @@
import java.io.File;
import java.io.FileWriter;
-import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -32,8 +31,8 @@
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.apache.maven.project.io.stax.MavenStaxReader;
+import org.apache.maven.project.io.stax.MavenStaxWriter;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -52,7 +51,7 @@
FileWriter w = null;
try
{
- final MavenDom4jWriter writer = new MavenDom4jWriter();
+ final MavenStaxWriter writer = new MavenStaxWriter();
final File f = File.createTempFile( "maven-artifact-plugin.", null );
f.deleteOnExit();
w = new FileWriter( f );
@@ -60,7 +59,7 @@
return f;
}
- catch ( final IOException e )
+ catch ( final Exception e )
{
throw new MavenException( "Error getting the project as a string", e );
}
@@ -114,7 +113,7 @@
final String asString = p.getProjectAsString();
- final MavenDom4jReader reader = new MavenDom4jReader();
+ final MavenStaxReader reader = new MavenStaxReader();
model = reader.read( new StringReader( asString ) );
model.setId( null );
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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -25,9 +25,9 @@
</properties>
<body>
<release version="1.8.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1755">Upgrade maven-model to version 3.0.2 and use stax reader/parser for the pom to allow to use relative entities.</action>
<action dev="aheritier" type="update" issue="MAVEN-1803">Upgrade plexus-utils to version 1.0.5</action>
<action dev="aheritier" type="update" issue="MAVEN-1796">Upgrade commons-jexl to version 1.1</action>
- <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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/project.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/project.xml Wed Jan 10 16:09:20 2007
@@ -214,7 +214,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -26,7 +26,7 @@
<body>
<release version="1.10-SNAPSHOT" date="In SVN">
<action dev="ltheussl" type="fix" issue="MPCHANGELOG-89">Plugin fails with anonymous access and empty password in scm url.</action>
- <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade maven-model to version 3.0.2</action>
+ <action dev="aheritier" type="update" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/dist/project.xml (original)
+++ maven/maven-1/plugins/trunk/dist/project.xml Wed Jan 10 16:09:20 2007
@@ -115,7 +115,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -24,7 +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="aheritier" type="update" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/project.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/project.xml Wed Jan 10 16:09:20 2007
@@ -142,7 +142,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -28,7 +28,7 @@
<action dev="aheritier" type="fix">WTP configuration : tld dependencies weren't deployed in ${maven.war.tld.dir} but in WEB-INF/lib</action>
<action dev="aheritier" type="add">New goal eclipse:multiclean</action>
<action dev="aheritier" type="add">New goal eclipse:multiproject</action>
- <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade maven-model to version 3.0.2</action>
+ <action dev="aheritier" type="update" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/project.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/project.xml Wed Jan 10 16:09:20 2007
@@ -118,7 +118,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -25,7 +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>
+ <action dev="aheritier" type="update" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/project.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/project.xml Wed Jan 10 16:09:20 2007
@@ -184,7 +184,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -26,7 +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="aheritier" type="update" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/project.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/project.xml Wed Jan 10 16:09:20 2007
@@ -132,7 +132,7 @@
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
<type>jar</type>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -25,7 +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" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/plugins-parent/project.properties (original)
+++ maven/maven-1/plugins/trunk/plugins-parent/project.properties Wed Jan 10 16:09:20 2007
@@ -75,8 +75,11 @@
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.2-20070110.005824
+maven.jar.maven-model=3.0.2-SNAPSHOT
maven.jar.plexus-utils=1.0.5
+maven.jar.stax=1.2.0
+maven.jar.stax-api=1.0.1
+maven.jar.stax-utils=20060502
maven.jar.wagon-file=1.0-beta-1
maven.jar.wagon-http=1.0-beta-1
maven.jar.wagon-ssh=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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/source/project.xml (original)
+++ maven/maven-1/plugins/trunk/source/project.xml Wed Jan 10 16:09:20 2007
@@ -53,7 +53,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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/source/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/source/xdocs/changes.xml?view=diff&rev=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/source/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/source/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -24,7 +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="aheritier" type="update" issue="MAVEN-1755">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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Wed Jan 10 16:09:20 2007
@@ -247,7 +247,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.2-20070110.005824</version>
+ <version>3.0.2-SNAPSHOT</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=495054&r1=495053&r2=495054
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Wed Jan 10 16:09:20 2007
@@ -32,7 +32,7 @@
<action dev="aheritier" type="update">Change margin between menu items in stylus.css.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-201">Plugin fails if there is an index.xml in the filesystem root directory.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-199">Improve stylus.css.</action>
- <action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade maven-model to version 3.0.2</action>
+ <action dev="aheritier" type="update" issue="MAVEN-1755">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>