diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 7ede448ba0..024fa9bfa6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -173,7 +173,6 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenIT0131SiteLifecycleTest.class ); suite.addTestSuite( MavenIT0130CleanLifecycleTest.class ); suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.class ); - suite.addTestSuite( MavenIT0118AttachedArtifactsInReactorTest.class ); suite.addTestSuite( MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class ); suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.class ); suite.addTestSuite( MavenIT0110PluginDependenciesComeFromPluginReposTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0118AttachedArtifactsInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0118AttachedArtifactsInReactorTest.java deleted file mode 100644 index e408d9c7e2..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0118AttachedArtifactsInReactorTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.apache.maven.it; - -/* - * 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.util.List; -import java.util.ArrayList; - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -public class MavenIT0118AttachedArtifactsInReactorTest - extends AbstractMavenIntegrationTestCase -{ - public void testit0118() - throws Exception - { - File testDir = - ResourceExtractor.simpleExtractResources( getClass(), "/it0118-attachedartifactinreactor" ); - - Verifier verifier; - - // Install the parent POM - verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.it0118", "parent", "1.0", "pom" ); - verifier.deleteArtifact( "org.apache.maven.its.it0118", "one", "1.0", "jar" ); - verifier.deleteArtifact( "org.apache.maven.its.it0118", "two", "1.0", "pom" ); - List cliOptions = new ArrayList(); - verifier.executeGoal( "package" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } -} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java index 272f27af92..761e839e27 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java @@ -26,7 +26,9 @@ import java.io.File; import java.util.Collection; /** - * This is a test set for MNG-2921. + * This is a test set for MNG-2921. It naturally includes the + * test for the related issue MNG-2877 whose original test was + * too weak to prevent this issue. * * @author Benjamin Bentmann * @version $Id$ @@ -45,7 +47,8 @@ public class MavenITmng2921ActiveAttachedArtifactsTest * consumption on other module's class paths. Note the subtle difference of this test compared to the closely * related issue MNG-2871: This test is about *attached* artifacts, i.e. dependencies that have already been * packaged. MNG-2871 on the other hand is about dependencies that haven't been packaged yet but merely exist - * as loose class files in a module's output directory. + * as loose class files in a module's output directory. In other words, this test is concerned with the situation + * during the lifecycle phase "package" while MNG-2871 is concerned with earlier phases like "test". */ public void testitMNG2921() throws Exception diff --git a/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml b/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml deleted file mode 100644 index 981a883fa4..0000000000 --- a/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.it0118 - one - 1.0 - - - - maven-assembly-plugin - - - package - - single - - - - src - - - - - - - - diff --git a/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/pom.xml b/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/pom.xml deleted file mode 100644 index 8167b2dc1c..0000000000 --- a/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.it0118 - parent - 1.0 - pom - - one - two - - diff --git a/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml b/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml deleted file mode 100644 index a9d17d33c3..0000000000 --- a/its/core-it-suite/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.it0118 - two - 1.0 - pom - - - org.apache.maven.its.it0118 - one - 1.0 - src - zip - - - - - - maven-dependency-plugin - 2.0-alpha-4 - - - unpack - generate-sources - - unpack-dependencies - - - ${project.build.directory}/extracted - zip - - - - - - -