diff --git a/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java b/maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java rename to maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java diff --git a/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java b/maven-core/src/main/java/org/apache/maven/realm/MavenRealmManager.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java rename to maven-core/src/main/java/org/apache/maven/realm/MavenRealmManager.java diff --git a/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java b/maven-core/src/main/java/org/apache/maven/realm/RealmManagementException.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java rename to maven-core/src/main/java/org/apache/maven/realm/RealmManagementException.java diff --git a/maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java b/maven-core/src/main/java/org/apache/maven/realm/RealmScanningUtils.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java rename to maven-core/src/main/java/org/apache/maven/realm/RealmScanningUtils.java diff --git a/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java b/maven-core/src/main/java/org/apache/maven/realm/RealmUtils.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java rename to maven-core/src/main/java/org/apache/maven/realm/RealmUtils.java diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java index 9b18f146cf..1bf95f618e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java @@ -742,8 +742,8 @@ private void profileManager( MavenExecutionRequest request, ProfileActivationContext activationContext = request.getProfileActivationContext(); if ( activationContext == null ) { - activationContext = new DefaultProfileActivationContext( request.getRealmManager(), - request.getProperties(), false ); + activationContext = new DefaultProfileActivationContext( + request.getProperties(), false ); } activationContext.setExplicitlyActiveProfileIds( request.getActiveProfiles() ); diff --git a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java index fdba1fd95f..c780cec799 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java @@ -27,13 +27,9 @@ import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.profiles.activation.ProfileActivator; -import org.apache.maven.realm.DefaultMavenRealmManager; -import org.apache.maven.realm.MavenRealmManager; import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.logging.Logger; import java.util.ArrayList; import java.util.Iterator; @@ -81,11 +77,8 @@ public DefaultProfileManager( PlexusContainer container ) private ProfileActivationContext createDefaultActivationContext() { - // create the necessary bits to get a skeletal profile manager running. - Logger logger = container.getLoggerManager().getLoggerForComponent( DefaultProfileManager.class.getName() ); - MavenRealmManager manager = new DefaultMavenRealmManager( container, logger ); - return new DefaultProfileActivationContext( manager, System.getProperties(), false ); + return new DefaultProfileActivationContext(System.getProperties(), false ); } public ProfileActivationContext getProfileActivationContext() @@ -190,17 +183,6 @@ public List getActiveProfiles() public List getActiveProfiles( Model model ) throws ProfileActivationException { - MavenRealmManager realmManager = profileActivationContext.getRealmManager(); - - ClassRealm projectRealm = null; - ClassRealm oldLookupRealm = null; - - if ( ( model != null ) && ( realmManager != null ) ) - { - projectRealm = realmManager.getProjectRealm( getGroupId( model ), model.getArtifactId(), - getVersion( model ) ); - oldLookupRealm = container.setLookupRealm( projectRealm ); - } try { @@ -271,10 +253,6 @@ else if ( isActive( profile, profileActivationContext ) ) } finally { - if ( projectRealm != null ) - { - container.setLookupRealm( oldLookupRealm ); - } } } diff --git a/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java b/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java index fd3b9adf5d..b534bef97e 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java @@ -19,7 +19,6 @@ * under the License. */ -import org.apache.maven.realm.MavenRealmManager; import java.util.ArrayList; import java.util.Collections; @@ -38,21 +37,10 @@ public class DefaultProfileActivationContext List explicitlyInactive; - private final MavenRealmManager realmManager; - private List activeByDefault; - public DefaultProfileActivationContext( MavenRealmManager realmManager, Properties executionProperties, - boolean isCustomActivatorFailureSuppressed ) - { - this.realmManager = realmManager; - this.executionProperties = executionProperties; - this.isCustomActivatorFailureSuppressed = isCustomActivatorFailureSuppressed; - } - public DefaultProfileActivationContext( Properties executionProperties, boolean isCustomActivatorFailureSuppressed ) { - realmManager = null; this.executionProperties = executionProperties; this.isCustomActivatorFailureSuppressed = isCustomActivatorFailureSuppressed; } @@ -102,11 +90,6 @@ public void setExplicitlyInactiveProfileIds( List inactive ) explicitlyInactive = inactive; } - public MavenRealmManager getRealmManager() - { - return realmManager; - } - public void setActive( String profileId ) { if ( explicitlyActive == null ) diff --git a/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java b/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java index caba207687..fb35313231 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java @@ -19,7 +19,6 @@ * under the License. */ -import org.apache.maven.realm.MavenRealmManager; import java.util.List; import java.util.Properties; @@ -31,8 +30,6 @@ public interface ProfileActivationContext List getExplicitlyInactiveProfileIds(); - MavenRealmManager getRealmManager(); - Properties getExecutionProperties(); boolean isCustomActivatorFailureSuppressed();