[maven-integration-testing] 04/04: Merge branch 'master' into mng-6118-submodule-invocation

[mthmulders]

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

mthmulders pushed a commit to branch mng-6118-submodule-invocation
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit b57beb421bc337c90898c0c605924d61ef4fb2d1
Merge: 36b7269 2dc4f0c
Author: Maarten Mulders <mthmuld...@apache.org>
AuthorDate: Fri Sep 11 08:32:06 2020 +0200

    Merge branch 'master' into mng-6118-submodule-invocation

 .../org/apache/maven/it/IntegrationTestSuite.java  |  1 +
 ...mng6772NestedImportScopeRepositoryOverride.java | 95 ++++++++++++++++++++++
 .../pom-template.xml                               | 50 ++++++++++++
 .../org/apache/maven/its/mng6772/a/0.1/a-0.1.pom   | 41 ++++++++++
 .../org/apache/maven/its/mng6772/b/0.1/b-0.1.pom   | 39 +++++++++
 .../its/mng6772/dependency/0.1/dependency-0.1.pom  | 41 ++++++++++
 .../settings-override.xml                          | 23 ++++++
 .../mng-6772-override-in-project/pom-template.xml  | 53 ++++++++++++
 .../org/apache/maven/its/mng6772/a/0.1/a-0.1.pom   | 41 ++++++++++
 .../org/apache/maven/its/mng6772/b/0.1/b-0.1.pom   | 39 +++++++++
 .../settings-override.xml                          | 23 ++++++
 .../maven/it/AbstractMavenIntegrationTestCase.java | 38 ++++++++-
 pom.xml                                            |  2 +-
 13 files changed, 484 insertions(+), 2 deletions(-)

diff --cc 
core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 6f6e419,c717aca..50367ea
--- 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,8 -107,8 +107,9 @@@ public class IntegrationTestSuit
          // 
-------------------------------------------------------------------------------------------------------------
          // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
  
 +        suite.addTestSuite( MavenITmng6118SubmoduleInvocation.class );
          suite.addTestSuite( MavenITmng6972AllowAccessToGraphPackageTest.class 
);
+         suite.addTestSuite( 
MavenITmng6772NestedImportScopeRepositoryOverride.class );
          suite.addTestSuite( 
MavenITmng6759TransitiveDependencyRepositoriesTest.class );
          suite.addTestSuite( MavenITmng6720FailFastTest.class );
          suite.addTestSuite( MavenITmng6656BuildConsumer.class );