From aa51fda6a558f4a648e31bea680a13321401595d Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Wed, 19 Oct 2005 18:24:03 +0000
Subject: [PATCH] flip to new assembly plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326628 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-artifact-ant/pom.xml                    |   1 +
 .../resources/META-INF/plexus/components.xml  | 471 ------------------
 2 files changed, 1 insertion(+), 471 deletions(-)

diff --git a/maven-artifact-ant/pom.xml b/maven-artifact-ant/pom.xml
index 32dc174786..0c523ba977 100755
--- a/maven-artifact-ant/pom.xml
+++ b/maven-artifact-ant/pom.xml
@@ -11,6 +11,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>[2.1-SNAPSHOT,)</version>
         <configuration>
           <descriptor>src/main/assembly/dep.xml</descriptor>
         </configuration>
diff --git a/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml b/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
index 074b8fafea..73ca2c3ed1 100644
--- a/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
@@ -1,484 +1,13 @@
 <component-set>
   <components>
-    <component>
-      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-      <role-hint>legacy</role-hint>
-      <implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
-    </component>
-
-    <!--
-     |
-     | ArtifactHandlerManager
-     |
-     -->
-    <component>
-      <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-      <implementation>org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-          <field-name>artifactHandlers</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>ejb</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>ejb</type>
-        <extension>jar</extension>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>jar</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>jar</type>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>maven-plugin</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>maven-plugin</type>
-        <extension>jar</extension>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>pom</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>pom</type>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>java-source</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>java-source</type>
-        <extension>jar</extension>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>war</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>war</type>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>ejb-client</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>ejb-client</type>
-        <extension>jar</extension>
-        <packaging>ejb</packaging>
-        <classifier>client</classifier>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-      <implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-      <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
-      <implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!--
-     |
-     | WagonManager
-     |
-     -->
     <component>
       <role>org.apache.maven.artifact.manager.WagonManager</role>
       <implementation>org.apache.maven.artifact.ant.CustomWagonManager</implementation>
-      <!--
-            <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
-      -->
       <requirements>
         <requirement>
           <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
         </requirement>
       </requirements>
     </component>
-
-    <!--
-     |
-     | Transformations
-     |
-     -->
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-      <role-hint>snapshot</role-hint>
-      <implementation>org.apache.maven.artifact.transform.SnapshotTransformation</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-      <role-hint>release</role-hint>
-      <implementation>org.apache.maven.artifact.transform.ReleaseArtifactTransformation</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-      <role-hint>latest</role-hint>
-      <implementation>org.apache.maven.artifact.transform.LatestArtifactTransformation</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!--
-     |
-     | ArtifactTransformationManager
-     |
-     -->
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-      <implementation>org.apache.maven.artifact.transform.DefaultArtifactTransformationManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-          <field-name>artifactTransformations</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!--
-     |
-     | Resolver
-     |
-     -->
-    <component>
-      <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-      <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!--
-     |
-     | ArtifactInstaller
-     |
-     -->
-    <component>
-      <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
-      <implementation>org.apache.maven.artifact.installer.DefaultArtifactInstaller</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!--
-     |
-     | ArtifactDeployer
-     |
-     -->
-    <component>
-      <role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
-      <implementation>org.apache.maven.artifact.deployer.DefaultArtifactDeployer</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-      <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
-    </component>
-
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
-      <implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
-    </component>
-
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.project.MavenProjectHelper</role>
-      <implementation>org.apache.maven.project.DefaultMavenProjectHelper</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-      <implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-      <implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
-      <implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.project.MavenProjectBuilder</role>
-      <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.validation.ModelValidator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.path.PathTranslator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>always-on</role-hint>
-      <implementation>org.apache.maven.profiles.activation.AlwaysOnProfileActivator</implementation>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>jdk-prefix</role-hint>
-      <implementation>org.apache.maven.profiles.activation.JdkPrefixProfileActivator</implementation>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>system-property</role-hint>
-      <implementation>org.apache.maven.profiles.activation.SystemPropertyProfileActivator</implementation>
-    </component>
-    <!--
-    |
-    |
-    |
-    -->
-    <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>
-
-    <!-- ********************* FIXME *******************************************
-    | I realize this is duplicated but allows the project builder to work by itself
-    -->
-    <component>
-      <role>org.apache.maven.project.path.PathTranslator</role>
-      <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.maven.project.ModelResolver</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.ModelResolver</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-      <role-hint>maven</role-hint>
-      <implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.MavenProjectBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
-      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
-      <configuration>
-        <globalSettingsPath>${maven.home}/conf/settings.xml</globalSettingsPath>
-        <userSettingsPath>${user.home}/.m2/settings.xml</userSettingsPath>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>file</role-hint>
-      <implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>http</role-hint>
-      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
   </components>
 </component-set>