diff --git a/maven-plugin-tools/pom.xml b/maven-plugin-tools/pom.xml
index 589363c10c..61c3b378ab 100644
--- a/maven-plugin-tools/pom.xml
+++ b/maven-plugin-tools/pom.xml
@@ -22,11 +22,6 @@
qdox
1.2
-
- xstream
- xstream
- 1.0-SNAPSHOT
-
modello
modello
diff --git a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java
index 7b9b021ee9..822648ec8e 100644
--- a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java
+++ b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java
@@ -20,10 +20,10 @@ import com.thoughtworks.qdox.JavaDocBuilder;
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaSource;
-import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
-import com.thoughtworks.xstream.xml.xpp3.Xpp3DomBuilder;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import java.io.File;
import java.io.FileReader;
diff --git a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java
index f06e2beda5..323d090196 100644
--- a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java
+++ b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java
@@ -16,15 +16,15 @@ package org.apache.maven.plugin.generator;
* limitations under the License.
*/
-import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
-import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.modello.generator.java.javasource.JClass;
import org.codehaus.modello.generator.java.javasource.JConstructor;
import org.codehaus.modello.generator.java.javasource.JMethod;
import org.codehaus.modello.generator.java.javasource.JParameter;
import org.codehaus.modello.generator.java.javasource.JSourceWriter;
import org.codehaus.modello.generator.java.javasource.JType;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
import java.io.FileWriter;
diff --git a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java
index 64cca843aa..f112e87394 100644
--- a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java
+++ b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java
@@ -16,11 +16,11 @@ package org.apache.maven.plugin.generator;
* limitations under the License.
*/
-import com.thoughtworks.xstream.xml.XMLWriter;
-import com.thoughtworks.xstream.xml.text.PrettyPrintXMLWriter;
-import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import java.io.File;
import java.io.FileWriter;
diff --git a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginXdocGenerator.java
index e97cd245db..c33d2bbd2d 100644
--- a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginXdocGenerator.java
+++ b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginXdocGenerator.java
@@ -16,11 +16,11 @@ package org.apache.maven.plugin.generator;
* limitations under the License.
*/
-import com.thoughtworks.xstream.xml.XMLWriter;
-import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
-import com.thoughtworks.xstream.xml.text.PrettyPrintXMLWriter;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import java.io.File;
import java.io.FileWriter;
diff --git a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly/JellyHarnessGenerator.java b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly/JellyHarnessGenerator.java
index 9524fdcaf1..dd1874be15 100644
--- a/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly/JellyHarnessGenerator.java
+++ b/maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly/JellyHarnessGenerator.java
@@ -16,12 +16,12 @@ package org.apache.maven.plugin.generator.jelly;
* limitations under the License.
*/
-import com.thoughtworks.xstream.xml.text.PrettyPrintXMLWriter;
-import com.thoughtworks.xstream.xml.XMLWriter;
-import com.thoughtworks.xstream.xml.xpp3.Xpp3Dom;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.generator.AbstractGenerator;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
+import org.codehaus.plexus.util.xml.XMLWriter;
import java.io.File;
import java.io.FileWriter;
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 5c73c32b21..53f0edbeaf 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -51,12 +51,10 @@
maven-plugin
2.0-SNAPSHOT
-
plexus
- plexus
- 0.17-SNAPSHOT
-
+ plexus-utils
+ 1.0-alpha-1-SNAPSHOT
+
-