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 eab5bd1017e7247a463c390b6ca4613c368833a1
Merge: 2bf1e26 59bcf77
Author: Martin Kanters <martinkant...@apache.org>
AuthorDate: Wed Aug 5 21:42:53 2020 +0200

    Merge remote-tracking branch 'origin/master' into 
mng-6118-submodule-invocation
    
    # Conflicts:
    #   
core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

 .../org/apache/maven/it/IntegrationTestSuite.java  | 15 ++---
 .../maven/it/MavenITmng5175WagonHttpTest.java      |  3 +-
 ...avenITmng6972AllowAccessToGraphPackageTest.java | 70 ++++++++++++++++++++++
 .../build-plugin/pom.xml                           | 67 +++++++++++++++++++++
 .../example/BuildExtensionUsingGraphPackage.java   | 44 ++++++++++++++
 .../using-module/pom.xml                           | 38 ++++++++++++
 6 files changed, 229 insertions(+), 8 deletions(-)

diff --cc 
core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index d9f6f2d,ee41a83..6f6e419
--- 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,16 -107,11 +107,12 @@@ public class IntegrationTestSuit
          // 
-------------------------------------------------------------------------------------------------------------
          // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
  
 +        suite.addTestSuite( MavenITmng6118SubmoduleInvocation.class );
-         suite.addTestSuite( MavenITmng5760ResumeFeatureTest.class );
-         suite.addTestSuite( MavenITmng6656BuildConsumer.class );
-         suite.addTestSuite( MavenITmng6562WarnDefaultBindings.class );
-         suite.addTestSuite( MavenITmng5868NoDuplicateAttachedArtifacts.class 
);
-         suite.addTestSuite( MavenITmng5937MavenWrapper.class );
-         suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
-         suite.addTestSuite( MavenITmng4660OutdatedPackagedArtifact.class );
+         suite.addTestSuite( MavenITmng6972AllowAccessToGraphPackageTest.class 
);
          suite.addTestSuite( 
MavenITmng6759TransitiveDependencyRepositoriesTest.class );
          suite.addTestSuite( MavenITmng6720FailFastTest.class );
+         suite.addTestSuite( MavenITmng6656BuildConsumer.class );
+         suite.addTestSuite( MavenITmng6562WarnDefaultBindings.class );
          suite.addTestSuite( MavenITmng6558ToolchainsBuildingEventTest.class );
          suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class );
          suite.addTestSuite( MavenITmng6391PrintVersionTest.class );

Reply via email to