diff --git a/maven-core/src/main/aspect/org/apache/maven/compat/Maven20xCompatAspect.aj b/maven-core/src/main/aspect/org/apache/maven/compat/Maven20xCompatAspect.aj index 7d2cbfd48a..b03ccc3adf 100644 --- a/maven-core/src/main/aspect/org/apache/maven/compat/Maven20xCompatAspect.aj +++ b/maven-core/src/main/aspect/org/apache/maven/compat/Maven20xCompatAspect.aj @@ -12,7 +12,6 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.execution.MavenSession; import org.apache.maven.extension.DefaultExtensionManager; -import org.apache.maven.execution.MavenRealmManager; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ResolutionGroup; @@ -33,6 +32,7 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; import org.apache.maven.project.MavenProject; +import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.settings.MavenSettingsBuilder; import org.apache.maven.settings.DefaultMavenSettingsBuilder; import org.apache.maven.settings.Settings; diff --git a/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj b/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj index 8f7c5d1ad9..abd8e7b63c 100644 --- a/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj +++ b/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj @@ -8,7 +8,6 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.plugin.PluginNotFoundException; import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; @@ -28,6 +27,7 @@ import org.apache.maven.extension.DefaultExtensionManager; import org.apache.maven.model.Prerequisites; import org.apache.maven.plugin.DefaultPluginManager; import org.apache.maven.plugin.version.DefaultPluginVersionManager; +import org.apache.maven.realm.RealmManagementException; import org.apache.maven.execution.RuntimeInformation; import java.io.File; diff --git a/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java index c98cc32d06..78f5ea38b4 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java @@ -12,7 +12,6 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.extension.ExtensionManagerException; import org.apache.maven.lifecycle.LifecycleException; import org.apache.maven.lifecycle.LifecycleExecutionException; @@ -40,6 +39,7 @@ import org.apache.maven.project.interpolation.ModelInterpolationException; import org.apache.maven.project.path.PathTranslator; import org.apache.maven.reactor.MavenExecutionException; +import org.apache.maven.realm.RealmManagementException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.configuration.PlexusConfiguration; diff --git a/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java b/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java index 28d2c612d0..caf67e3615 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java +++ b/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java @@ -7,7 +7,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.lifecycle.LifecycleException; import org.apache.maven.lifecycle.model.MojoBinding; import org.apache.maven.model.Model; @@ -23,6 +22,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.interpolation.ModelInterpolationException; +import org.apache.maven.realm.RealmManagementException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.configuration.PlexusConfiguration; diff --git a/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java index c5d96efc21..1c1194d881 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java @@ -15,7 +15,6 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.extension.ExtensionManagerException; import org.apache.maven.lifecycle.LifecycleException; import org.apache.maven.lifecycle.LifecycleExecutionException; @@ -48,6 +47,7 @@ import org.apache.maven.project.interpolation.ModelInterpolationException; import org.apache.maven.project.path.PathTranslator; import org.apache.maven.reactor.MavenExecutionException; +import org.apache.maven.realm.RealmManagementException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.configuration.PlexusConfiguration; diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java index bf1b260af7..36361905b2 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java @@ -23,6 +23,8 @@ import org.apache.maven.errors.CoreErrorReporter; import org.apache.maven.monitor.event.EventMonitor; import org.apache.maven.profiles.ProfileManager; +import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.settings.Settings; import org.apache.maven.wagon.events.TransferListener; @@ -530,6 +532,8 @@ public MavenExecutionRequest setRecursive( boolean recursive ) private CoreErrorReporter errorReporter; + private ProfileActivationContext profileActivationContext; + public MavenExecutionRequest setSettings( Settings settings ) { this.settings = settings; @@ -637,4 +641,15 @@ public MavenExecutionRequest setErrorReporter( CoreErrorReporter reporter ) errorReporter = reporter; return this; } + + public ProfileActivationContext getProfileActivationContext() + { + return profileActivationContext; + } + + public MavenExecutionRequest setProfileActivationContext( ProfileActivationContext profileActivationContext ) + { + this.profileActivationContext = profileActivationContext; + return this; + } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java index cf0fab489d..ae43d37ae6 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java @@ -24,6 +24,8 @@ import org.apache.maven.errors.CoreErrorReporter; import org.apache.maven.monitor.event.EventMonitor; import org.apache.maven.profiles.ProfileManager; +import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.settings.Settings; import org.apache.maven.wagon.events.TransferListener; import org.codehaus.plexus.logging.Logger; @@ -192,6 +194,9 @@ public interface MavenExecutionRequest ProfileManager getProfileManager(); MavenExecutionRequest setProfileManager( ProfileManager profileManager ); + ProfileActivationContext getProfileActivationContext(); + MavenExecutionRequest setProfileActivationContext( ProfileActivationContext profileActivationContext ); + boolean isProjectPresent(); MavenExecutionRequest setProjectPresent( boolean isProjectPresent ); diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index f2c3ae0cbd..34df42437d 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -24,6 +24,7 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; +import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.reporting.MavenReport; import org.apache.maven.settings.Settings; import org.codehaus.plexus.PlexusContainer; diff --git a/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java b/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java index e59dd2b1b0..12178fba32 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java +++ b/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java @@ -38,10 +38,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenRealmManager; import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.RealmManagementException; -import org.apache.maven.execution.RealmUtils; import org.apache.maven.model.Extension; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; @@ -56,6 +53,9 @@ import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; import org.apache.maven.project.MavenProject; +import org.apache.maven.realm.MavenRealmManager; +import org.apache.maven.realm.RealmManagementException; +import org.apache.maven.realm.RealmUtils; import org.codehaus.plexus.MutablePlexusContainer; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.context.Context; diff --git a/maven-core/src/main/java/org/apache/maven/extension/ExtensionManagerException.java b/maven-core/src/main/java/org/apache/maven/extension/ExtensionManagerException.java index 331c95987c..78023517dc 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/ExtensionManagerException.java +++ b/maven-core/src/main/java/org/apache/maven/extension/ExtensionManagerException.java @@ -5,12 +5,12 @@ import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.plugin.InvalidPluginException; import org.apache.maven.plugin.PluginManagerException; import org.apache.maven.plugin.PluginNotFoundException; import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; +import org.apache.maven.realm.RealmManagementException; public class ExtensionManagerException extends Exception diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index bc8ead5986..84e9ae15dc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -35,9 +35,7 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.execution.MavenRealmManager; import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.execution.RuntimeInformation; import org.apache.maven.lifecycle.statemgmt.StateManagementUtils; import org.apache.maven.model.Plugin; @@ -59,6 +57,8 @@ import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.project.path.PathTranslator; +import org.apache.maven.realm.MavenRealmManager; +import org.apache.maven.realm.RealmManagementException; import org.apache.maven.reporting.MavenReport; import org.codehaus.plexus.MutablePlexusContainer; import org.codehaus.plexus.PlexusConstants; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java index efe70a583d..353494abeb 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java @@ -1,8 +1,8 @@ package org.apache.maven.plugin; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.descriptor.MojoDescriptor; +import org.apache.maven.realm.RealmManagementException; import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.component.repository.exception.ComponentRepositoryException; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java index 5ba870a3d1..8735d1474d 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java @@ -1,11 +1,11 @@ package org.apache.maven.plugin; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; +import org.apache.maven.realm.RealmManagementException; import org.codehaus.plexus.PlexusContainerException; import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; import org.codehaus.plexus.component.repository.exception.ComponentRepositoryException; diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java index 20851969f3..0d0c04973f 100644 --- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java @@ -2,6 +2,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.realm.DefaultMavenRealmManager; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; diff --git a/maven-core/src/test/java/org/apache/maven/extension/DefaultExtensionManagerTest.java b/maven-core/src/test/java/org/apache/maven/extension/DefaultExtensionManagerTest.java index 2b1b13db64..7837afb0fd 100644 --- a/maven-core/src/test/java/org/apache/maven/extension/DefaultExtensionManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/extension/DefaultExtensionManagerTest.java @@ -11,13 +11,13 @@ import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.DefaultMavenRealmManager; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenRealmManager; import org.apache.maven.lifecycle.mapping.LifecycleMapping; import org.apache.maven.model.Build; import org.apache.maven.model.Extension; import org.apache.maven.model.Model; +import org.apache.maven.realm.DefaultMavenRealmManager; +import org.apache.maven.realm.MavenRealmManager; import org.codehaus.plexus.MutablePlexusContainer; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.classworlds.realm.ClassRealm; diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java index 21262fc119..73dcf890bf 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java @@ -2,9 +2,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.DefaultMavenRealmManager; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenRealmManager; import org.apache.maven.execution.MavenSession; import org.apache.maven.lifecycle.LifecycleLoaderException; import org.apache.maven.lifecycle.LifecycleSpecificationException; @@ -18,6 +16,8 @@ import org.apache.maven.model.PluginExecution; import org.apache.maven.model.PluginManagement; import org.apache.maven.project.MavenProject; +import org.apache.maven.realm.DefaultMavenRealmManager; +import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.shared.tools.easymock.MockManager; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java index cb3f563a74..4050a36968 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java @@ -2,9 +2,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.DefaultMavenRealmManager; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenRealmManager; import org.apache.maven.execution.MavenSession; import org.apache.maven.lifecycle.MojoBindingUtils; import org.apache.maven.lifecycle.model.MojoBinding; @@ -17,6 +15,8 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.loader.PluginLoader; import org.apache.maven.project.MavenProject; +import org.apache.maven.realm.DefaultMavenRealmManager; +import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.shared.tools.easymock.MockManager; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java b/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java index ca3adbc090..92dafa58ad 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java @@ -19,7 +19,7 @@ */ import org.apache.maven.errors.CoreErrorReporter; -import org.apache.maven.execution.MavenRealmManager; +import org.apache.maven.realm.MavenRealmManager; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.classworlds.ClassWorld; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java index 0e7cdd7132..6d5250ce9f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java @@ -19,7 +19,7 @@ */ import org.apache.maven.errors.CoreErrorReporter; -import org.apache.maven.execution.MavenRealmManager; +import org.apache.maven.realm.MavenRealmManager; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.classworlds.ClassWorld; 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 5ccf2eb42b..0fa379a256 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 @@ -29,7 +29,6 @@ import org.apache.maven.embedder.MavenEmbedder; import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.errors.DefaultCoreErrorReporter; -import org.apache.maven.execution.DefaultMavenRealmManager; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.model.Profile; import org.apache.maven.model.Repository; @@ -39,6 +38,7 @@ import org.apache.maven.profiles.ProfileManager; import org.apache.maven.profiles.activation.DefaultProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.realm.DefaultMavenRealmManager; import org.apache.maven.settings.MavenSettingsBuilder; import org.apache.maven.settings.Mirror; import org.apache.maven.settings.Proxy; @@ -119,12 +119,12 @@ public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, eventing( request, configuration ); + realmManager( request, configuration ); + profileManager( request, configuration ); processSettings( request, configuration ); - realmManager( request, configuration ); - return request; } @@ -655,14 +655,20 @@ private void profileManager( MavenExecutionRequest request, // // ------------------------------------------------------------------------ - ProfileActivationContext activationContext = new DefaultProfileActivationContext( request.getProperties(), false ); + ProfileActivationContext activationContext = request.getProfileActivationContext(); + if ( activationContext == null ) + { + activationContext = new DefaultProfileActivationContext( request.getRealmManager(), + request.getProperties(), false ); + } + + activationContext.setExplicitlyActiveProfileIds( request.getActiveProfiles() ); + activationContext.setExplicitlyInactiveProfileIds( request.getInactiveProfiles() ); + ProfileManager globalProfileManager = new DefaultProfileManager( container, activationContext ); - globalProfileManager.explicitlyActivate( request.getActiveProfiles() ); - - globalProfileManager.explicitlyDeactivate( request.getInactiveProfiles() ); - request.setProfileManager( globalProfileManager ); + request.setProfileActivationContext( activationContext ); } // ---------------------------------------------------------------------------- diff --git a/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java b/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java index 9d844abb7f..7f4f5d8b4b 100644 --- a/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java +++ b/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java @@ -15,7 +15,6 @@ import org.apache.maven.errors.DefaultCoreErrorReporter; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.RealmManagementException; import org.apache.maven.extension.ExtensionManagerException; import org.apache.maven.lifecycle.LifecycleException; import org.apache.maven.lifecycle.LifecycleExecutionException; @@ -54,6 +53,7 @@ import org.apache.maven.project.interpolation.ModelInterpolationException; import org.apache.maven.project.path.PathTranslator; import org.apache.maven.reactor.MavenExecutionException; +import org.apache.maven.realm.RealmManagementException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.configuration.PlexusConfiguration; 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 b7d1245a96..0e0aa52959 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 @@ -25,9 +25,12 @@ 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.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; @@ -41,12 +44,6 @@ public class DefaultProfileManager { private PlexusContainer container; - private List activatedIds = new ArrayList(); - - private List deactivatedIds = new ArrayList(); - - private List defaultIds = new ArrayList(); - private Map profilesById = new LinkedHashMap(); private ProfileActivationContext profileActivationContext; @@ -63,10 +60,18 @@ public DefaultProfileManager( PlexusContainer container, ProfileActivationContex } // TODO: Remove this, if possible. It uses system properties, which are not safe for IDE and other embedded environments. + /** + * @deprecated Using this is dangerous when extensions or non-global system properties are in play. + */ public DefaultProfileManager( PlexusContainer container ) { this.container = container; - profileActivationContext = new DefaultProfileActivationContext( System.getProperties(), false ); + + // 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 ); + + profileActivationContext = new DefaultProfileActivationContext( manager, System.getProperties(), false ); } public ProfileActivationContext getProfileActivationContext() @@ -113,11 +118,12 @@ public void addProfile( Profile profile ) */ public void explicitlyActivate( String profileId ) { + List activatedIds = profileActivationContext.getExplicitlyActiveProfileIds(); if ( !activatedIds.contains( profileId ) ) { container.getLogger().debug( "Profile with id: \'" + profileId + "\' has been explicitly activated." ); - activatedIds.add( profileId ); + profileActivationContext.setActive( profileId ); } } @@ -139,11 +145,12 @@ public void explicitlyActivate( List profileIds ) */ public void explicitlyDeactivate( String profileId ) { + List deactivatedIds = profileActivationContext.getExplicitlyInactiveProfileIds(); if ( !deactivatedIds.contains( profileId ) ) { container.getLogger().debug( "Profile with id: \'" + profileId + "\' has been explicitly deactivated." ); - deactivatedIds.add( profileId ); + profileActivationContext.setInactive( profileId ); } } @@ -177,11 +184,11 @@ public List getActiveProfiles() Profile profile = (Profile) entry.getValue(); boolean shouldAdd = false; - if ( activatedIds.contains( profileId ) ) + if ( profileActivationContext.isExplicitlyActive( profileId ) ) { shouldAdd = true; } - else if ( !deactivatedIds.contains( profileId ) && isActive( profile, profileActivationContext ) ) + else if ( !profileActivationContext.isExplicitlyInactive( profileId ) && isActive( profile, profileActivationContext ) ) { shouldAdd = true; } @@ -201,13 +208,18 @@ else if ( !deactivatedIds.contains( profileId ) && isActive( profile, profileAct if ( activeFromPom.isEmpty() ) { + List defaultIds = profileActivationContext.getActiveByDefaultProfileIds(); + for ( Iterator it = defaultIds.iterator(); it.hasNext(); ) { String profileId = (String) it.next(); Profile profile = (Profile) profilesById.get( profileId ); - activeFromPom.add( profile ); + if ( profile != null ) + { + activeFromPom.add( profile ); + } } } @@ -283,24 +295,26 @@ public void addProfiles( List profiles ) public void activateAsDefault( String profileId ) { + List defaultIds = profileActivationContext.getActiveByDefaultProfileIds(); + if ( !defaultIds.contains( profileId ) ) { - defaultIds.add( profileId ); + profileActivationContext.setActiveByDefault( profileId ); } } public List getExplicitlyActivatedIds() { - return activatedIds; + return profileActivationContext.getExplicitlyActiveProfileIds(); } public List getExplicitlyDeactivatedIds() { - return deactivatedIds; + return profileActivationContext.getExplicitlyInactiveProfileIds(); } public List getIdsActivatedByDefault() { - return defaultIds; + return profileActivationContext.getActiveByDefaultProfileIds(); } } diff --git a/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java index d21d02ffbd..0498c8bd2f 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java @@ -30,14 +30,29 @@ public interface ProfileManager { void addProfile( Profile profile ); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ void explicitlyActivate( String profileId ); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ void explicitlyActivate( List profileIds ); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ void explicitlyDeactivate( String profileId ); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ void explicitlyDeactivate( List profileIds ); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ void activateAsDefault( String profileId ); ProfileActivationContext getProfileActivationContext(); @@ -51,9 +66,18 @@ List getActiveProfiles() Map getProfilesById(); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ List getExplicitlyActivatedIds(); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ List getExplicitlyDeactivatedIds(); + /** + * @deprecated Use {@link ProfileActivationContext} methods instead. + */ List getIdsActivatedByDefault(); } \ No newline at end of file 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 62935bd384..da1d05498d 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 @@ -1,5 +1,10 @@ package org.apache.maven.profiles.activation; +import org.apache.maven.realm.MavenRealmManager; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Properties; public class DefaultProfileActivationContext @@ -8,12 +13,23 @@ public class DefaultProfileActivationContext private boolean isCustomActivatorFailureSuppressed; private final Properties executionProperties; + List explicitlyActive; + 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; - } public Properties getExecutionProperties() @@ -31,4 +47,99 @@ public void setCustomActivatorFailureSuppressed( boolean suppressed ) isCustomActivatorFailureSuppressed = suppressed; } + public List getExplicitlyActiveProfileIds() + { + if ( explicitlyActive == null ) + { + return Collections.EMPTY_LIST; + } + + return explicitlyActive; + } + + public void setExplicitlyActiveProfileIds( List active ) + { + explicitlyActive = active; + } + + public List getExplicitlyInactiveProfileIds() + { + if ( explicitlyInactive == null ) + { + return Collections.EMPTY_LIST; + } + + return explicitlyInactive; + } + + public void setExplicitlyInactiveProfileIds( List inactive ) + { + explicitlyInactive = inactive; + } + + public MavenRealmManager getRealmManager() + { + return realmManager; + } + + public void setActive( String profileId ) + { + if ( explicitlyActive == null ) + { + explicitlyActive = new ArrayList(); + } + + explicitlyActive.add( profileId ); + } + + public void setInactive( String profileId ) + { + if ( explicitlyInactive == null ) + { + explicitlyInactive = new ArrayList(); + } + + explicitlyInactive.add( profileId ); + } + + public boolean isExplicitlyActive( String profileId ) + { + return ( explicitlyActive != null ) && explicitlyActive.contains( profileId ); + } + + public boolean isExplicitlyInactive( String profileId ) + { + return ( explicitlyInactive != null ) && explicitlyInactive.contains( profileId ); + } + + public List getActiveByDefaultProfileIds() + { + if ( activeByDefault == null ) + { + return Collections.EMPTY_LIST; + } + + return activeByDefault; + } + + public boolean isActiveByDefault( String profileId ) + { + return ( activeByDefault != null ) && activeByDefault.contains( profileId ); + } + + public void setActiveByDefault( String profileId ) + { + if ( activeByDefault == null ) + { + activeByDefault = new ArrayList(); + } + + activeByDefault.add( profileId ); + } + + public void setActiveByDefaultProfileIds( List activeByDefault ) + { + this.activeByDefault = activeByDefault; + } + } 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 6c60416114..b38fb79f2d 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 @@ -1,14 +1,43 @@ package org.apache.maven.profiles.activation; +import org.apache.maven.realm.MavenRealmManager; + +import java.util.List; import java.util.Properties; public interface ProfileActivationContext { + List getExplicitlyActiveProfileIds(); + + List getExplicitlyInactiveProfileIds(); + + MavenRealmManager getRealmManager(); + Properties getExecutionProperties(); boolean isCustomActivatorFailureSuppressed(); void setCustomActivatorFailureSuppressed( boolean suppressed ); + void setExplicitlyActiveProfileIds( List inactive ); + + void setExplicitlyInactiveProfileIds( List inactive ); + + void setActive( String profileId ); + + void setInactive( String profileId ); + + boolean isExplicitlyActive( String profileId ); + + boolean isExplicitlyInactive( String profileId ); + + List getActiveByDefaultProfileIds(); + + void setActiveByDefaultProfileIds( List activeByDefault ); + + void setActiveByDefault( String profileId ); + + boolean isActiveByDefault( String profileId ); + } diff --git a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java index 582af242a6..a3f6f47388 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java @@ -69,8 +69,6 @@ public class DefaultProfileAdvisor public List applyActivatedProfiles( Model model, File pomFile, - List explicitlyActiveIds, - List explicitlyInactiveIds, boolean useProfilesXml, ProfileActivationContext activationContext ) throws ProjectBuildingException @@ -79,8 +77,6 @@ public List applyActivatedProfiles( Model model, + pomFile ); ProfileManager profileManager = buildProfileManager( model, pomFile, - explicitlyActiveIds, - explicitlyInactiveIds, useProfilesXml, activationContext ); @@ -152,18 +148,12 @@ private List applyActivatedProfiles( Model model, private ProfileManager buildProfileManager( Model model, File pomFile, - List explicitlyActiveIds, - List explicitlyInactiveIds, boolean useProfilesXml, ProfileActivationContext profileActivationContext ) throws ProjectBuildingException { ProfileManager profileManager = new DefaultProfileManager( container, profileActivationContext ); - profileManager.explicitlyActivate( explicitlyActiveIds ); - - profileManager.explicitlyDeactivate( explicitlyInactiveIds ); - profileManager.addProfiles( model.getProfiles() ); if ( useProfilesXml && ( pomFile != null ) ) @@ -204,22 +194,24 @@ public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( ProfileManager p for ( Iterator i = activeExternalProfiles.iterator(); i.hasNext(); ) { Profile externalProfile = (Profile) i.next(); - - for ( Iterator repoIterator = externalProfile.getRepositories().iterator(); repoIterator.hasNext(); ) + if ( externalProfile.getRepositories() != null ) { - Repository mavenRepo = (Repository) repoIterator.next(); - - ArtifactRepository artifactRepo; - try + for ( Iterator repoIterator = externalProfile.getRepositories().iterator(); repoIterator.hasNext(); ) { - artifactRepo = mavenTools.buildArtifactRepository( mavenRepo ); - } - catch ( InvalidRepositoryException e ) - { - throw new ProjectBuildingException( modelId, e.getMessage(), e ); - } + Repository mavenRepo = (Repository) repoIterator.next(); - remoteRepositories.add( artifactRepo ); + ArtifactRepository artifactRepo; + try + { + artifactRepo = mavenTools.buildArtifactRepository( mavenRepo ); + } + catch ( InvalidRepositoryException e ) + { + throw new ProjectBuildingException( modelId, e.getMessage(), e ); + } + + remoteRepositories.add( artifactRepo ); + } } } @@ -229,16 +221,12 @@ public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( ProfileManager p public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, - List explicitlyActiveIds, - List explicitlyInactiveIds, boolean useProfilesXml, ProfileActivationContext activationContext ) throws ProjectBuildingException { ProfileManager profileManager = buildProfileManager( model, pomFile, - explicitlyActiveIds, - explicitlyInactiveIds, useProfilesXml, activationContext ); @@ -263,7 +251,8 @@ private void loadExternalProjectProfiles( ProfileManager profileManager, if ( ( active != null ) && !active.isEmpty() ) { - profileManager.explicitlyActivate( root.getActiveProfiles() ); + ProfileActivationContext ctx = profileManager.getProfileActivationContext(); + ctx.setExplicitlyActiveProfileIds( root.getActiveProfiles() ); } for ( Iterator it = root.getProfiles().iterator(); it.hasNext(); ) diff --git a/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java index 33ac9c7ed6..e8f456eaa5 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java @@ -45,16 +45,12 @@ LinkedHashSet getArtifactRepositoriesFromActiveProfiles( ProfileManager profileM LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, - List explicitlyActiveIds, - List explicitlyInactiveIds, boolean useProfilesXml, ProfileActivationContext profileActivationContext ) throws ProjectBuildingException; List applyActivatedProfiles( Model model, File pomFile, - List explicitlyActiveIds, - List explicitlyInactiveIds, boolean useProfilesXml, ProfileActivationContext activationContext ) throws ProjectBuildingException; diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index b952106b6f..b63d5dfb68 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -570,10 +570,6 @@ private MavenProject buildInternal( Model model, String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() ); - List explicitlyActive; - - List explicitlyInactive; - // FIXME: Find a way to pass in this context, so it's never null! ProfileActivationContext profileActivationContext; @@ -589,18 +585,10 @@ private MavenProject buildInternal( Model model, throw new ProjectBuildingException( projectId, "Failed to activate external profiles.", projectDescriptor, e ); } - explicitlyActive = externalProfileManager.getExplicitlyActivatedIds(); - - explicitlyInactive = externalProfileManager.getExplicitlyDeactivatedIds(); - profileActivationContext = externalProfileManager.getProfileActivationContext(); } else { - explicitlyActive = Collections.EMPTY_LIST; - - explicitlyInactive = Collections.EMPTY_LIST; - profileActivationContext = new DefaultProfileActivationContext( System.getProperties(), false ); } @@ -611,7 +599,7 @@ private MavenProject buildInternal( Model model, activeInSuperPom.addAll( activated ); } - activated = profileAdvisor.applyActivatedProfiles( superModel, projectDescriptor, explicitlyActive, explicitlyInactive, validProfilesXmlLocation, profileActivationContext ); + activated = profileAdvisor.applyActivatedProfiles( superModel, projectDescriptor, validProfilesXmlLocation, profileActivationContext ); if ( !activated.isEmpty() ) { activeInSuperPom.addAll( activated ); @@ -624,8 +612,7 @@ private MavenProject buildInternal( Model model, LinkedHashSet aggregatedRemoteWagonRepositories = collectInitialRepositories( model, superModel, parentSearchRepositories, - projectDescriptor, explicitlyActive, - explicitlyInactive, + projectDescriptor, validProfilesXmlLocation, profileActivationContext ); @@ -741,17 +728,15 @@ private LinkedHashSet collectInitialRepositories( Model model, Model superModel, List parentSearchRepositories, File pomFile, - List explicitlyActive, - List explicitlyInactive, boolean validProfilesXmlLocation, ProfileActivationContext profileActivationContext ) throws ProjectBuildingException { LinkedHashSet collected = new LinkedHashSet(); - collectInitialRepositoriesFromModel( collected, model, pomFile, explicitlyActive, explicitlyInactive, validProfilesXmlLocation, profileActivationContext ); + collectInitialRepositoriesFromModel( collected, model, pomFile, validProfilesXmlLocation, profileActivationContext ); - collectInitialRepositoriesFromModel( collected, superModel, null, explicitlyActive, explicitlyInactive, validProfilesXmlLocation, profileActivationContext ); + collectInitialRepositoriesFromModel( collected, superModel, null, validProfilesXmlLocation, profileActivationContext ); if ( ( parentSearchRepositories != null ) && !parentSearchRepositories.isEmpty() ) { @@ -764,13 +749,11 @@ private LinkedHashSet collectInitialRepositories( Model model, private void collectInitialRepositoriesFromModel( LinkedHashSet collected, Model model, File pomFile, - List explicitlyActive, - List explicitlyInactive, boolean validProfilesXmlLocation, ProfileActivationContext profileActivationContext ) throws ProjectBuildingException { - Set reposFromProfiles = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model, pomFile, explicitlyActive, explicitlyInactive, validProfilesXmlLocation, profileActivationContext ); + Set reposFromProfiles = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model, pomFile, validProfilesXmlLocation, profileActivationContext ); if ( ( reposFromProfiles != null ) && !reposFromProfiles.isEmpty() ) { @@ -974,25 +957,15 @@ private MavenProject assembleLineage( Model model, modelLineageBuilder.resumeBuildingModelLineage( modelLineage, localRepository, externalProfileManager, !strict ); - List explicitlyActive; - - List explicitlyInactive; - // FIXME: Find a way to pass in this context, so it's never null! ProfileActivationContext profileActivationContext; if ( externalProfileManager != null ) { - explicitlyActive = externalProfileManager.getExplicitlyActivatedIds(); - - explicitlyInactive = externalProfileManager.getExplicitlyDeactivatedIds(); - profileActivationContext = externalProfileManager.getProfileActivationContext(); } else { - explicitlyActive = Collections.EMPTY_LIST; - explicitlyInactive = Collections.EMPTY_LIST; profileActivationContext = new DefaultProfileActivationContext( System.getProperties(), false ); } @@ -1017,8 +990,7 @@ private MavenProject assembleLineage( Model model, // NOTE: the caching aspect may replace the parent project instance, so we apply profiles here. // TODO: Review this...is that a good idea, to allow application of profiles when other profiles could have been applied already? - project.setActiveProfiles( profileAdvisor.applyActivatedProfiles( project.getModel(), project.getFile(), explicitlyActive, - explicitlyInactive, validProfilesXmlLocation, profileActivationContext ) ); + project.setActiveProfiles( profileAdvisor.applyActivatedProfiles( project.getModel(), project.getFile(), validProfilesXmlLocation, profileActivationContext ) ); lineage.addFirst( project ); diff --git a/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java b/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java index 13e77f8af2..6c47e3b060 100644 --- a/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java @@ -47,7 +47,6 @@ import java.io.IOException; import java.io.Reader; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -280,22 +279,15 @@ private void loadActiveProfileRepositories( List repositories, { getLogger().debug( "Grabbing profile-injected repositories for: " + model.getId() ); - List explicitlyActive; - List explicitlyInactive; - // FIXME: Find a way to pass in this context, so it's never null! ProfileActivationContext context; if ( profileManager != null ) { - explicitlyActive = profileManager.getExplicitlyActivatedIds(); - explicitlyInactive = profileManager.getExplicitlyDeactivatedIds(); context = profileManager.getProfileActivationContext(); } else { - explicitlyActive = Collections.EMPTY_LIST; - explicitlyInactive = Collections.EMPTY_LIST; context = new DefaultProfileActivationContext( System.getProperties(), false ); } @@ -307,8 +299,6 @@ private void loadActiveProfileRepositories( List repositories, LinkedHashSet pomProfileRepos = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model, pomFile, - explicitlyActive, - explicitlyInactive, useProfilesXml, context ); diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenRealmManager.java b/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java similarity index 99% rename from maven-core/src/main/java/org/apache/maven/execution/DefaultMavenRealmManager.java rename to maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java index e1fe17da40..1ee59e14a9 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenRealmManager.java +++ b/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java @@ -1,4 +1,4 @@ -package org.apache.maven.execution; +package org.apache.maven.realm; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -54,7 +54,7 @@ public class DefaultMavenRealmManager private Map pluginArtifacts = new HashMap(); private Set managedRealmIds = new HashSet(); - + private final ClassWorld world; private final PlexusContainer container; private final Logger logger; @@ -66,10 +66,10 @@ public DefaultMavenRealmManager( PlexusContainer container, this.container = container; this.logger = logger; } - - //mkleint: the clearing is fine for sequenced operations. Even though the + + //mkleint: the clearing is fine for sequenced operations. Even though the // MavenRealmManager is associated with request, the paralel execution will - // eventualy fail as the ClassWorld and PlexusContainer are not meant for + // eventualy fail as the ClassWorld and PlexusContainer are not meant for // multithreaded environment. public void clear() { diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenRealmManager.java b/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java similarity index 97% rename from maven-core/src/main/java/org/apache/maven/execution/MavenRealmManager.java rename to maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java index dae474c55e..1d6aa5c940 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenRealmManager.java +++ b/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java @@ -1,4 +1,4 @@ -package org.apache.maven.execution; +package org.apache.maven.realm; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Plugin; diff --git a/maven-core/src/main/java/org/apache/maven/execution/RealmManagementException.java b/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java similarity index 98% rename from maven-core/src/main/java/org/apache/maven/execution/RealmManagementException.java rename to maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java index 255d917118..06586710d1 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/RealmManagementException.java +++ b/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java @@ -1,4 +1,4 @@ -package org.apache.maven.execution; +package org.apache.maven.realm; import org.apache.maven.artifact.Artifact; import org.codehaus.plexus.classworlds.realm.DuplicateRealmException; diff --git a/maven-core/src/main/java/org/apache/maven/execution/RealmUtils.java b/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java similarity index 98% rename from maven-core/src/main/java/org/apache/maven/execution/RealmUtils.java rename to maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java index 79a482f5b5..18806afdbd 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/RealmUtils.java +++ b/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java @@ -1,4 +1,4 @@ -package org.apache.maven.execution; +package org.apache.maven.realm; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-project/src/main/resources/META-INF/plexus/components.xml index cb81eda211..51afcef40d 100644 --- a/maven-project/src/main/resources/META-INF/plexus/components.xml +++ b/maven-project/src/main/resources/META-INF/plexus/components.xml @@ -104,19 +104,17 @@ under the License. --> org.apache.maven.project.MavenProjectBuilder + default org.apache.maven.project.DefaultMavenProjectBuilder org.apache.maven.artifact.metadata.ArtifactMetadataSource - default org.apache.maven.project.build.model.ModelLineageBuilder - default org.apache.maven.profiles.build.ProfileAdvisor - default org.apache.maven.profiles.MavenProfilesBuilder