You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/09/28 14:16:54 UTC
svn commit: r699806 - in /maven/components/trunk: ./ maven-compat/
maven-core/ maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/extension/lineage/
maven-core/src/main/java/org/apache/maven/monitor/event/ ma...
Author: jvanzyl
Date: Sun Sep 28 05:16:53 2008
New Revision: 699806
URL: http://svn.apache.org/viewvc?rev=699806&view=rev
Log:
o merging from my branch to trunk
Added:
maven/components/trunk/maven-compat/ (props changed)
- copied from r699795, maven/components/branches/jvz/maven-compat/
maven/components/trunk/maven-project/pom.xml
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/AbstractWorkspaceMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/MavenWorkspaceMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/PerCallWorkspaceMonitor.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderImportProjectTest.java
maven/components/trunk/maven-embedder/src/test/projects/complex-project/
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/
maven/components/trunk/maven-workspace/
Modified:
maven/components/trunk/ (props changed)
maven/components/trunk/build.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
maven/components/trunk/pom.xml
Propchange: maven/components/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 28 05:16:53 2008
@@ -1,2 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:680477
/maven/components/branches/maven-2.0.x:679206
+/maven/components/trunk:688587-696625,696644-699681
Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Sun Sep 28 05:16:53 2008
@@ -155,6 +155,7 @@
<target name="maven-compile" depends="compile-boot" description="compiles Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true">
<classpath refid="maven.classpath"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>
Propchange: maven/components/trunk/maven-compat/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Sep 28 05:16:53 2008
@@ -0,0 +1,3 @@
+/maven/components/branches/maven-2.0.10-RC/maven-compat:680477
+/maven/components/branches/maven-2.0.x/maven-compat:679206
+/maven/components/trunk/maven-compat:688587-696625,696644-699681
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Sep 28 05:16:53 2008
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-workspace</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-lifecycle</artifactId>
</dependency>
<dependency>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Sun Sep 28 05:16:53 2008
@@ -22,7 +22,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
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.project.DefaultProjectBuilderConfiguration;
@@ -102,8 +101,6 @@
private List eventMonitors;
- private MavenWorkspaceMonitor workspaceMonitor;
-
private List activeProfiles;
private List inactiveProfiles;
@@ -712,17 +709,6 @@
return this;
}
- public MavenWorkspaceMonitor getWorkspaceMonitor()
- {
- return workspaceMonitor;
- }
-
- public MavenExecutionRequest setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor )
- {
- this.workspaceMonitor = workspaceMonitor;
- return this;
- }
-
public Properties getUserProperties()
{
return userProperties;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Sun Sep 28 05:16:53 2008
@@ -23,7 +23,6 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
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.project.ProjectBuilderConfiguration;
@@ -222,8 +221,5 @@
MavenExecutionRequest setErrorReporter( CoreErrorReporter reporter );
CoreErrorReporter getErrorReporter();
- MavenExecutionRequest setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor );
- MavenWorkspaceMonitor getWorkspaceMonitor();
-
ProjectBuilderConfiguration getProjectBuildingConfiguration();
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java Sun Sep 28 05:16:53 2008
@@ -35,7 +35,6 @@
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ModelAndFile;
-import org.apache.maven.project.workspace.ProjectWorkspace;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -69,8 +68,6 @@
private ProfileAdvisor profileAdvisor;
- private ProjectWorkspace projectWorkspace;
-
private Logger logger;
public DefaultModelLineageBuilder()
@@ -99,12 +96,7 @@
List currentRemoteRepositories = remoteRepositories == null ? new ArrayList()
: new ArrayList( remoteRepositories );
- ModelAndFile current = projectWorkspace.getModelAndFile( pom );
- if ( current == null )
- {
- current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
- projectWorkspace.storeModelAndFile( current );
- }
+ ModelAndFile current = current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
do
{
@@ -311,32 +303,8 @@
{
parentPomFile = new File( parentPomFile, "pom.xml" );
}
-
-// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using file: " + parentPomFile );
-
- result = projectWorkspace.getModelAndFile( parentPomFile );
- if ( result != null && !parentModelMatches( modelParent, result.getModel() ) )
- {
- parentPomFile = null;
- result = null;
- }
}
- if ( result == null )
- {
-// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using project groupId:artifactId:version." );
-
- result = projectWorkspace.getModelAndFile( modelParent.getGroupId(), modelParent.getArtifactId(), modelParent.getVersion() );
- }
-
- if ( result != null )
- {
-// getLogger().debug( "Returning cached instance." );
- return result;
- }
-
-// getLogger().debug( "Allowing parent-model resolution to proceed for: " + key + " (child is: " + model.getId() + ")" );
-
if ( parentPomFile != null )
{
if ( parentPomFile.exists() )
@@ -421,12 +389,6 @@
}
}
- if ( result != null )
- {
-// getLogger().debug( "Caching parent model-and-file: " + result );
- projectWorkspace.storeModelAndFile( result );
- }
-
return result;
}
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Sun Sep 28 05:16:53 2008
@@ -207,9 +207,6 @@
<implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
<requirements>
<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>
Modified: maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/components.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/components.xml Sun Sep 28 05:16:53 2008
@@ -70,6 +70,7 @@
<lifecycle>
<id>default</id>
<!-- START SNIPPET: pom-lifecycle -->
+
<phases>
<package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
Modified: maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml (original)
+++ maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml Sun Sep 28 05:16:53 2008
@@ -27,9 +27,6 @@
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java Sun Sep 28 05:16:53 2008
@@ -20,7 +20,6 @@
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
import org.apache.maven.realm.MavenRealmManager;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
@@ -152,8 +151,4 @@
Configuration setEventMonitors( List eventMonitors );
List getEventMonitors();
-
- Configuration setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor );
-
- MavenWorkspaceMonitor getWorkspaceMonitor();
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java Sun Sep 28 05:16:53 2008
@@ -20,7 +20,6 @@
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
import org.apache.maven.realm.MavenRealmManager;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
@@ -69,8 +68,6 @@
/** List<EventMonitor>. */
private List eventMonitors;
- private MavenWorkspaceMonitor workspaceMonitor;
-
/** Creates a new instance of DefaultConfiguration */
public DefaultConfiguration()
{
@@ -276,15 +273,4 @@
this.eventMonitors = eventMonitors;
return this;
}
-
- public MavenWorkspaceMonitor getWorkspaceMonitor()
- {
- return workspaceMonitor;
- }
-
- public Configuration setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor )
- {
- this.workspaceMonitor = workspaceMonitor;
- return this;
- }
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sun Sep 28 05:16:53 2008
@@ -69,7 +69,6 @@
import org.apache.maven.settings.validation.DefaultSettingsValidator;
import org.apache.maven.settings.validation.SettingsValidationResult;
import org.apache.maven.settings.validation.SettingsValidator;
-import org.apache.maven.workspace.MavenWorkspaceStore;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
@@ -162,9 +161,6 @@
private BuildPlanner buildPlanner;
- // TODO: Remove this once we have better control over cache-cleaning.
- private MavenWorkspaceStore workspaceStore;
-
// ----------------------------------------------------------------------
// Configuration
// ----------------------------------------------------------------------
@@ -198,11 +194,6 @@
return request;
}
- protected MavenWorkspaceStore getWorkspaceStore()
- {
- return workspaceStore;
- }
-
// ----------------------------------------------------------------------
// Accessors
// ----------------------------------------------------------------------
@@ -705,8 +696,6 @@
buildPlanner = (BuildPlanner) container.lookup( BuildPlanner.class );
- workspaceStore = (MavenWorkspaceStore) container.lookup( MavenWorkspaceStore.class );
-
artifactHandlerManager = (ArtifactHandlerManager) container.lookup( ArtifactHandlerManager.ROLE );
// This is temporary as we can probably cache a single request and use it for default values and
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Sun Sep 28 05:16:53 2008
@@ -34,8 +34,6 @@
import org.apache.maven.model.Repository;
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.monitor.event.EventMonitor;
-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;
@@ -50,7 +48,6 @@
import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.settings.SettingsUtils;
import org.apache.maven.wagon.repository.RepositoryPermissions;
-import org.apache.maven.workspace.MavenWorkspaceStore;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
@@ -96,8 +93,6 @@
private WagonManager wagonManager;
- private MavenWorkspaceStore workspaceManager;
-
private MavenSettingsBuilder settingsBuilder;
public MavenExecutionRequest populateDefaults( MavenExecutionRequest request,
@@ -106,8 +101,6 @@
{
eventing( request, configuration );
- workspaceMonitor( request, configuration );
-
reporter( request, configuration );
executionProperties( request, configuration );
@@ -136,44 +129,6 @@
return request;
}
- private void workspaceMonitor( MavenExecutionRequest request,
- Configuration configuration )
- {
- MavenWorkspaceMonitor workspaceMonitor = request.getWorkspaceMonitor();
-
- if ( workspaceMonitor == null )
- {
- workspaceMonitor = configuration.getWorkspaceMonitor();
- }
-
- List requestEventMonitors = request.getEventMonitors();
- if ( ( requestEventMonitors != null ) && !requestEventMonitors.isEmpty() )
- {
- for ( Iterator it = requestEventMonitors.iterator(); it.hasNext(); )
- {
- Object monitor = it.next();
- if ( monitor instanceof MavenWorkspaceMonitor )
- {
- if ( workspaceMonitor == null )
- {
- workspaceMonitor = (MavenWorkspaceMonitor) monitor;
- }
- it.remove();
- break;
- }
- }
- }
-
- if ( workspaceMonitor == null )
- {
- workspaceMonitor = new PerCallWorkspaceMonitor();
- }
-
- workspaceMonitor.setWorkspaceStore( workspaceManager );
-
- request.addEventMonitor( workspaceMonitor );
- }
-
private void reporter( MavenExecutionRequest request,
Configuration configuration )
{
Modified: maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml Sun Sep 28 05:16:53 2008
@@ -24,9 +24,6 @@
<implementation>org.apache.maven.embedder.execution.DefaultMavenExecutionRequestPopulator</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.workspace.MavenWorkspaceStore</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.manager.WagonManager</role>
<role-hint>default</role-hint>
</requirement>
@@ -75,6 +72,5 @@
</httpHeaders>
</configuration>
</component>
-
</components>
</component-set>
Added: maven/components/trunk/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=699806&view=auto
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (added)
+++ maven/components/trunk/maven-project/pom.xml Sun Sep 28 05:16:53 2008
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-project</artifactId>
+ <name>Maven Project Builder</name>
+ <description>This library is used to not only read Maven project object model files, but to assemble inheritence
+ and to retrieve remote models as required.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-model</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+ <version>1.0.0</version>
+ <model>src/main/mdo/profiles.mdo</model>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Sun Sep 28 05:16:53 2008
@@ -48,7 +48,6 @@
import org.apache.maven.project.builder.PomClassicTransformer;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
-import org.apache.maven.project.workspace.ProjectWorkspace;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -92,8 +91,6 @@
private MavenTools mavenTools;
- private ProjectWorkspace projectWorkspace;
-
private ProjectBuilder projectBuilder;
private RepositoryHelper repositoryHelper;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Sun Sep 28 05:16:53 2008
@@ -27,7 +27,6 @@
import org.apache.maven.model.Parent;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilderConfiguration;
-import org.apache.maven.project.RepositoryHelper;
import org.apache.maven.project.builder.ArtifactModelContainerFactory;
import org.apache.maven.project.builder.IdModelContainerFactory;
import org.apache.maven.project.builder.PomArtifactResolver;
@@ -70,8 +69,6 @@
private MavenTools mavenTools;
- private RepositoryHelper repositoryHelper;
-
/**
* Default constructor
*/
Modified: maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml Sun Sep 28 05:16:53 2008
@@ -82,9 +82,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -99,9 +96,6 @@
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
</requirement>
<requirement>
@@ -212,16 +206,6 @@
|
-->
<component>
- <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- <implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
- </component>
-
-<!--
- |
- |
- |
- -->
- <component>
<role>org.apache.maven.project.validation.ModelValidator</role>
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
</component>
@@ -284,17 +268,5 @@
</requirement>
</requirements>
</component>
-
- <component>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.project.workspace.DefaultProjectWorkspace</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.workspace.MavenWorkspaceStore</role>
- </requirement>
- </requirements>
- </component>
-
</components>
</component-set>
Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Sun Sep 28 05:16:53 2008
@@ -107,9 +107,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -124,9 +121,6 @@
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<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>
Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Sun Sep 28 05:16:53 2008
@@ -104,9 +104,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -121,9 +118,6 @@
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<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>
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=699806&r1=699805&r2=699806&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sun Sep 28 05:16:53 2008
@@ -256,9 +256,9 @@
<module>maven-project</module>
<module>maven-reporting-api</module>
<module>maven-embedder</module>
- <module>maven-workspace</module>
<module>maven-shared-model</module>
<module>maven-toolchain</module>
+ <module>maven-compat</module>
</modules>
<properties>
<artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
@@ -293,11 +293,6 @@
<!--start-->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-workspace</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-lifecycle</artifactId>
<version>${project.version}</version>
</dependency>