diff --git a/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java index 9bae584f87..c696e0db13 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java @@ -11,13 +11,9 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.Profile; import org.apache.maven.model.Repository; -import org.apache.maven.profiles.activation.ProfileActivationContext; -import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.execution.DuplicateProjectException; -import org.apache.maven.project.InvalidProjectModelException; -import org.apache.maven.project.InvalidProjectVersionException; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.ProjectBuilderConfiguration; +import org.apache.maven.project.*; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java index 93c7a4413f..03b91a7a68 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java @@ -5,8 +5,7 @@ import org.apache.maven.model.DeploymentRepository; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.Repository; -import org.apache.maven.profiles.activation.ProfileActivationContext; -import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.InvalidProjectModelException; import org.apache.maven.project.InvalidProjectVersionException; diff --git a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java index 0244a6bf8b..4f3682ebed 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java +++ b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java @@ -5,8 +5,6 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.RepositoryBase; -import org.apache.maven.profiles.activation.ProfileActivationContext; -import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.InvalidProjectVersionException; import org.apache.maven.project.MavenProject; 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 7317081753..981b47d269 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 @@ -24,8 +24,8 @@ import java.util.Properties; import org.apache.maven.artifact.repository.ArtifactRepository; 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.project.ProfileManager; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.project.DefaultProjectBuilderConfiguration; import org.apache.maven.project.ProjectBuilderConfiguration; import org.apache.maven.realm.MavenRealmManager; 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 2a63ea4ae3..2ef4831584 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 @@ -28,8 +28,8 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; 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.project.ProfileManager; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.project.ProjectBuilderConfiguration; import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.settings.Settings; 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 0b74386d09..9e0ffaa141 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 @@ -38,9 +38,9 @@ import org.apache.maven.model.Profile; import org.apache.maven.model.Repository; import org.apache.maven.monitor.event.DefaultEventMonitor; import org.apache.maven.monitor.event.EventMonitor; -import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.ProfileManager; -import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.project.DefaultProfileManager; +import org.apache.maven.project.ProfileManager; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.realm.DefaultMavenRealmManager; import org.apache.maven.repository.MavenRepositorySystem; import org.apache.maven.settings.MavenSettingsBuilder; 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 83f9331479..1db1f4b0d0 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 @@ -37,10 +37,10 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import org.apache.maven.profiles.ProfileManager; -import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.activation.ProfileActivationContext; -import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.project.ProfileManager; +import org.apache.maven.project.DefaultProfileManager; +import org.apache.maven.project.ProfileActivationContext; +import org.apache.maven.project.ProfileActivationException; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.builder.*; import org.apache.maven.project.builder.profile.ProfileContext; diff --git a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java similarity index 94% rename from maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java rename to maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java index 223e048be8..4cf3d33f88 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java @@ -1,4 +1,4 @@ -package org.apache.maven.profiles; +package org.apache.maven.project; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,9 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.Parent; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; -import org.apache.maven.profiles.activation.ProfileActivationContext; -import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.project.ProfileActivationContext; +import org.apache.maven.project.ProfileActivationException; +import org.apache.maven.project.ProfileManager; import org.apache.maven.shared.model.ModelContainer; import org.apache.maven.shared.model.ModelProperty; import org.apache.maven.shared.model.ModelMarshaller; @@ -105,7 +106,7 @@ public class DefaultProfileManager } /* (non-Javadoc) - * @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile) + * @see org.apache.maven.project.ProfileManager#addProfile(org.apache.maven.model.Profile) */ public void addProfile( Profile profile ) { @@ -129,7 +130,7 @@ public class DefaultProfileManager } /* (non-Javadoc) - * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String) + * @see org.apache.maven.project.ProfileManager#explicitlyActivate(java.lang.String) */ public void explicitlyActivate( String profileId ) { @@ -143,7 +144,7 @@ public class DefaultProfileManager } /* (non-Javadoc) - * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List) + * @see org.apache.maven.project.ProfileManager#explicitlyActivate(java.util.List) */ public void explicitlyActivate( List profileIds ) { @@ -156,7 +157,7 @@ public class DefaultProfileManager } /* (non-Javadoc) - * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String) + * @see org.apache.maven.project.ProfileManager#explicitlyDeactivate(java.lang.String) */ public void explicitlyDeactivate( String profileId ) { @@ -170,7 +171,7 @@ public class DefaultProfileManager } /* (non-Javadoc) - * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List) + * @see org.apache.maven.project.ProfileManager#explicitlyDeactivate(java.util.List) */ public void explicitlyDeactivate( List profileIds ) { @@ -341,7 +342,7 @@ public class DefaultProfileManager } /* (non-Javadoc) - * @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List) + * @see org.apache.maven.project.ProfileManager#addProfiles(java.util.List) */ public void addProfiles( List profiles ) { diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java index b4bb843378..0ea435620a 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Properties; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.profiles.ProfileManager; +import org.apache.maven.project.ProfileManager; import org.apache.maven.shared.model.ModelEventListener; public class DefaultProjectBuilderConfiguration diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java index 0648b27acc..c657687afc 100644 --- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java @@ -17,7 +17,7 @@ package org.apache.maven.project; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.profiles.ProfileManager; +import org.apache.maven.project.ProfileManager; import org.apache.maven.project.builder.PomClassicDomainModel; import org.apache.maven.shared.model.InterpolatorProperty; import org.apache.maven.model.Model; diff --git a/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java b/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java similarity index 98% rename from maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java rename to maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java index 128646b604..9c1e9f1e76 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java +++ b/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java @@ -1,4 +1,4 @@ -package org.apache.maven.profiles.activation; +package org.apache.maven.project; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java b/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java similarity index 95% rename from maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java rename to maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java index e54917ddbe..dce34a2767 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java +++ b/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java @@ -1,4 +1,4 @@ -package org.apache.maven.profiles.activation; +package org.apache.maven.project; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java b/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java similarity index 93% rename from maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java rename to maven-project/src/main/java/org/apache/maven/project/ProfileManager.java index 4a4510e567..0c91c8f8af 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java +++ b/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java @@ -1,4 +1,4 @@ -package org.apache.maven.profiles; +package org.apache.maven.project; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ package org.apache.maven.profiles; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; -import org.apache.maven.profiles.activation.ProfileActivationContext; -import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.project.ProfileActivationContext; +import org.apache.maven.project.ProfileActivationException; import java.util.List; import java.util.Map; diff --git a/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java b/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java index 128b923e0e..1c3e569f87 100644 --- a/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java +++ b/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java @@ -1,9 +1,7 @@ package org.apache.maven.project; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.profiles.ProfileManager; -import org.apache.maven.shared.model.ModelEventListener; -import org.codehaus.plexus.PlexusContainer; +import org.apache.maven.project.ProfileManager; import java.util.Date; import java.util.List; diff --git a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java index 3030f103c7..e063a092db 100644 --- a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java +++ b/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java @@ -4,7 +4,7 @@ import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.project.ProfileActivationException; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java index 68105d38b5..18c82691f7 100644 --- a/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java +++ b/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java @@ -23,9 +23,9 @@ import org.apache.maven.model.Activation; import org.apache.maven.model.ActivationOS; import org.apache.maven.model.ActivationProperty; import org.apache.maven.model.Profile; -import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.ProfileManager; -import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.project.DefaultProfileManager; +import org.apache.maven.project.ProfileManager; +import org.apache.maven.project.ProfileActivationContext; import org.codehaus.plexus.PlexusTestCase; import java.util.List; diff --git a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index e6578ef0c1..43cef06af6 100644 --- a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -22,8 +22,8 @@ package org.apache.maven.project; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.project.DefaultProfileManager; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.project.validation.ModelValidationResult; import org.codehaus.plexus.PlexusTestCase; diff --git a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java index b609c3fcae..56d409ec20 100644 --- a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.FileInputStream; import java.util.*; -import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.activation.ProfileActivationContext; +import org.apache.maven.project.DefaultProfileManager; +import org.apache.maven.project.ProfileActivationContext; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.artifact.Artifact;