Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-integration-testing
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/ebb8ac93 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ebb8ac93 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ebb8ac93 Branch: refs/heads/master Commit: ebb8ac933343a0f9bca0a5fc54ccb474f3375e88 Parents: 8827689 0bd5bdc Author: Dan Tran <dant...@gmail.com> Authored: Mon Nov 21 16:43:27 2016 -0800 Committer: Dan Tran <dant...@gmail.com> Committed: Mon Nov 21 16:43:27 2016 -0800 ---------------------------------------------------------------------- .../apache/maven/it/IntegrationTestSuite.java | 2 +- .../it/MavenITmng3843PomInheritanceTest.java | 35 +++++++-- ...ITmng4963ParentResolutionFromMirrorTest.java | 6 +- ...pendencyManagementImportRelocationsTest.java | 2 - ...ependencyManagementImportExclusionsTest.java | 3 +- .../it/MavenITmng5771CoreExtensionsTest.java | 26 +++++- ...venITmng5774ConfigurationProcessorsTest.java | 19 +++++ ...MavenITmng5783PluginDependencyFiltering.java | 19 +++++ .../MavenITmng5805PkgTypeMojoConfiguration.java | 19 +++++ .../it/MavenITmng5840ParentVersionRanges.java | 19 +++++ ...venITmng5840RelativePathReactorMatching.java | 19 +++++ .../it/MavenITmng5889CoreExtensionsTest.java | 81 +++++++++++++++++++ ...avenITmng5958LifecyclePhaseBinaryCompat.java | 19 +++++ ...ncyManagementImportInterpolation410Test.java | 83 -------------------- .../mng-4463/exclusive-upper-bound/pom.xml | 2 +- .../mng-4463/inclusive-upper-bound/pom.xml | 2 +- .../resources/mng-4463/no-upper-bound/pom.xml | 2 +- .../resources/mng-4991/settings-template.xml | 35 --------- .../test/resources/mng-5527/relocations/pom.xml | 2 +- .../test/resources/mng-5600/exclusions/pom.xml | 2 +- .../mng-5971/inheritance/1/2/3/pom.xml | 2 +- .../resources/mng-5971/inheritance/1/2/pom.xml | 2 +- .../resources/mng-5971/inheritance/1/pom.xml | 2 +- .../test/resources/mng-5971/inheritance/pom.xml | 2 +- .../test/resources/mng-5971/override/pom.xml | 2 +- .../mng-5971/properties/1/2/3/4/pom.xml | 2 +- .../resources/mng-5971/properties/1/2/3/pom.xml | 2 +- .../resources/mng-5971/properties/1/2/pom.xml | 2 +- .../resources/mng-5971/properties/1/pom.xml | 2 +- .../test/resources/mng-5971/properties/pom.xml | 2 +- .../resources/mng-6079/parent-pom-4_1_0.xml | 49 ------------ .../src/test/resources/mng-6079/pom-4_1_0.xml | 69 ---------------- .../it/AbstractMavenIntegrationTestCase.java | 1 + 33 files changed, 268 insertions(+), 268 deletions(-) ----------------------------------------------------------------------
