move archiva-dependency-tree-consumer to sandbox

see thread here http://mail-archives.apache.org/mod_mbox/archiva-dev/201105.mbox/%3CBANLkTim_wR6nGMCae=TH1tFhNKGf0c1Zgw@mail.gmail.com%3E

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1127070 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
deleted file mode 100644 (file)
index 8de1a16..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.archiva</groupId>
-    <artifactId>archiva-consumers</artifactId>
-    <version>1.4-SNAPSHOT</version>
-  </parent>
-  <artifactId>archiva-dependency-tree-consumer</artifactId>
-  <name>Archiva Consumers :: Dependency Tree Consumer</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-consumer-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.redback.components</groupId>
-      <artifactId>plexus-spring</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-dependency-tree</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>${wagon.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <maven.home>${maven.home}</maven.home>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
deleted file mode 100644 (file)
index 973e71f..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package org.apache.archiva.consumers.dependencytree;
-
-/*
- * 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.
- */
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.MalformedURLException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.artifact.resolver.ArtifactCollector;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.project.DefaultMavenProjectBuilder;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.shared.dependency.tree.DependencyNode;
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
-import org.apache.maven.shared.dependency.tree.filter.AncestorOrSelfDependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.filter.StateDependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.traversal.BuildingDependencyNodeVisitor;
-import org.apache.maven.shared.dependency.tree.traversal.CollectingDependencyNodeVisitor;
-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
-import org.apache.maven.shared.dependency.tree.traversal.FilteringDependencyNodeVisitor;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-
-/**
- * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- *                   role-hint="dependency-tree-generator" instantiation-strategy="per-lookup"
- */
-public class DependencyTreeGeneratorConsumer
-    extends AbstractMonitoredConsumer
-    implements KnownRepositoryContentConsumer
-{
-    /** @plexus.configuration */
-    private File generatedRepositoryLocation;
-
-    /** @plexus.configuration */
-    private File localRepository;
-
-    /** @plexus.requirement */
-    private DependencyTreeBuilder dependencyTreeBuilder;
-
-    /** @plexus.requirement */
-    private ArtifactFactory artifactFactory;
-
-    /** @plexus.requirement role-hint="maven" */
-    private ArtifactMetadataSource artifactMetadataSource;
-
-    /** @plexus.requirement */
-    private ArtifactCollector artifactCollector;
-
-    /** @plexus.requirement */
-    private MavenProjectBuilder projectBuilder;
-    
-    /** @plexus.requirement */
-    private ArtifactRepositoryFactory artifactRepositoryFactory;
-
-    private String repositoryLocation;
-
-    private final DefaultRepositoryLayout layout = new DefaultRepositoryLayout();
-
-    private ArtifactRepository localArtifactRepository;
-
-    private Field rawProjectCacheField;
-
-    private Field processedProjectCacheField;
-
-    private List<String> includes = Collections.singletonList( "**/*.pom" );
-
-    public String getDescription()
-    {
-        return "Generate dependency tree metadata for tracking changes across algorithms";
-    }
-
-    public String getId()
-    {
-        return "dependency-tree-generator";
-    }
-
-    public boolean isPermanent()
-    {
-        return false;
-    }
-
-    public void setGeneratedRepositoryLocation( File generatedRepositoryLocation )
-    {
-        this.generatedRepositoryLocation = generatedRepositoryLocation;
-    }
-
-    public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
-        throws ConsumerException
-    {
-        repositoryLocation = repository.getLocation();
-
-        if ( generatedRepositoryLocation == null )
-        {
-            generatedRepositoryLocation = new File( repositoryLocation );
-        }
-
-        if ( localRepository == null )
-        {
-            // This is a bit crappy, it would be better to operate entirely within
-            // the base repository, but would need to adjust maven-artifact
-            localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" );
-            try
-            {
-                localArtifactRepository =
-                    artifactRepositoryFactory.createArtifactRepository( "local",
-                                                                        localRepository.toURL().toExternalForm(),
-                                                                        layout, null, null );
-            }
-            catch ( MalformedURLException e )
-            {
-                throw new ConsumerException( e.getMessage(), e );
-            }
-        }
-    }
-
-    public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo )
-        throws ConsumerException
-    {
-        beginScan( repository, whenGathered );    
-    }
-
-    public void completeScan()
-    {
-    }
-
-    public void completeScan( boolean executeOnEntireRepo )
-    {
-        completeScan();
-    }
-
-    public List<String> getExcludes()
-    {
-        return null;
-    }
-
-    public List<String> getIncludes()
-    {
-        return includes;
-    }
-
-    public void processFile( String path )
-        throws ConsumerException
-    {
-        MavenProject project;
-        try
-        {
-            project = projectBuilder.build( new File( repositoryLocation, path ), localArtifactRepository, null, false );
-
-            // manually flush out the cache for memory concerns and more accurate building
-            flushProjectCache( projectBuilder );
-        }
-        catch ( ProjectBuildingException e )
-        {
-            throw new ConsumerException( e.getMessage(), e );
-        }
-
-        DependencyNode rootNode;
-        try
-        {
-            // TODO: do this for different values of new ScopeArtifactFilter( scope )
-            ArtifactFilter artifactFilter = null;
-
-            rootNode =
-                dependencyTreeBuilder.buildDependencyTree( project, localArtifactRepository, artifactFactory,
-                                                           artifactMetadataSource, artifactFilter, artifactCollector );
-        }
-        catch ( DependencyTreeBuilderException e )
-        {
-            throw new ConsumerException( e.getMessage(), e );
-        }
-
-        Document document = DocumentHelper.createDocument();
-        DependencyNodeVisitor visitor = new XmlSerializingDependencyNodeVisitor( document );
-
-        // TODO: remove the need for this when the serializer can calculate last nodes from visitor calls only
-        visitor = new BuildingDependencyNodeVisitor( visitor );
-
-        CollectingDependencyNodeVisitor collectingVisitor = new CollectingDependencyNodeVisitor();
-        DependencyNodeVisitor firstPassVisitor =
-            new FilteringDependencyNodeVisitor( collectingVisitor, StateDependencyNodeFilter.INCLUDED );
-        rootNode.accept( firstPassVisitor );
-
-        DependencyNodeFilter secondPassFilter = new AncestorOrSelfDependencyNodeFilter( collectingVisitor.getNodes() );
-        visitor = new FilteringDependencyNodeVisitor( visitor, secondPassFilter );
-
-        rootNode.accept( visitor );
-
-        FileWriter writer = null;
-        try
-        {
-            Artifact artifact =
-                artifactFactory.createProjectArtifact( project.getGroupId(), project.getArtifactId(),
-                                                       project.getVersion() );
-
-            String p = layout.pathOf( artifact );
-            if ( !p.equals( path ) )
-            {
-                throw new ConsumerException( "Bad path: " + p + "; should be: " + path );
-            }
-
-            File generatedFile = new File( generatedRepositoryLocation, p + ".xml" );
-            generatedFile.getParentFile().mkdirs();
-            writer = new FileWriter( generatedFile );
-            OutputFormat format = OutputFormat.createPrettyPrint();
-            XMLWriter w = new XMLWriter( writer, format );
-            w.write( document );
-        }
-        catch ( IOException e )
-        {
-            throw new ConsumerException( e.getMessage(), e );
-        }
-        finally
-        {
-            IOUtils.closeQuietly( writer );
-        }
-    }
-
-    public void processFile( String path, boolean executeOnEntireRepo )
-        throws ConsumerException
-    {
-        processFile( path );    
-    }
-
-    private void flushProjectCache( MavenProjectBuilder projectBuilder )
-    {
-        try
-        {
-            if ( rawProjectCacheField == null )
-            {
-                rawProjectCacheField = DefaultMavenProjectBuilder.class.getDeclaredField( "rawProjectCache" );
-                rawProjectCacheField.setAccessible( true );
-            }
-
-            if ( processedProjectCacheField == null )
-            {
-                processedProjectCacheField =
-                    DefaultMavenProjectBuilder.class.getDeclaredField( "processedProjectCache" );
-                processedProjectCacheField.setAccessible( true );
-            }
-
-            rawProjectCacheField.set( projectBuilder, new HashMap<Object, Object>() );
-
-            processedProjectCacheField.set( projectBuilder, new HashMap<Object, Object>() );
-        }
-        catch ( Exception e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    private static class XmlSerializingDependencyNodeVisitor
-        implements DependencyNodeVisitor
-    {
-        private Element xmlNode;
-
-        public XmlSerializingDependencyNodeVisitor( Document document )
-        {
-            xmlNode = document.addElement( "tree" );
-        }
-
-        // DependencyNodeVisitor methods ------------------------------------------
-
-        /*
-         * @see org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor#visit(org.apache.maven.shared.dependency.tree.DependencyNode)
-         */
-        public boolean visit( DependencyNode node )
-        {
-            Element dependency = xmlNode.addElement( "dependency" );
-
-            Artifact artifact = node.getArtifact();
-            dependency.addElement( "groupId" ).setText( artifact.getGroupId() );
-            dependency.addElement( "artifactId" ).setText( artifact.getArtifactId() );
-            dependency.addElement( "type" ).setText( artifact.getType() );
-            dependency.addElement( "version" ).setText( artifact.getVersion() );
-            if ( artifact.getScope() != null )
-            {
-                dependency.addElement( "scope" ).setText( artifact.getScope() );
-            }
-            if ( artifact.getClassifier() != null )
-            {
-                dependency.addElement( "classifier" ).setText( artifact.getClassifier() );
-            }
-
-            xmlNode = dependency.addElement( "dependencies" );
-
-            return true;
-        }
-
-        /*
-         * @see org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor#endVisit(org.apache.maven.shared.dependency.tree.DependencyNode)
-         */
-        public boolean endVisit( DependencyNode node )
-        {
-            Element e = xmlNode.getParent();
-
-            if ( !xmlNode.hasContent() )
-            {
-                e.remove( xmlNode );
-            }
-
-            xmlNode = e.getParent();
-
-            return true;
-        }
-    }
-
-    public void setIncludes( List<String> includes )
-    {
-        this.includes = includes;
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
deleted file mode 100644 (file)
index a79ec1d..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.apache.archiva.consumers.dependencytree;
-
-/*
- * 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.
- */
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.codehaus.plexus.spring.PlexusContainerAdapter;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.xml.sax.SAXException;
-
-public class DependencyTreeGeneratorConsumerTest
-    extends PlexusInSpringTestCase
-{
-    private DependencyTreeGeneratorConsumer consumer;
-
-    private ManagedRepositoryConfiguration repository;
-
-    private File repositoryLocation;
-
-    private File generatedRepositoryLocation;
-
-    public void setUp()
-        throws Exception
-    {
-        super.setUp();
-
-        consumer =
-            (DependencyTreeGeneratorConsumer) lookup( KnownRepositoryContentConsumer.class, "dependency-tree-generator" );
-
-        repositoryLocation = getTestFile( "target/test-" + getName() + "/test-repo" );
-        FileUtils.deleteDirectory( repositoryLocation );
-        FileUtils.copyDirectory( getTestFile( "target/test-classes/test-repo" ), repositoryLocation );
-
-        generatedRepositoryLocation = getTestFile( "target/test-" + getName() + "/generated-test-repo" );
-        FileUtils.deleteDirectory( generatedRepositoryLocation );
-
-        consumer.setGeneratedRepositoryLocation( generatedRepositoryLocation );
-
-        repository = new ManagedRepositoryConfiguration();
-        repository.setId( "dependency-tree" );
-        repository.setLocation( repositoryLocation.getAbsolutePath() );
-    }
-
-    public void testGenerateBasicTree()
-        throws IOException, ConsumerException, ParserConfigurationException, SAXException
-    {
-        consumer.beginScan( repository, null );
-
-        String path = "org/apache/maven/maven-core/2.0/maven-core-2.0.pom";
-        consumer.processFile( path );
-
-        File generatedFile = new File( generatedRepositoryLocation, path + ".xml" );
-        XMLAssert.assertXMLEqual( IOUtils.toString( getClass().getResourceAsStream( "/test-data/maven-core-2.0-tree.xml" ) ),
-                      FileUtils.readFileToString( generatedFile ) );
-
-        consumer.completeScan();
-    }
-
-    public void testInvalidCoordinate()
-        throws IOException, ConsumerException
-    {
-        consumer.beginScan( repository, null );
-
-        String path = "openejb/jaxb-xjc/2.0EA3/jaxb-xjc-2.0EA3.pom";
-        try
-        {
-            consumer.processFile( path );
-
-            fail( "Should not have successfully processed the file" );
-        }
-        catch ( ConsumerException e )
-        {
-            File generatedFile = new File( generatedRepositoryLocation, path + ".xml" );
-            assertFalse( generatedFile.exists() );
-        }
-
-        consumer.completeScan();
-    }
-
-    public void testProfiles()
-        throws IOException, ConsumerException, ParserConfigurationException, SAXException
-    {
-        PlexusContainerAdapter container = new PlexusContainerAdapter();
-        container.setApplicationContext( getApplicationContext() );
-        
-        consumer.beginScan( repository, null );
-
-        String path = "org/apache/maven/surefire/surefire-testng/2.0/surefire-testng-2.0.pom";
-        consumer.processFile( path );
-
-        File generatedFile = new File( generatedRepositoryLocation, path + ".xml" );
-        XMLAssert.assertXMLEqual( IOUtils.toString( getClass().getResourceAsStream( "/test-data/surefire-testng-2.0-tree.xml" ) ),
-                      FileUtils.readFileToString( generatedFile ) );
-
-        consumer.completeScan();
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-data/maven-core-2.0-tree.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-data/maven-core-2.0-tree.xml
deleted file mode 100644 (file)
index 3c55b90..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-data/maven-core-2.0-tree.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<tree>
-  <dependency>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-core</artifactId>
-    <type>jar</type>
-    <version>2.0</version>
-    <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-        <version>3.8.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-settings</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-file</artifactId>
-        <type>jar</type>
-        <version>1.0-alpha-5</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-parameter-documenter</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
-        <type>jar</type>
-        <version>1.0-alpha-5</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.reporting</groupId>
-        <artifactId>maven-reporting-api</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-        <dependencies>
-          <dependency>
-            <groupId>doxia</groupId>
-            <artifactId>doxia-sink-api</artifactId>
-            <type>jar</type>
-            <version>1.0-alpha-4</version>
-            <scope>compile</scope>
-          </dependency>
-        </dependencies>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-profile</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-model</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-provider-api</artifactId>
-        <type>jar</type>
-        <version>1.0-alpha-5</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
-        <type>jar</type>
-        <version>1.0-alpha-8</version>
-        <scope>compile</scope>
-        <dependencies>
-          <dependency>
-            <groupId>classworlds</groupId>
-            <artifactId>classworlds</artifactId>
-            <type>jar</type>
-            <version>1.1-alpha-2</version>
-            <scope>compile</scope>
-          </dependency>
-        </dependencies>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-repository-metadata</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-error-diagnostics</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-project</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-registry</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <type>jar</type>
-        <version>1.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-descriptor</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-interactivity-api</artifactId>
-        <type>jar</type>
-        <version>1.0-alpha-4</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact-manager</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-monitor</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh</artifactId>
-        <type>jar</type>
-        <version>1.0-alpha-5</version>
-        <scope>runtime</scope>
-        <dependencies>
-          <dependency>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jsch</artifactId>
-            <type>jar</type>
-            <version>0.1.23</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
-        <type>jar</type>
-        <version>1.0.4</version>
-        <scope>compile</scope>
-      </dependency>
-    </dependencies>
-  </dependency>
-</tree>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-data/surefire-testng-2.0-tree.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-data/surefire-testng-2.0-tree.xml
deleted file mode 100644 (file)
index 287c459..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-data/surefire-testng-2.0-tree.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<tree>
-  <dependency>
-    <groupId>org.apache.maven.surefire</groupId>
-    <artifactId>surefire-testng</artifactId>
-    <type>jar</type>
-    <version>2.0</version>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven.surefire</groupId>
-        <artifactId>surefire-api</artifactId>
-        <type>jar</type>
-        <version>2.0</version>
-        <scope>compile</scope>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <type>jar</type>
-            <version>1.1</version>
-            <scope>compile</scope>
-          </dependency>
-        </dependencies>
-      </dependency>
-      <dependency>
-        <groupId>org.testng</groupId>
-        <artifactId>testng</artifactId>
-        <type>jar</type>
-        <version>4.7</version>
-        <scope>compile</scope>
-        <classifier>jdk15</classifier>
-        <dependencies>
-          <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <type>jar</type>
-            <version>3.8.1</version>
-            <scope>runtime</scope>
-          </dependency>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <type>jar</type>
-            <version>1.5</version>
-            <scope>runtime</scope>
-          </dependency>
-          <dependency>
-            <groupId>bsh</groupId>
-            <artifactId>bsh</artifactId>
-            <type>jar</type>
-            <version>2.0b1</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-      </dependency>
-    </dependencies>
-  </dependency>
-</tree>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/openejb/jaxb-xjc/2.0EA3/jaxb-xjc-2.0EA3.pom b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/openejb/jaxb-xjc/2.0EA3/jaxb-xjc-2.0EA3.pom
deleted file mode 100644 (file)
index d56af58..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/openejb/jaxb-xjc/2.0EA3/jaxb-xjc-2.0EA3.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>openejb</groupId>
-  <artifactId>jaxb-api</artifactId>
-  <version>2.0EA3</version>
-</project>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/org/apache/maven/maven-core/2.0/maven-core-2.0.pom b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/org/apache/maven/maven-core/2.0/maven-core-2.0.pom
deleted file mode 100644 (file)
index a6e158d..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/org/apache/maven/maven-core/2.0/maven-core-2.0.pom
+++ /dev/null
@@ -1,186 +0,0 @@
-<project>
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven-core</artifactId>
-  <name>Maven</name>
-  <version>2.0</version>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.0-beta-1</version>
-        <configuration>
-          <descriptor>src/assemble/bin.xml</descriptor>
-          <finalName>maven-${version}</finalName>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-parameter-documenter</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-profile</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-repository-metadata</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-error-diagnostics</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-registry</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.0</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-descriptor</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-      <version>1.0-alpha-4</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>plexus-utils</artifactId>
-          <groupId>plexus</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>plexus-container-default</artifactId>
-          <groupId>org.codehaus.plexus</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh</artifactId>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>plexus-utils</artifactId>
-          <groupId>plexus</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>plexus-container-default</artifactId>
-          <groupId>org.codehaus.plexus</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clover-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>scp://minotaur.apache.org//www/maven.apache.org/m2</url>
-    </site>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/org/apache/maven/surefire/surefire-testng/2.0/surefire-testng-2.0.pom b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/org/apache/maven/surefire/surefire-testng/2.0/surefire-testng-2.0.pom
deleted file mode 100644 (file)
index d8de3ad..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/resources/test-repo/org/apache/maven/surefire/surefire-testng/2.0/surefire-testng-2.0.pom
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>surefire-providers</artifactId>
-    <groupId>org.apache.maven.surefire</groupId>
-    <version>2.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>surefire-testng</artifactId>
-  <name>SureFire TestNG Runner</name>
-  <version>2.0</version>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <fork>false</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>jdk14</id>
-      <activation>
-        <jdk>1.4</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.testng</groupId>
-          <artifactId>testng</artifactId>
-          <version>4.7</version>
-          <classifier>jdk14</classifier>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>jdk15</id>
-      <activation>
-        <jdk>!1.4</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.testng</groupId>
-          <artifactId>testng</artifactId>
-          <version>4.7</version>
-          <classifier>jdk15</classifier>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>jdk1.3</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <fork>false</fork>
-              <compilerVersion>1.4</compilerVersion>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <forkMode>once</forkMode>
-              <jvm>${JAVA_1_3_HOME}/bin/java</jvm>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file