diff --git a/artifact/project.xml b/artifact/project.xml index 8d0ddea9..fac15495 100644 --- a/artifact/project.xml +++ b/artifact/project.xml @@ -239,11 +239,36 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + stax + stax + 1.2.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + stax + stax-api + 1.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + net.java.dev.stax-utils + stax-utils + 20060502 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + maven dom4j diff --git a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java index f16bbcbf..6337edcd 100644 --- a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java +++ b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java @@ -18,7 +18,6 @@ package org.apache.maven.artifact; 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.jelly.MavenJellyContext; 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 @@ public class PomRewriter 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 @@ public class PomRewriter 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 @@ public class PomRewriter final String asString = p.getProjectAsString(); - final MavenDom4jReader reader = new MavenDom4jReader(); + final MavenStaxReader reader = new MavenStaxReader(); model = reader.read( new StringReader( asString ) ); model.setId( null ); diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index 12de56eb..e230e2f6 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -25,9 +25,9 @@ + Upgrade maven-model to version 3.0.2 and use stax reader/parser for the pom to allow to use relative entities. Upgrade plexus-utils to version 1.0.5 Upgrade commons-jexl to version 1.1 - Upgrade maven-model to version 3.0.2 Change the default repository to http://repo1.maven.org/maven/ for dependencies url in the manifest. Creating an upload-bundle for a plugin without any java code does not work. 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]"). diff --git a/changelog/project.xml b/changelog/project.xml index 836531be..f83b9e19 100644 --- a/changelog/project.xml +++ b/changelog/project.xml @@ -214,7 +214,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml index 771bd3bb..e112d0ae 100644 --- a/changelog/xdocs/changes.xml +++ b/changelog/xdocs/changes.xml @@ -26,7 +26,7 @@ Plugin fails with anonymous access and empty password in scm url. - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. New property maven.changelog.useDeveloperConnection. Support time period in MKS changelog parser. Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. diff --git a/dist/project.xml b/dist/project.xml index 804da2f6..45e13661 100644 --- a/dist/project.xml +++ b/dist/project.xml @@ -115,7 +115,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml index c376c8b8..1df0d189 100644 --- a/dist/xdocs/changes.xml +++ b/dist/xdocs/changes.xml @@ -24,7 +24,7 @@ - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. Fix combined javadoc classpath in dist:multiproject-bin. New maven.dist.src.includes and maven.dist.bin.includes properties. diff --git a/eclipse/project.xml b/eclipse/project.xml index 50f2b743..2d6f42a8 100644 --- a/eclipse/project.xml +++ b/eclipse/project.xml @@ -142,7 +142,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml index 82ef52d2..1474d0c8 100644 --- a/eclipse/xdocs/changes.xml +++ b/eclipse/xdocs/changes.xml @@ -28,7 +28,7 @@ WTP configuration : tld dependencies weren't deployed in ${maven.war.tld.dir} but in WEB-INF/lib New goal eclipse:multiclean New goal eclipse:multiproject - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. Updated FAQ with multiproject entries. Fixed broken test cases. Download and attach javadoc archives to .classpath when no source archive is available. diff --git a/ejb/project.xml b/ejb/project.xml index 17e0c71b..67510dd2 100644 --- a/ejb/project.xml +++ b/ejb/project.xml @@ -118,7 +118,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml index 25107514..20a3a895 100644 --- a/ejb/xdocs/changes.xml +++ b/ejb/xdocs/changes.xml @@ -25,7 +25,7 @@ - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true. diff --git a/linkcheck/project.xml b/linkcheck/project.xml index c8d397a2..d9f94825 100644 --- a/linkcheck/project.xml +++ b/linkcheck/project.xml @@ -184,7 +184,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml index c807b9fe..5ab2f5fc 100644 --- a/linkcheck/xdocs/changes.xml +++ b/linkcheck/xdocs/changes.xml @@ -26,7 +26,7 @@ - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. Update jelly dependency to match the ones in maven 1.1 core. Maven 1.0.x : The report is incomplete if one or more files has errors in them. diff --git a/multiproject/project.xml b/multiproject/project.xml index 34939761..93c3145c 100644 --- a/multiproject/project.xml +++ b/multiproject/project.xml @@ -132,7 +132,7 @@ maven maven-model jar - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index 3e86783c..13b6f117 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -25,7 +25,7 @@ - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. 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]"). Only register the dependency convergence report if there are child projects. maven-multiproject-plugin:deregister does not work. diff --git a/plugins-parent/project.properties b/plugins-parent/project.properties index f0477b2a..f670300b 100644 --- a/plugins-parent/project.properties +++ b/plugins-parent/project.properties @@ -75,8 +75,11 @@ 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.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 diff --git a/source/project.xml b/source/project.xml index c3d16ebf..e698d837 100644 --- a/source/project.xml +++ b/source/project.xml @@ -53,7 +53,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/source/xdocs/changes.xml b/source/xdocs/changes.xml index f1f7483b..a1242450 100644 --- a/source/xdocs/changes.xml +++ b/source/xdocs/changes.xml @@ -24,7 +24,7 @@ - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. Update jelly dependency to match the ones in maven 1.1 core. 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. diff --git a/xdoc/project.xml b/xdoc/project.xml index 1f0a3915..5131323c 100644 --- a/xdoc/project.xml +++ b/xdoc/project.xml @@ -247,7 +247,7 @@ maven maven-model - 3.0.2-20070110.005824 + 3.0.2-SNAPSHOT This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index 7877285e..aa0d596e 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -32,7 +32,7 @@ Change margin between menu items in stylus.css. Plugin fails if there is an index.xml in the filesystem root directory. Improve stylus.css. - Upgrade maven-model to version 3.0.2 + Upgrade maven-model to version 3.0.2. Wrong margin around organization/name when no organization/logo is present. Report fails if there is no connection element in repository. 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]").