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/01/29 20:16:20 UTC

[maven-integration-testing] 02/02: Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven-integration-testing

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

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

commit d839d328c923e5103809c97e5e27baa976a4a248
Merge: bdc242b 1e8f2e2
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Jan 29 21:16:09 2020 +0100

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven-integration-testing

 .../org/apache/maven/it/IntegrationTestSuite.java  |  1 +
 .../it/MavenITmng6071GetResourceWithCustomPom.java | 37 ++++++++++++++++++++
 core-it-suite/src/test/resources/mng-6071/pom.xml  | 28 +++++++++++++++
 .../src/test/java/com/mycompany/app/AppTest.java   | 40 ++++++++++++++++++++++
 4 files changed, 106 insertions(+)

diff --cc core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index f81f6d2,4e43882..87b948e
--- 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
@@@ -107,7 -107,7 +107,8 @@@ public class IntegrationTestSuit
          // -------------------------------------------------------------------------------------------------------------
          // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
  
 +        suite.addTestSuite( MavenITmng5669ReadPomsOnce.class );
+         suite.addTestSuite( MavenITmng6071GetResourceWithCustomPom.class );
          suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
          suite.addTestSuite( MavenITmng6720FailFastTest.class );
          suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class );