Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B8093200C33 for ; Sat, 4 Feb 2017 03:47:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B6B74160B6D; Sat, 4 Feb 2017 02:47:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C1E3A160B64 for ; Sat, 4 Feb 2017 03:47:14 +0100 (CET) Received: (qmail 48695 invoked by uid 500); 4 Feb 2017 02:47:13 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 48271 invoked by uid 99); 4 Feb 2017 02:47:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Feb 2017 02:47:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87014E01C8; Sat, 4 Feb 2017 02:47:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: schulte@apache.org To: commits@maven.apache.org Date: Sat, 04 Feb 2017 02:47:16 -0000 Message-Id: In-Reply-To: <61e75666536443928ba05e38347ce595@git.apache.org> References: <61e75666536443928ba05e38347ce595@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/13] maven-integration-testing git commit: [MNG-5600] Dependency management import should support exclusions. archived-at: Sat, 04 Feb 2017 02:47:15 -0000 [MNG-5600] Dependency management import should support exclusions. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/eb239c98 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/eb239c98 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/eb239c98 Branch: refs/heads/DEPMGMT Commit: eb239c989f86278b13b6da7aab28569a89d2bd40 Parents: f8df416 Author: Christian Schulte Authored: Sun Jun 19 17:18:51 2016 +0200 Committer: Christian Schulte Committed: Sat Feb 4 03:45:49 2017 +0100 ---------------------------------------------------------------------- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...ependencyManagementImportExclusionsTest.java | 82 +++++++++++++++++++ .../test/resources/mng-5600/exclusions/pom.xml | 84 ++++++++++++++++++++ .../apache/maven/its/mng5600/bom/0/bom-0.pom | 44 ++++++++++ .../resources/mng-5600/settings-template.xml | 43 ++++++++++ 5 files changed, 254 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/eb239c98/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 1e741c4..25b8906 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -106,6 +106,7 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class ); suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class ); suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/eb239c98/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java new file mode 100644 index 0000000..fc2ef63 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java @@ -0,0 +1,82 @@ +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.Arrays; +import java.util.Map; +import java.util.Properties; + +import org.apache.maven.it.util.ResourceExtractor; + +import static junit.framework.Assert.assertEquals; + +/** + * [MNG-5600] Dependency management import should support exclusions. + * + * @author Christian Schulte + */ +public class MavenITmng5600DependencyManagementImportExclusionsTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5600DependencyManagementImportExclusionsTest() + { + super( "[3.5.1,)" ); + } + + public void testCanExcludeDependenciesFromImport() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5600/exclusions" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final Properties properties = verifier.loadProperties( "target/project.properties" ); + assertEquals( "1", properties.getProperty( "project.dependencyManagement.dependencies" ) ); + assertEquals( "commons-lang:commons-lang:jar", + properties.getProperty( "project.dependencyManagement.dependencies.0.managementKey" ) ); + + assertEquals( "2", properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions" ) ); + assertEquals( "commons-io", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.0.groupId" ) ); + + assertEquals( "commons-io", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.0.artifactId" ) ); + + assertEquals( "commons-logging", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.1.groupId" ) ); + + assertEquals( "commons-logging", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.1.artifactId" ) ); + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/eb239c98/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml b/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml new file mode 100644 index 0000000..dc06836 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml @@ -0,0 +1,84 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5600 + 0 + 20160619 + pom + + Maven Integration Test :: MNG-5600 + + + Tests that dependency management import exclusions are supported. + + + + + + org.apache.maven.its.mng5600 + bom + 0 + pom + import + + + + commons-io + commons-io + + + + commons-logging + commons-logging + + + + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + verify + + eval + + + + project/dependencyManagement + + ${project.build.directory}/project.properties + + + + + + + + http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/eb239c98/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom b/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom new file mode 100644 index 0000000..6598212 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom @@ -0,0 +1,44 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5600 + bom + 0 + pom + + + + + commons-io + commons-io + 2.5 + + + commons-lang + commons-lang + 2.6 + + + + http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/eb239c98/core-it-suite/src/test/resources/mng-5600/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5600/settings-template.xml b/core-it-suite/src/test/resources/mng-5600/settings-template.xml new file mode 100644 index 0000000..f22a7f3 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5600/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/../repo + + ignore + + + false + + + + + + + maven-core-it-repo + +