Author: jvanzyl
Date: Fri Sep 12 12:11:12 2008
New Revision: 694777
URL: http://svn.apache.org/viewvc?rev=694777&view=rev
Log:
o removing workspace, as caching to support m2e is not working properly and we
need something to cache projects properly so that and build, project meta
retrieval are all synchronized. I don't see me merging this soon as no caching
will destroy IDE integration, but I'll clean first.
Removed:
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/workspace/
maven/components/branches/jvz/maven-workspace/
Modified:
maven/components/branches/jvz/maven-core/pom.xml
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/branches/jvz/maven-project/pom.xml
maven/components/branches/jvz/pom.xml
Modified: maven/components/branches/jvz/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/pom.xml?rev=694777&r1=694776&r2=694777&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-core/pom.xml (original)
+++ maven/components/branches/jvz/maven-core/pom.xml Fri Sep 12 12:11:12 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/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=694777&r1=694776&r2=694777&view=diff
==============================================================================
---
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Fri Sep 12 12:11:12 2008
@@ -74,7 +74,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;
Modified:
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=694777&r1=694776&r2=694777&view=diff
==============================================================================
---
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/branches/jvz/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Fri Sep 12 12:11:12 2008
@@ -48,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;
Modified: maven/components/branches/jvz/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/pom.xml?rev=694777&r1=694776&r2=694777&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/pom.xml (original)
+++ maven/components/branches/jvz/maven-project/pom.xml Fri Sep 12 12:11:12 2008
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-workspace</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-profile</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/jvz/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/pom.xml?rev=694777&r1=694776&r2=694777&view=diff
==============================================================================
--- maven/components/branches/jvz/pom.xml (original)
+++ maven/components/branches/jvz/pom.xml Fri Sep 12 12:11:12 2008
@@ -266,7 +266,7 @@
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-alpha-50-SNAPSHOT</plexusVersion>
+ <plexusVersion>1.0-alpha-48</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusUtilsVersion>1.5.5</plexusUtilsVersion>
@@ -291,11 +291,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>
