svn commit: r531706 - in /maven/components/trunk: ./ maven-core/ maven-core/src/main/java/org/apache/maven/ maven-embedder/src/main/java/org/apache/maven/embedder/execution/ maven-lifecycle/

[jvanzyl]

Author: jvanzyl
Date: Mon Apr 23 19:58:53 2007
New Revision: 531706

URL: http://svn.apache.org/viewvc?view=rev&rev=531706
Log: (empty)

Modified:
    maven/components/trunk/build.properties
    maven/components/trunk/build.xml
    maven/components/trunk/maven-core/pom.xml
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
    maven/components/trunk/maven-lifecycle/pom.xml
    maven/components/trunk/pom.xml

Modified: maven/components/trunk/build.properties
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Mon Apr 23 19:58:53 2007
@@ -17,8 +17,7 @@
 
 classworlds.version=1.2-alpha-7
 plexus-active-collections.version=1.0-beta-1
-plexus.version=1.0-alpha-22
-plexus-archiver.version=1.0-alpha-8
+plexus.version=1.0-alpha-23
 plexus-utils.version=1.4.1
 plexus-interactivity-api.version=1.0-alpha-6-SNAPSHOT
 commons-cli.version=1.0

Modified: maven/components/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Mon Apr 23 19:58:53 2007
@@ -119,12 +119,8 @@
     <pull orgpath="org/codehaus/plexus/plexus-active-collections" 
version="${plexus-active-collections.version}" name="plexus-active-collections" 
repository="codehaus"/>
     <pull orgpath="org/codehaus/plexus/plexus-utils" 
version="${plexus-utils.version}" name="plexus-utils" repository="codehaus"/>
     <pull orgpath="org/codehaus/plexus/plexus-container-default" 
version="${plexus.version}" name="plexus-container-default" 
repository="codehaus"/>
-    <pull orgpath="org/codehaus/plexus/plexus-component-api" 
version="${plexus.version}" name="plexus-component-api" repository="codehaus"/>
     <pull orgpath="org/codehaus/plexus/plexus-classworlds" 
version="${classworlds.version}" name="plexus-classworlds" 
repository="codehaus"/>
     <pull orgpath="org/codehaus/plexus/plexus-interactivity-api" 
version="${plexus-interactivity-api.version}" name="plexus-interactivity-api" 
repository="codehaus"/>
-    <!--
-    <pull orgpath="org/codehaus/plexus/plexus-archiver" 
version="${plexus-archiver.version}" name="plexus-archiver" 
repository="codehaus"/>
-    -->
     <pull orgpath="org/apache/maven/maven-parent" version="4" 
name="maven-parent" type="pom"/>
     <pull orgpath="org/apache/maven/plugins/maven-plugins" 
version="4-SNAPSHOT" name="maven-plugins" type="pom"/>
     <pull orgpath="org/apache/apache" version="3" name="apache" type="pom"/>

Modified: maven/components/trunk/maven-core/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Mon Apr 23 19:58:53 2007
@@ -72,10 +72,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
     <dependency>

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
 Mon Apr 23 19:58:53 2007
@@ -60,7 +60,6 @@
         artifacts.add( "maven-repository-metadata" );
         artifacts.add( "maven-settings" );
         artifacts.add( "plexus-container-default" );
-        artifacts.add( "plexus-component-api" );
         artifacts.add( "plexus-interactivity-api" );
         artifacts.add( "wagon-provider-api" );
         artifacts.add( "wagon-file" );

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
 Mon Apr 23 19:58:53 2007
@@ -189,7 +189,6 @@
             }
 
             RepositoryPermissions defaultPermissions = new 
RepositoryPermissions();
-
             
             defaultPermissions.setDirectoryMode( "775" );
 

Modified: maven/components/trunk/maven-lifecycle/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- maven/components/trunk/maven-lifecycle/pom.xml (original)
+++ maven/components/trunk/maven-lifecycle/pom.xml Mon Apr 23 19:58:53 2007
@@ -11,11 +11,6 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
       <scope>test</scope>
     </dependency>

Modified: maven/components/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=531706&r1=531705&r2=531706
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Apr 23 19:58:53 2007
@@ -107,12 +107,10 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <!--
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.2</version>
       </plugin>
-      -->
     </plugins>
   </build>
   <modules>
@@ -134,7 +132,7 @@
     <module>maven-embedder</module>
   </modules>
   <properties>
-    <plexusVersion>1.0-alpha-22</plexusVersion>
+    <plexusVersion>1.0-alpha-23</plexusVersion>
     <wagonVersion>1.0-beta-2</wagonVersion>
   </properties>
   <dependencies>
@@ -150,11 +148,6 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
-        <version>${plexusVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
         <version>${plexusVersion}</version>
       </dependency>
       <dependency>