Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Updated to plexus-classworlds:2.1.0-SNAPSHOT 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813572 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-09-10 20:09:48 +00:00
parent 8f2fd860e2
commit 4e37cb1a45
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
View File

@ -83,7 +83,7 @@ public class DefaultClassRealmManager
{ {
try try
{ {
classRealm = world.newRealm( realmId ); classRealm = world.newRealm( realmId, null );
if ( logger.isDebugEnabled() ) if ( logger.isDebugEnabled() )
{ {
@ -159,6 +159,9 @@ public class DefaultClassRealmManager
// plexus-classworlds // plexus-classworlds
importingRealm.importFromParent( "org.codehaus.plexus.classworlds" ); importingRealm.importFromParent( "org.codehaus.plexus.classworlds" );
// classworlds (for legacy code)
importingRealm.importFromParent( "org.codehaus.classworlds" );
// plexus-container, plexus-component-annotations // plexus-container, plexus-component-annotations
importingRealm.importFromParent( "org.codehaus.plexus.component" ); importingRealm.importFromParent( "org.codehaus.plexus.component" );
importingRealm.importFromParent( "org.codehaus.plexus.configuration" ); importingRealm.importFromParent( "org.codehaus.plexus.configuration" );

4
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -1341,12 +1341,12 @@ public class DefaultLifecycleExecutor
Xpp3Dom mojoConfiguration = mojoExecution.getConfiguration(); Xpp3Dom mojoConfiguration = mojoExecution.getConfiguration();
mojoConfiguration = extractMojoConfiguration( mojoConfiguration, mojoDescriptor );
Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor ); Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoConfiguration, defaultConfiguration, Boolean.TRUE ); mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoConfiguration, defaultConfiguration, Boolean.TRUE );
mojoConfiguration = extractMojoConfiguration( mojoConfiguration, mojoDescriptor );
mojoExecution.setConfiguration( mojoConfiguration ); mojoExecution.setConfiguration( mojoConfiguration );
} }

2
pom.xml
View File

@ -38,7 +38,7 @@
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<properties> <properties>
<classWorldsVersion>2.0.0</classWorldsVersion> <classWorldsVersion>2.1.0-SNAPSHOT</classWorldsVersion>
<commonsCliVersion>1.2</commonsCliVersion> <commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion> <easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion> <junitVersion>3.8.2</junitVersion>