Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAVEN-1755 : Backward Incompability : Usage of xml entities in the POM doesn't work in maven 1.1 beta 1 & 2.

Browse Source 
Fixed using stax to parse and write the pom.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@495054 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier
2007-01-11 00:09:20 +00:00
parent f9f4963b33
commit e2e97fd430
20 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
artifact/project.xml
View File

@@ -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>

11
artifact/src/main/org/apache/maven/artifact/PomRewriter.java
View File

@@ -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 );

2
artifact/xdocs/changes.xml
View File

@@ -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>

2
changelog/project.xml
View File

@@ -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>

2
changelog/xdocs/changes.xml
View File

@@ -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>

2
dist/project.xml vendored
View File

@@ -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>

2
dist/xdocs/changes.xml vendored
View File

@@ -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.

2
eclipse/project.xml
View File

@@ -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>

2
eclipse/xdocs/changes.xml
View File

@@ -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>

2
ejb/project.xml
View File

@@ -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>

2
ejb/xdocs/changes.xml
View File

@@ -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>

2
linkcheck/project.xml
View File

@@ -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>

2
linkcheck/xdocs/changes.xml
View File

@@ -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>

2
multiproject/project.xml
View File

@@ -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>

2
multiproject/xdocs/changes.xml
View File

@@ -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>

5
plugins-parent/project.properties
View File

@@ -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

2
source/project.xml
View File

@@ -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>

2
source/xdocs/changes.xml
View File

@@ -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>

2
xdoc/project.xml
View File

@@ -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>

2
xdoc/xdocs/changes.xml
View File

@@ -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>