From 05986fc6f2507d606138c68de6ac3a89974a743d Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 22 Apr 2007 19:58:09 +0000 Subject: [PATCH] o remove maven-artifact-test, not used anywhere o fix shade plugin so the new uber is produced o allow plexus-utils back into the mix o take out the dep.xml assembly descriptor as shade is making the uber jar now git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531259 13f79535-47bb-0310-9956-ffa450edef68 --- maven-artifact-test/pom.xml | 59 --------------- .../maven/artifact/test/ArtifactTestCase.java | 72 ------------------- .../maven/DefaultArtifactFilterManager.java | 2 - maven-embedder/src/main/assembly/bin.xml | 2 +- maven-embedder/src/main/assembly/dep.xml | 48 ------------- maven-project/pom.xml | 6 -- pom.xml | 1 - 7 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 maven-artifact-test/pom.xml delete mode 100644 maven-artifact-test/src/main/java/org/apache/maven/artifact/test/ArtifactTestCase.java delete mode 100644 maven-embedder/src/main/assembly/dep.xml diff --git a/maven-artifact-test/pom.xml b/maven-artifact-test/pom.xml deleted file mode 100644 index 22e025338d..0000000000 --- a/maven-artifact-test/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - maven - org.apache.maven - 2.1-SNAPSHOT - - 4.0.0 - maven-artifact-test - Maven Artifact Test Helper Library - - - junit - junit - 3.8.1 - compile - - - org.apache.maven - maven-settings - 2.1-SNAPSHOT - - - org.apache.maven - maven-artifact-manager - 2.1-SNAPSHOT - - - org.apache.maven - maven-artifact - 2.1-SNAPSHOT - - - org.codehaus.plexus - plexus-container-default - - - diff --git a/maven-artifact-test/src/main/java/org/apache/maven/artifact/test/ArtifactTestCase.java b/maven-artifact-test/src/main/java/org/apache/maven/artifact/test/ArtifactTestCase.java deleted file mode 100644 index e687949d46..0000000000 --- a/maven-artifact-test/src/main/java/org/apache/maven/artifact/test/ArtifactTestCase.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.apache.maven.artifact.test; - -/* - * 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 org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; -import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.settings.Settings; -import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader; -import org.codehaus.plexus.PlexusTestCase; - -import java.io.File; -import java.io.FileReader; - -/** - * Test case that builds standard artifact stuff like repositories. - * - * @author Brett Porter - * @version $Id$ - */ -public abstract class ArtifactTestCase - extends PlexusTestCase -{ - private ArtifactRepository localRepository; - - protected File getLocalArtifactPath( Artifact artifact ) - { - return new File( localRepository.getBasedir(), localRepository.pathOf( artifact ) ); - } - - protected void setUp() - throws Exception - { - super.setUp(); - - File settingsFile = new File( System.getProperty( "user.home" ), ".m2/settings.xml" ); - String localRepo = null; - if ( settingsFile.exists() ) - { - Settings settings = new SettingsXpp3Reader().read( new FileReader( settingsFile ) ); - localRepo = settings.getLocalRepository(); - } - if ( localRepo == null ) - { - localRepo = System.getProperty( "user.home" ) + "/.m2/repository"; - } - - ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) container.lookup( - ArtifactRepositoryLayout.ROLE, "default" ); - - localRepository = new DefaultArtifactRepository( "local", "file://" + localRepo, repositoryLayout ); - } - -} diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index ff83221dd7..feca608200 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -54,7 +54,6 @@ public class DefaultArtifactFilterManager implements ArtifactFilterManager artifacts.add( "maven-plugin-api" ); artifacts.add( "maven-plugin-descriptor" ); artifacts.add( "maven-plugin-parameter-documenter" ); - artifacts.add( "maven-plugin-registry" ); artifacts.add( "maven-profile" ); artifacts.add( "maven-project" ); artifacts.add( "maven-reporting-api" ); @@ -63,7 +62,6 @@ public class DefaultArtifactFilterManager implements ArtifactFilterManager artifacts.add( "plexus-container-default" ); artifacts.add( "plexus-component-api" ); artifacts.add( "plexus-interactivity-api" ); - artifacts.add( "plexus-utils" ); artifacts.add( "wagon-provider-api" ); artifacts.add( "wagon-file" ); artifacts.add( "wagon-http-lightweight" ); diff --git a/maven-embedder/src/main/assembly/bin.xml b/maven-embedder/src/main/assembly/bin.xml index 4766c0ad52..8db74204ce 100644 --- a/maven-embedder/src/main/assembly/bin.xml +++ b/maven-embedder/src/main/assembly/bin.xml @@ -59,7 +59,7 @@ under the License. target lib - maven-embedder-*ueber.jar + maven-embedder-*uber.jar diff --git a/maven-embedder/src/main/assembly/dep.xml b/maven-embedder/src/main/assembly/dep.xml deleted file mode 100644 index 1be0bbebf7..0000000000 --- a/maven-embedder/src/main/assembly/dep.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - dep - - jar - - false - - - target/classes - / - - - - - / - true - runtime - - junit:junit - commons-lang:commons-lang - commons-logging:commons-logging - commons-cli:commons-cli - - plexus:plexus-container-default - - - - diff --git a/maven-project/pom.xml b/maven-project/pom.xml index 707f4594e4..40cfdd94a3 100644 --- a/maven-project/pom.xml +++ b/maven-project/pom.xml @@ -37,12 +37,6 @@ under the License. maven-build-context 2.1-SNAPSHOT - - org.apache.maven - maven-artifact-test - 2.1-SNAPSHOT - test - org.apache.maven maven-profile diff --git a/pom.xml b/pom.xml index 82bcf35efa..df1ae5a004 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,6 @@ under the License. maven-artifact maven-artifact-manager - maven-artifact-test maven-build-context maven-core maven-error-diagnostics