You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/10 22:09:49 UTC
svn commit: r813572 - in /maven/maven-3/trunk:
maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
pom.xml
Author: bentmann
Date: Thu Sep 10 20:09:48 2009
New Revision: 813572
URL: http://svn.apache.org/viewvc?rev=813572&view=rev
Log:
o Updated to plexus-classworlds:2.1.0-SNAPSHOT
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java?rev=813572&r1=813571&r2=813572&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java Thu Sep 10 20:09:48 2009
@@ -83,7 +83,7 @@
{
try
{
- classRealm = world.newRealm( realmId );
+ classRealm = world.newRealm( realmId, null );
if ( logger.isDebugEnabled() )
{
@@ -159,6 +159,9 @@
// plexus-classworlds
importingRealm.importFromParent( "org.codehaus.plexus.classworlds" );
+ // classworlds (for legacy code)
+ importingRealm.importFromParent( "org.codehaus.classworlds" );
+
// plexus-container, plexus-component-annotations
importingRealm.importFromParent( "org.codehaus.plexus.component" );
importingRealm.importFromParent( "org.codehaus.plexus.configuration" );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=813572&r1=813571&r2=813572&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Thu Sep 10 20:09:48 2009
@@ -1341,12 +1341,12 @@
Xpp3Dom mojoConfiguration = mojoExecution.getConfiguration();
- mojoConfiguration = extractMojoConfiguration( mojoConfiguration, mojoDescriptor );
-
Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoConfiguration, defaultConfiguration, Boolean.TRUE );
+ mojoConfiguration = extractMojoConfiguration( mojoConfiguration, mojoDescriptor );
+
mojoExecution.setConfiguration( mojoConfiguration );
}
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=813572&r1=813571&r2=813572&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Thu Sep 10 20:09:48 2009
@@ -38,7 +38,7 @@
<inceptionYear>2001</inceptionYear>
<properties>
- <classWorldsVersion>2.0.0</classWorldsVersion>
+ <classWorldsVersion>2.1.0-SNAPSHOT</classWorldsVersion>
<commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>