You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/06/07 12:25:18 UTC
[maven-integration-testing] 01/01: Merge branch 'master' into MNG-6656

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit ff22588c0bb92382523688e4c9f3266071f02aff
Merge: 40463eb 96416e7
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jun 7 14:25:04 2020 +0200

    Merge branch 'master' into MNG-6656

 README.md                                          |   8 +-
 .../org/apache/maven/it/IntegrationTestSuite.java  |   1 +
 ...MavenITmng5868NoDuplicateAttachedArtifacts.java | 135 +++++++++++++++++++++
 .../maven/it/MavenITmng5937MavenWrapper.java       |  45 ++++---
 core-it-suite/src/test/resources/mng-5868/pom.xml  | 105 ++++++++++++++++
 .../java/org/apache/maven/its/mng5338/App.java     |  32 +++++
 .../maven/plugin/coreit/AbstractRepoMojo.java      |   2 +-
 .../org/apache/maven/plugin/coreit/DeployMojo.java |   3 +-
 .../apache/maven/plugin/coreit/InstallMojo.java    |   3 +-
 .../maven/it/AbstractMavenIntegrationTestCase.java |  49 ++++++--
 .../main/java/org/apache/maven/it/AnsiSupport.java |  50 ++++++++
 run-its.sh                                         |   5 +-
 12 files changed, 397 insertions(+), 41 deletions(-)

diff --cc core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 0018caa,45f1d38..11838b1
--- 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,8 -106,7 +106,9 @@@ public class IntegrationTestSuit
          // Tests that don't run stable and need to be fixed
          // -------------------------------------------------------------------------------------------------------------
          // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 +        
 +        suite.addTestSuite( MavenITmng6656BuildConsumer.class );
+         suite.addTestSuite( MavenITmng5868NoDuplicateAttachedArtifacts.class );
          suite.addTestSuite( MavenITmng5937MavenWrapper.class );
          suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
          suite.addTestSuite( MavenITmng4660OutdatedPackagedArtifact.class );