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. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@454415 13f79535-47bb-0310-9956-ffa450edef68
2006-10-09 16:13:34 +00:00
parent 83afd491d4
commit 753396fb2e
21 changed files with 45 additions and 29 deletions
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -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>
--- a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
+++ b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
@@ -29,11 +29,11 @@ import org.apache.commons.jelly.JellyContext;
 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 @@ public class PomRewriter
        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 @@ public class PomRewriter

            final String asString = p.getProjectAsString();

-            final MavenXpp3Reader reader = new MavenXpp3Reader();
+            final MavenDom4jReader reader = new MavenDom4jReader();
            model = reader.read( new StringReader( asString ) );
            model.setId( null );

--- a/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
+++ b/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
@@ -22,8 +22,8 @@ import junit.framework.Assert;
 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.
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -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>
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -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>
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -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>
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -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>
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -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.
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -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>
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -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>
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -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>
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -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>
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -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>
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -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>
--- a/multiproject/project.xml
+++ b/multiproject/project.xml
@@ -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>
--- a/multiproject/xdocs/changes.xml
+++ b/multiproject/xdocs/changes.xml
@@ -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>
--- a/plugins-parent/project.properties
+++ b/plugins-parent/project.properties
@@ -75,7 +75,7 @@ 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-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
--- a/source/project.xml
+++ b/source/project.xml
@@ -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>
--- a/source/xdocs/changes.xml
+++ b/source/xdocs/changes.xml
@@ -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>
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -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>
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -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>