diff --git a/artifact/project.xml b/artifact/project.xml
index 611fc795..d64fbe56 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -239,7 +239,15 @@
maven
maven-model
- 3.0.1
+ 3.0.2-20061008.232644
+
+ This library is already loaded by maven's core. Be careful to use the same version number as in the core.
+
+
+
+ maven
+ dom4j
+ 1.7-20060614
This library is already loaded by maven's core. Be careful to use the same version number as in the core.
diff --git a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
index 11534c72..f16bbcbf 100644
--- 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 );
diff --git a/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java b/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
index b128a678..e9f37ae9 100644
--- 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.
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 08bf82d1..87762180 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -25,6 +25,7 @@
+ 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 2acdd9b3..aa80ed8e 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -214,7 +214,7 @@
maven
maven-model
- 3.0.1
+ 3.0.2-20061008.232644
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 bcda24e3..0a21389c 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -25,6 +25,7 @@
+ 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 f782e2de..19f56c78 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -115,7 +115,7 @@
maven
maven-model
- 3.0.1
+ 3.0.2-20061008.232644
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 72859b6c..c376c8b8 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -24,6 +24,7 @@
+ 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 b9b0ab36..8ae327e6 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -132,7 +132,7 @@
maven
maven-model
- 3.0.1
+ 3.0.2-20061008.232644
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 b1abe5be..d00eacac 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -24,6 +24,7 @@
+ 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 d521a5cd..a8ce890b 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -1,5 +1,4 @@
-
-
+