Author: jvanzyl
Date: Sun Mar 25 10:42:58 2007
New Revision: 522313
URL: http://svn.apache.org/viewvc?view=rev&rev=522313
Log:
MNG-2898 Now leaving Xpp3Dom and org.codehaus.plexus.util.xml.pull.* to be
openly used by the core
and plugins fixes the coupling of Xpp3Dom to other classes.
Modified:
maven/components/branches/maven-2.0.x/maven-core/pom.xml
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?view=diff&rev=522313&r1=522312&r2=522313
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Sun Mar 25
10:42:58 2007
@@ -68,7 +68,10 @@
<relocations>
<relocation>
<pattern>org.codehaus.plexus.util</pattern>
- <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
+ <excludes>
+ <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
+ <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
+ </excludes>
</relocation>
</relocations>
</configuration>
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=522313&r1=522312&r2=522313
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Mar 25 10:42:58 2007
@@ -295,6 +295,7 @@
try
{
child.getContainerRealm().importFrom( "plexus.core",
"org.codehaus.plexus.util.xml.Xpp3Dom" );
+ child.getContainerRealm().importFrom( "plexus.core",
"org.codehaus.plexus.util.xml.pull" );
}
catch ( NoSuchRealmException e )
{
