diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java index d7a45e94a3..559d67161d 100644 --- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java @@ -164,6 +164,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.class ); suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class ); suite.addTestSuite( MavenITmng2277AggregatorAndResolutionPluginsTest.class ); + //suite.addTestSuite( MavenITmng3396DependencyManagementForOverConstrainedRanges.class ); // ---------------------------------------------------------------------------------------------------- // Tests that need to be fixed. diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.java new file mode 100644 index 0000000000..ac24b8377b --- /dev/null +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.java @@ -0,0 +1,69 @@ +package org.apache.maven.integrationtests; + +/* + * 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 org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +public class MavenITmng3396DependencyManagementForOverConstrainedRanges + extends AbstractMavenIntegrationTestCase +{ + private static final String GROUP_ID = "org.apache.maven.its.mng3396"; + + public void testDependencyManagementForOverConstrainedRanges() + throws Exception + { + String baseDir = "/mng-3396-dependencyManagementForOverConstrainedRanges"; + File testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/dependencies" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" ); + verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" ); + verifier.deleteArtifact( GROUP_ID, "B", "1.0", "pom" ); + verifier.deleteArtifact( GROUP_ID, "B", "1.0", "jar" ); + verifier.executeGoal( "install" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/plugin" ); + + verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" ); + verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" ); + verifier.deleteArtifact( GROUP_ID, "A", "3.0", "pom" ); + verifier.deleteArtifact( GROUP_ID, "A", "3.0", "jar" ); + verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "pom" ); + verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "jar" ); + verifier.executeGoal( "install" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/pluginuser" ); + + verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" ); + verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" ); + verifier.executeGoal( "install" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } +} diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/a1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/a1/pom.xml new file mode 100644 index 0000000000..edd76ceca8 --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/a1/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 :: A + + org.apache.maven.its.mng3396 + dependencies + 1 + + A + 1.0 + diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/b/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/b/pom.xml new file mode 100644 index 0000000000..132a95cc9c --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/b/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 :: B + + org.apache.maven.its.mng3396 + dependencies + 1 + + B + 1.0 + + + ${pom.groupId} + A + [1.0,2.0) + + + diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/pom.xml new file mode 100644 index 0000000000..f5abf1c789 --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/dependencies/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 + org.apache.maven.its.mng3396 + dependencies + Managed versions dont affect over constrained ranges. [MNG-3396] + 1 + + pom + + + a1 + b + + diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/a/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/a/pom.xml new file mode 100644 index 0000000000..c6dafc44dc --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/a/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 :: A + + org.apache.maven.its.mng3396 + plugin-parent + 1 + + A + 3.0 + diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml new file mode 100644 index 0000000000..0d3c0db180 --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 :: plugin + + org.apache.maven.its.mng3396 + plugin-parent + 1 + + plugin + 1.0 + maven-plugin + + + + ${pom.groupId} + B + 1.0 + + + + + + ${pom.groupId} + ${pom.groupId} + 3.0 + + + + diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/pom.xml new file mode 100644 index 0000000000..dd42bc3dad --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 + org.apache.maven.its.mng3396 + plugin-parent + Managed versions dont affect over constrained ranges. [MNG-3396] + 1 + + pom + + + a + plugin + + diff --git a/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml new file mode 100644 index 0000000000..6ad0ff4dc8 --- /dev/null +++ b/its/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + Maven Integration Test :: mng3396 :: pluginuser + org.apache.maven.its.mng3396 + pluginuser + 1.0 + maven-plugin + + + + + ${pom.groupId} + plugin + 1.0 + + + +