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:06 UTC
[maven-integration-testing] branch MNG-6656 updated (314503b ->
faed224)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
from 314503b Revert "[MNG-6656] Verify EOL after git checkout"
add b8b2c37 Sort ITs in reverse numerical order
add 76c80f1 [MNG-6613] Mirror matching ignores closest/nearest definition
add 61f9406 Remove overhauled comment
add 9a8076f Some ITs test with SNAPSHOT versions
add 53c2fb4 Update maven-verifier to 1.7.1 Fix MavenITmng3810BadProfileActivationTest, target/profile.properties was never created
add 9181532 [MNG-5640] AbstractMavenLifecycleParticipant#afterSessionEnd is not invoked in some cases
add 8c109b3 [MNG-4660] Use of --resume-from in multi-module project fails with missing inter-module dependencies
add 1a86fdb Upgrade maven-antrun-plugin to 3.0.0
add ebd1031 Prepare IT of MNG-2741 for Wagon 3.4.0
add d6e2e1a [MNG-2478] add "resources-filtered" filtered resource directories to super POM
add 077b9d3 [5937] Maven-Wrapper for unified project environments
add 6e5a51c Update documentation on how to run ITs including tests for maven-wrapper
add 764176d [MNG-6919] test maven-wrapper with spaced paths
new faed224 Merge branch 'master' into MNG-6656
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 23 +--
.../main/java/org/apache/maven/it/Example.java} | 7 +-
.../module-b}/pom.xml | 31 ++--
.../java/org/apache/maven/it/AnotherExample.java | 14 +-
.../test/java/org/apache/maven/it/TestCase.java | 17 +-
.../pom.xml | 47 ++++--
.../module-a}/pom.xml | 23 +--
.../main/java/org/apache/maven/it/Example.java} | 7 +-
.../module-b}/pom.xml | 31 ++--
.../java/org/apache/maven/it/AnotherExample.java | 14 +-
.../test/java/org/apache/maven/it/TestCase.java | 24 ++-
.../plugin => mng-4660-resume-from}/pom.xml | 47 ++++--
.../buildfailure-utfail/pom.xml | 7 +
.../0.1/c-0.1.pom => mng-5937 wrapper/bin/pom.xml} | 8 +-
.../sub-1 => mng-5937 wrapper/properties}/pom.xml | 9 +-
.../c-0.1.pom => mng-5937 wrapper/script/pom.xml} | 8 +-
.../c-0.1.pom => mng-5937 wrapper/source/pom.xml} | 8 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 2 +-
pom.xml | 2 +-
run-its.bat | 13 +-
run-its.sh | 8 +-
41 files changed, 770 insertions(+), 191 deletions(-)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
copy core-it-suite/src/test/resources/{mng-6656-buildconsumer/simple-parent/simple-weather => mng-4660-outdated-packaged-artifact/module-a}/pom.xml (71%)
copy core-it-suite/src/test/resources/{mng-6506-package-annotation/plugin/src/main/java/testmojo/package-info.java => mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java} (93%)
copy core-it-suite/src/test/resources/{mng-6656-buildconsumer/simple-parent/simple-weather => mng-4660-outdated-packaged-artifact/module-b}/pom.xml (63%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java (87%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java (82%)
copy core-it-suite/src/test/resources/{mng-3536/plugin => mng-4660-outdated-packaged-artifact}/pom.xml (53%)
copy core-it-suite/src/test/resources/{mng-6656-buildconsumer/simple-parent/simple-weather => mng-4660-resume-from/module-a}/pom.xml (71%)
copy core-it-suite/src/test/resources/{mng-6506-package-annotation/plugin/src/main/java/testmojo/package-info.java => mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java} (93%)
copy core-it-suite/src/test/resources/{mng-6656-buildconsumer/simple-parent/simple-weather => mng-4660-resume-from/module-b}/pom.xml (63%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java (87%)
copy core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/ClassB.java => core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java (77%)
copy core-it-suite/src/test/resources/{mng-3536/plugin => mng-4660-resume-from}/pom.xml (54%)
copy core-it-suite/src/test/resources/{mng-5663-nested-import-scope-pom-resolution/repo2/org/apache/maven/its/mng5663/c/0.1/c-0.1.pom => mng-5937 wrapper/bin/pom.xml} (86%)
copy core-it-suite/src/test/resources/{mng-5208/project/sub-1 => mng-5937 wrapper/properties}/pom.xml (84%)
copy core-it-suite/src/test/resources/{mng-5663-nested-import-scope-pom-resolution/repo2/org/apache/maven/its/mng5663/c/0.1/c-0.1.pom => mng-5937 wrapper/script/pom.xml} (86%)
copy core-it-suite/src/test/resources/{mng-5663-nested-import-scope-pom-resolution/repo2/org/apache/maven/its/mng5663/c/0.1/c-0.1.pom => mng-5937 wrapper/source/pom.xml} (86%)
[maven-integration-testing] 01/01: Merge branch 'master' into
MNG-6656
Posted by rf...@apache.org.
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 );