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 59f3ce4777..4bf3004ca2 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 @@ -282,7 +282,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0053Test.class ); suite.addTestSuite( MavenIT0052Test.class ); suite.addTestSuite( MavenIT0051Test.class ); - suite.addTestSuite( MavenIT0047Test.class ); suite.addTestSuite( MavenIT0041Test.class ); suite.addTestSuite( MavenIT0040Test.class ); suite.addTestSuite( MavenIT0039Test.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java deleted file mode 100644 index 8648c0dc12..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java +++ /dev/null @@ -1,58 +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 org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.apache.maven.it.util.StringUtils; - -import java.io.File; -import java.util.List; -import java.util.Properties; - -public class MavenIT0047Test - extends AbstractMavenIntegrationTestCase -{ - - /** - * Test the use case for having a compile time dependency be transitive: - * when you extend a class you need its dependencies at compile time. - */ - public void testit0047() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0047" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifacts( "org.apache.maven.its.it0047" ); - Properties systemProperties = new Properties(); - systemProperties.put( "depres.compileClassPath", new File( testDir, "target/compile.txt" ).getAbsolutePath() ); - verifier.setSystemProperties( systemProperties ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); - verifier.assertFilePresent( "target/compile.txt" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - List lines = verifier.loadLines( "target/compile.txt", "UTF-8" ); - String paths = StringUtils.join( lines.iterator(), "\t" ).replace( '\\', '/' ); - assertTrue( paths.indexOf( "org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar" ) >= 0 ); - assertTrue( paths.indexOf( "org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar" ) >= 0 ); - } - -} diff --git a/its/core-it-suite/src/test/resources/it0047/pom.xml b/its/core-it-suite/src/test/resources/it0047/pom.xml deleted file mode 100644 index 15fe36d5db..0000000000 --- a/its/core-it-suite/src/test/resources/it0047/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.it0047 - maven-it-it0047 - 1.0 - - Maven Integration Test :: it0047 - - Test the use case for having a compile time dependency be transitive: - when you extend a class you need its dependencies at compile time. - - - - - - org.apache.maven.its.it0047 - direct-dep - 1.0 - - - - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - diff --git a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar b/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar deleted file mode 100644 index 486b10b560..0000000000 Binary files a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom b/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom deleted file mode 100644 index bf43590d25..0000000000 --- a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.it0047 - direct-dep - 1.0 - jar - - - - maven-core-it - file:///${basedir}/repo - - - - - - - org.apache.maven.its.it0047 - transitive-dep - 1.1 - compile - - - diff --git a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml deleted file mode 100644 index 0d22411fd8..0000000000 --- a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.its.it0047 - direct-dep - 1.0 - - - 1.0 - - 20081001201944 - - \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar b/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar deleted file mode 100644 index 4bac491843..0000000000 Binary files a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom b/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom deleted file mode 100644 index 24d00acb91..0000000000 --- a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.it0047 - transitive-dep - 1.1 - jar - - - - maven-core-it - file:///${basedir}/repo - - - diff --git a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml deleted file mode 100644 index a13c2af771..0000000000 --- a/its/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.its.it0047 - transitive-dep - 1.1 - - - 1.1 - - 20081001201930 - - \ No newline at end of file