Author: brett Date: Wed Jan 11 21:50:54 2006 New Revision: 368287 URL: http://svn.apache.org/viewcvs?rev=368287&view=rev Log: merge rev 368281 from branch - update classworlds and plexus-utils dependencies
Modified: maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=368287&r1=368286&r2=368287&view=diff ============================================================================== --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Wed Jan 11 21:50:54 2006 @@ -153,6 +153,11 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>classworlds</groupId> + <artifactId>classworlds</artifactId> + <version>1.1</version> + </dependency> </dependencies> <distributionManagement> <site> Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=368287&r1=368286&r2=368287&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Jan 11 21:50:54 2006 @@ -73,7 +73,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.util.RealmDelegatingClassLoader; +import org.codehaus.classworlds.RealmDelegatingClassLoader; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/pom.xml?rev=368287&r1=368286&r2=368287&view=diff ============================================================================== --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Wed Jan 11 21:50:54 2006 @@ -282,7 +282,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.1</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId>