You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/18 04:53:36 UTC
svn commit: r696547 - in
/maven/components/branches/sisbell-maven-3.0-profile:
maven-core/src/main/java/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/extension/ maven-core/src/ma...
Author: sisbell
Date: Wed Sep 17 19:53:35 2008
New Revision: 696547
URL: http://svn.apache.org/viewvc?rev=696547&view=rev
Log:
Remove all profile dependencies outside of maven-project.
Modified:
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java
maven/components/branches/sisbell-maven-3.0-profile/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java Wed Sep 17 19:53:35 2008
@@ -11,9 +11,11 @@
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.profiles.activation.ProfileActivator;
+*/
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
@@ -75,9 +77,6 @@
return new ArrayList( formattedMessages.keySet() );
}
- /**
- * @see ProjectErrorReporter#hasInformationFor(java.lang.Throwable)
- */
public Throwable findReportedException( Throwable error )
{
if ( formattedMessages.containsKey( error ) )
@@ -139,9 +138,7 @@
formattedMessages.put( error, formattedMessage );
}
- /**
- * @see ProjectErrorReporter#reportActivatorErrorWhileApplyingProfiles(org.apache.maven.profiles.activation.ProfileActivator, org.apache.maven.model.Model, java.io.File, org.apache.maven.model.Profile, org.apache.maven.profiles.activation.ProfileActivationContext, org.apache.maven.profiles.activation.ProfileActivationException)
- */
+ /*
public void reportActivatorError( ProfileActivator activator,
Model model,
File pomFile,
@@ -176,11 +173,10 @@
cause ), writer );
registerBuildError( cause, writer.toString(), cause.getCause() );
- }
- /**
- * @see ProjectErrorReporter#reportActivatorLookupError(java.lang.String, java.io.File, org.apache.maven.model.Profile, org.codehaus.plexus.component.repository.exception.ComponentLookupException)
- */
+ }
+ */
+/*
public void reportActivatorLookupError( Model model,
File pomFile,
Profile profile,
@@ -211,7 +207,7 @@
registerBuildError( cause, writer.toString(), cause.getCause() );
}
-
+ */
/**
* @see ProjectErrorReporter#reportErrorLoadingExternalProfilesFromFile(org.apache.maven.model.Model, java.io.File, java.io.File, java.io.IOException)
*/
@@ -277,9 +273,7 @@
registerBuildError( cause, writer.toString(), cause.getCause() );
}
- /**
- * @see ProjectErrorReporter#reportInvalidRepositoryWhileGettingRepositoriesFromProfiles(org.apache.maven.model.Repository, java.lang.String, java.io.File, org.apache.maven.artifact.InvalidRepositoryException)
- */
+
public void reportInvalidRepositoryWhileGettingRepositoriesFromProfiles( Repository repo,
Model model,
File pomFile,
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java Wed Sep 17 19:53:35 2008
@@ -8,9 +8,11 @@
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.profiles.activation.ProfileActivator;
+*/
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
@@ -57,12 +59,14 @@
* <------ ProjectBuildingException
* </pre>
*/
+ /*
void reportActivatorError( ProfileActivator activator,
Model model,
File pomFile,
Profile profile,
ProfileActivationContext context,
ProfileActivationException cause );
+ */
/**
* <b>Call Stack:</b>
@@ -80,11 +84,13 @@
* <------ ProjectBuildingException
* </pre>
*/
+ /*
void reportActivatorLookupError( Model model,
File pomFile,
Profile profile,
ProfileActivationContext context,
ComponentLookupException cause );
+ */
/**
* <b>Call Stack:</b>
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java Wed Sep 17 19:53:35 2008
@@ -5,9 +5,11 @@
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.profiles.activation.ProfileActivator;
+*/
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
@@ -32,7 +34,7 @@
private ProjectErrorTips()
{
}
-
+ /*
public static List getTipsForActivatorError( ProfileActivator activator,
String projectId,
File pomFile,
@@ -46,7 +48,7 @@
"XSD location for settings.xml: http://maven.apache.org/xsd/settings-1.0.0.xsd",
"XSD location for profiles.xml: http://maven.apache.org/xsd/profiles-1.0.0.xsd" } );
}
-
+ */
public static List getTipsForActivatorLookupError( String projectId,
File pomFile,
Profile profile,
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Wed Sep 17 19:53:35 2008
@@ -23,8 +23,8 @@
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+//import org.apache.maven.profiles.ProfileManager;
+//import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.realm.MavenRealmManager;
@@ -116,7 +116,7 @@
private boolean updateSnapshots = false;
- private ProfileManager profileManager;
+ //private ProfileManager profileManager;
private List remoteRepositories;
@@ -164,7 +164,7 @@
loggingLevel = original.getLoggingLevel();
globalChecksumPolicy = original.getGlobalChecksumPolicy();
updateSnapshots = original.isUpdateSnapshots();
- profileManager = original.getProfileManager();
+ //profileManager = original.getProfileManager();
remoteRepositories = original.getRemoteRepositories();
noSnapshotUpdates = original.isNoSnapshotUpdates();
realmManager = original.getRealmManager();
@@ -588,7 +588,7 @@
private CoreErrorReporter errorReporter;
- private ProfileActivationContext profileActivationContext;
+ //private ProfileActivationContext profileActivationContext;
// calculated from request attributes.
private ProjectBuilderConfiguration projectBuildingConfiguration;
@@ -604,7 +604,7 @@
{
return settings;
}
-
+ /*
public ProfileManager getProfileManager()
{
return profileManager;
@@ -616,7 +616,7 @@
return this;
}
-
+ */
public boolean isProjectPresent()
{
return isProjectPresent;
@@ -700,7 +700,7 @@
errorReporter = reporter;
return this;
}
-
+ /*
public ProfileActivationContext getProfileActivationContext()
{
return profileActivationContext;
@@ -711,7 +711,7 @@
this.profileActivationContext = profileActivationContext;
return this;
}
-
+ */
public MavenWorkspaceMonitor getWorkspaceMonitor()
{
return workspaceMonitor;
@@ -741,7 +741,7 @@
projectBuildingConfiguration = new DefaultProjectBuilderConfiguration();
projectBuildingConfiguration.setLocalRepository( getLocalRepository() );
projectBuildingConfiguration.setExecutionProperties( getProperties() );
- projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() );
+ // projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() );
projectBuildingConfiguration.setUserProperties( getUserProperties() );
projectBuildingConfiguration.setBuildStartTime( getStartTime() );
}
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Wed Sep 17 19:53:35 2008
@@ -24,8 +24,8 @@
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+//import org.apache.maven.profiles.ProfileManager;
+//import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.realm.MavenRealmManager;
import org.apache.maven.settings.Settings;
@@ -195,13 +195,13 @@
// Setting
Settings getSettings();
MavenExecutionRequest setSettings( Settings settings );
-
+ /*
ProfileManager getProfileManager();
MavenExecutionRequest setProfileManager( ProfileManager profileManager );
ProfileActivationContext getProfileActivationContext();
MavenExecutionRequest setProfileActivationContext( ProfileActivationContext profileActivationContext );
-
+ */
boolean isProjectPresent();
MavenExecutionRequest setProjectPresent( boolean isProjectPresent );
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java Wed Sep 17 19:53:35 2008
@@ -28,9 +28,11 @@
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
+/*
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationContext;
+*/
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuilderConfiguration;
@@ -412,7 +414,7 @@
private ModelLineage buildModelLineage( File pom, ProjectBuilderConfiguration config,
List originalRemoteRepositories )
throws ExtensionScanningException
- {
+ { /*
ProfileManager profileManager = config.getGlobalProfileManager();
ProfileActivationContext profileActivationContext = profileManager == null
@@ -420,7 +422,7 @@
: profileManager.getProfileActivationContext();
boolean suppressActivatorFailure = profileActivationContext.isCustomActivatorFailureSuppressed();
-
+ */
ModelLineage lineage;
try
{
@@ -430,7 +432,7 @@
// not for POMs from the repository...otherwise, we would need to be more careful with
// the last parameter here and determine whether it's appropriate for the POM to have
// an accompanying profiles.xml file.
- profileActivationContext.setCustomActivatorFailureSuppressed( true );
+ // profileActivationContext.setCustomActivatorFailureSuppressed( true );
lineage = modelLineageBuilder.buildModelLineage( pom, config, originalRemoteRepositories, false, true );
}
@@ -441,7 +443,7 @@
}
finally
{
- profileActivationContext.setCustomActivatorFailureSuppressed( suppressActivatorFailure );
+ // profileActivationContext.setCustomActivatorFailureSuppressed( suppressActivatorFailure );
}
return lineage;
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java Wed Sep 17 19:53:35 2008
@@ -29,9 +29,11 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+/*
import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.build.ProfileAdvisor;
+*/
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ModelAndFile;
@@ -67,7 +69,7 @@
private MavenTools mavenTools;
- private ProfileAdvisor profileAdvisor;
+ // private ProfileAdvisor profileAdvisor;
private ProjectWorkspace projectWorkspace;
@@ -84,9 +86,6 @@
this.artifactFactory = artifactFactory;
}
- /**
- * @see ModelLineageBuilder#buildModelLineage(java.io.File, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List)
- */
public ModelLineage buildModelLineage( File pom,
ProjectBuilderConfiguration config,
List remoteRepositories,
@@ -183,7 +182,6 @@
* Update the remote repository set used to resolve parent POMs, by adding those declared in
* the given model to the HEAD of a new list, then appending the old remote repositories list.
* The specified pomFile is used for error reporting.
- * @param profileManager
*/
private List updateRepositorySet( Model model,
List oldArtifactRepositories,
@@ -236,6 +234,7 @@
// getLogger().debug( "Grabbing profile-injected repositories for: " + model.getId() );
// FIXME: Find a way to pass in this context, so it's never null!
+ /*
ProfileActivationContext context;
if ( config.getGlobalProfileManager() != null )
@@ -246,7 +245,7 @@
{
context = new DefaultProfileActivationContext( config.getExecutionProperties(), false );
}
-
+ /*
LinkedHashSet profileRepos = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model,
pomFile,
config.getGlobalProfileManager() );
@@ -266,14 +265,12 @@
{
repositories.addAll( profileRepos );
}
+ */
}
/**
* Pull the parent specification out of the given model, construct an Artifact instance, and
* resolve that artifact...then, return the resolved POM file for the parent.
- * @param projectBuildCache
- * @param allowStubs
- * @param childIsReactorProject
*/
private ModelAndFile resolveParentPom( ModelAndFile child,
List remoteRepositories,
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/main/resources/META-INF/plexus/components.xml Wed Sep 17 19:53:35 2008
@@ -209,10 +209,12 @@
<requirement>
<role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
+ <!--
<requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
+ -->
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java Wed Sep 17 19:53:35 2008
@@ -28,10 +28,12 @@
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+/*
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationContext;
+*/
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.errors.ProjectErrorReporter;
@@ -393,7 +395,7 @@
assertEquals( current.getId(), ( (Model) modelIterator.next() ).getId() );
assertEquals( parent.getId(), ( (Model) modelIterator.next() ).getId() );
}
-
+ /*
public void testReadPOMWithParentInRepoBroughtInViaExternalProfile()
throws Exception
{
@@ -466,7 +468,7 @@
assertEquals( current.getId(), ( (Model) modelIterator.next() ).getId() );
assertEquals( parent.getId(), ( (Model) modelIterator.next() ).getId() );
}
-
+ */
private File createTempDir( String basename )
throws IOException
{
Modified: maven/components/branches/sisbell-maven-3.0-profile/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-profile/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=696547&r1=696546&r2=696547&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-profile/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/branches/sisbell-maven-3.0-profile/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Sep 17 19:53:35 2008
@@ -37,10 +37,12 @@
import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
import org.apache.maven.monitor.event.PerCallWorkspaceMonitor;
import org.apache.maven.plugin.Mojo;
+/*
import org.apache.maven.profiles.DefaultProfileManager;
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;
@@ -245,7 +247,7 @@
private void processSettings( MavenExecutionRequest request,
Configuration configuration )
- {
+ { /*
ProfileManager profileManager = request.getProfileManager();
Settings settings = request.getSettings();
@@ -309,6 +311,7 @@
}
}
}
+ */
}
// ------------------------------------------------------------------------
@@ -738,7 +741,7 @@
//
//
// ------------------------------------------------------------------------
-
+ /*
ProfileActivationContext activationContext = request.getProfileActivationContext();
if ( activationContext == null )
{
@@ -753,6 +756,7 @@
request.setProfileManager( globalProfileManager );
request.setProfileActivationContext( activationContext );
+ */
}
// ----------------------------------------------------------------------------