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 B81CE200B55 for ; Sun, 31 Jul 2016 22:56:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B6A4F160A81; Sun, 31 Jul 2016 20:56:47 +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 AEA2A160A61 for ; Sun, 31 Jul 2016 22:56:46 +0200 (CEST) Received: (qmail 98693 invoked by uid 500); 31 Jul 2016 20:56:45 -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 98684 invoked by uid 99); 31 Jul 2016 20:56:45 -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; Sun, 31 Jul 2016 20:56:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AB005E1101; Sun, 31 Jul 2016 20:56:45 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: maven-integration-testing git commit: [MNG-6075] Increase the model validation level to the next minor level version. Date: Sun, 31 Jul 2016 20:56:45 +0000 (UTC) archived-at: Sun, 31 Jul 2016 20:56:47 -0000 Repository: maven-integration-testing Updated Branches: refs/heads/master 31780e49d -> e7de36c50 [MNG-6075] Increase the model validation level to the next minor level version. 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/e7de36c5 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/e7de36c5 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/e7de36c5 Branch: refs/heads/master Commit: e7de36c506e8b0b442ffebdcd894bbb3600dfb26 Parents: 31780e4 Author: Christian Schulte Authored: Sun Jul 31 22:23:34 2016 +0200 Committer: Christian Schulte Committed: Sun Jul 31 22:39:15 2016 +0200 ---------------------------------------------------------------------- ...ITmng1021EqualAttachmentBuildNumberTest.java | 30 +++--- .../it/MavenITmng1701DuplicatePluginTest.java | 2 +- .../MavenITmng3719PomExecutionOrderingTest.java | 2 +- .../MavenITmng4005UniqueDependencyKeyTest.java | 2 +- ...venITmng5971HierarchicalImportScopeTest.java | 25 +---- .../src/test/resources/mng-1021/pom.xml | 2 +- .../test/resources/mng-5971/conflict/pom.xml | 100 ------------------- 7 files changed, 21 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index 15a0cfc..6b27fa4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -53,28 +53,28 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "SNAPSHOT", "pom" ); - verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "SNAPSHOT", "jar" ); + verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "1.0-SNAPSHOT", "pom" ); + verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "1.0-SNAPSHOT", "jar" ); String dir = "repo/org/apache/maven/its/mng1021/test/"; - String snapshot = getSnapshotVersion( new File( testDir, dir + "SNAPSHOT" ) ); + String snapshot = getSnapshotVersion( new File( testDir, dir + "1.0-SNAPSHOT" ) ); assertTrue( snapshot, snapshot.endsWith( "-1" ) ); verifier.assertFilePresent( dir + "maven-metadata.xml" ); verifier.assertFilePresent( dir + "maven-metadata.xml.md5" ); verifier.assertFilePresent( dir + "maven-metadata.xml.sha1" ); - verifier.assertFilePresent( dir + "SNAPSHOT/maven-metadata.xml" ); - verifier.assertFilePresent( dir + "SNAPSHOT/maven-metadata.xml.md5" ); - verifier.assertFilePresent( dir + "SNAPSHOT/maven-metadata.xml.sha1" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".pom" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".pom.md5" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".pom.sha1" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".jar" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".jar.md5" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".jar.sha1" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + "-it.jar" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + "-it.jar.md5" ); - verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + "-it.jar.sha1" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/maven-metadata.xml" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/maven-metadata.xml.md5" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/maven-metadata.xml.sha1" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + ".pom" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + ".pom.md5" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + ".pom.sha1" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + ".jar" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + ".jar.md5" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + ".jar.sha1" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + "-it.jar" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + "-it.jar.md5" ); + verifier.assertFilePresent( dir + "1.0-SNAPSHOT/test-" + snapshot + "-it.jar.sha1" ); } private String getSnapshotVersion( File artifactDir ) http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java index 27751a2..372f391 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java @@ -35,7 +35,7 @@ public class MavenITmng1701DuplicatePluginTest public MavenITmng1701DuplicatePluginTest() { - super( "[3.0-beta-1,)" ); + super( "[3.0-beta-1,3.4)" ); } /** http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java index 6e6b706..a69d4fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java @@ -38,7 +38,7 @@ public class MavenITmng3719PomExecutionOrderingTest public MavenITmng3719PomExecutionOrderingTest() { - super( "[2.0.11,2.1.0-M1),[2.1.0-M2,)" ); + super( "[2.0.11,2.1.0-M1),[2.1.0-M2,3.4)" ); } /** http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java index 9ffd5ab..43174c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -36,7 +36,7 @@ public class MavenITmng4005UniqueDependencyKeyTest public MavenITmng4005UniqueDependencyKeyTest() { - super( "[3.0-beta-1,)" ); + super( "[3.0-beta-1,3.4)" ); } /** http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java index 31524f3..080dbb6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java @@ -23,7 +23,9 @@ import java.io.File; import java.util.Arrays; import java.util.List; import java.util.Map; + import org.apache.maven.it.util.ResourceExtractor; + import static junit.framework.Assert.assertTrue; /** @@ -95,29 +97,6 @@ public class MavenITmng5971HierarchicalImportScopeTest assertTrue( contains( dependencies, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); } - public void testConflictResolution() - throws Exception - { - final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/conflict" ); - - 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 List dependencies = verifier.loadLines( "target/compile.txt", "UTF-8" ); - assertTrue( contains( dependencies, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); - } - public void testInheritanceProcessingWithProjectBasedProperties() throws Exception { http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/resources/mng-1021/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-1021/pom.xml b/core-it-suite/src/test/resources/mng-1021/pom.xml index fc5e7c8..2964487 100644 --- a/core-it-suite/src/test/resources/mng-1021/pom.xml +++ b/core-it-suite/src/test/resources/mng-1021/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.maven.its.mng1021 test - SNAPSHOT + 1.0-SNAPSHOT Maven Integration Test :: MNG-1021 http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7de36c5/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml b/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml deleted file mode 100644 index 9df2c7d..0000000 --- a/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng5971 - 0 - 20160220 - pom - - Maven Integration Test :: MNG-5971 - - - Tests that imported dependencies will be overridden based on a first declaration wins strategy. - - - - - - - org.apache.maven.its.mng5971 - import - 3 - pom - import - - - org.apache.maven.its.mng5971 - import - 2 - pom - import - - - org.apache.maven.its.mng5971 - import - 1 - pom - import - - - org.apache.maven.its.mng5971 - import - 0 - pom - import - - - - - - - org.apache.maven.its.mng5971 - dependency - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-dependency-resolution - 2.1-SNAPSHOT - - target/compile.txt - - - - validate - - compile - - - - - - - -