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/05/31 11:29:07 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 faed2247115229383f59d80da5b21f2c112ff0c5
Merge: 314503b 764176d
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun May 31 13:28:42 2020 +0200
Merge branch 'master' into MNG-6656
README.md | 12 +-
core-it-suite/pom.xml | 79 ++++++++-
.../org/apache/maven/it/IntegrationTestSuite.java | 50 +++---
...41PluginMetadataResolutionErrorMessageTest.java | 8 +-
...MavenITmng3743ForkWithPluginManagementTest.java | 2 +-
.../it/MavenITmng3810BadProfileActivationTest.java | 3 -
.../maven/it/MavenITmng3843PomInheritanceTest.java | 18 +-
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 122 ++++++++++++++
.../maven/it/MavenITmng4660ResumeFromTest.java | 112 +++++++++++++
.../maven/it/MavenITmng5937MavenWrapper.java | 183 +++++++++++++++++++++
...enITmng5965ParallelBuildMultipliesWorkTest.java | 2 +-
.../maven/it/MavenITmng6065FailOnSeverityTest.java | 2 +-
.../it/MavenITmng6071GetResourceWithCustomPom.java | 2 +-
.../maven/it/MavenITmng6352PrintVersionTest.java | 2 +-
.../maven/it/MavenITmng6391PrintVersionTest.java | 2 +-
.../it/MavenITmng6506PackageAnnotationTest.java | 2 +-
.../MavenITmng6558ToolchainsBuildingEventTest.java | 2 +-
.../src/test/resources/bootstrap/group-7/pom.xml | 2 +-
.../test/resources/mng-0624/simple/child/pom.xml | 4 +-
.../mng-3461/test-3/settings-template.xml | 2 +-
.../module-a/pom.xml | 28 ++--
.../src/main/java/org/apache/maven/it/Example.java | 24 +++
.../module-b/pom.xml | 34 ++--
.../java/org/apache/maven/it/AnotherExample.java | 28 ++++
.../test/java/org/apache/maven/it/TestCase.java | 31 ++++
.../mng-4660-outdated-packaged-artifact/pom.xml | 59 +++++++
.../mng-4660-resume-from/module-a/pom.xml | 28 ++--
.../src/main/java/org/apache/maven/it/Example.java | 24 +++
.../mng-4660-resume-from/module-b/pom.xml | 34 ++--
.../java/org/apache/maven/it/AnotherExample.java | 28 ++++
.../test/java/org/apache/maven/it/TestCase.java | 34 ++++
.../test/resources/mng-4660-resume-from/pom.xml | 59 +++++++
.../buildfailure-utfail/pom.xml | 7 +
.../test/resources/mng-5937 wrapper/bin/pom.xml | 26 +--
.../resources/mng-5937 wrapper/properties/pom.xml | 25 ++-
.../test/resources/mng-5937 wrapper/script/pom.xml | 26 +--
.../test/resources/mng-5937 wrapper/source/pom.xml | 26 +--
.../maven/it/AbstractMavenIntegrationTestCase.java | 2 +-
pom.xml | 2 +-
run-its.bat | 13 +-
run-its.sh | 8 +-
41 files changed, 975 insertions(+), 182 deletions(-)
diff --cc core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 0f6b16a,01fdb89..0018caa
--- 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,17 -106,19 +106,20 @@@ 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( MavenITmng5669ReadPomsOnce.class );
- suite.addTestSuite( MavenITmng6071GetResourceWithCustomPom.class );
+ suite.addTestSuite( MavenITmng5937MavenWrapper.class );
+ suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
+ suite.addTestSuite( MavenITmng4660OutdatedPackagedArtifact.class );
suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
suite.addTestSuite( MavenITmng6720FailFastTest.class );
+ suite.addTestSuite( MavenITmng6558ToolchainsBuildingEventTest.class );
suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class );
- suite.addTestSuite( MavenITmng6256SpecialCharsAlternatePOMLocation.class );
+ suite.addTestSuite( MavenITmng6391PrintVersionTest.class );
suite.addTestSuite( MavenITmng6386BaseUriPropertyTest.class );
+ suite.addTestSuite( MavenITmng6352PrintVersionTest.class );
suite.addTestSuite( MavenITmng6330RelativePath.class );
- suite.addTestSuite( MavenITmng5965ParallelBuildMultipliesWorkTest.class );
+ suite.addTestSuite( MavenITmng6256SpecialCharsAlternatePOMLocation.class );
suite.addTestSuite( MavenITmng6255FixConcatLines.class );
suite.addTestSuite( MavenITmng6240PluginExtensionAetherProvider.class );
suite.addTestSuite( MavenITmng6223FindBasedir.class );