You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/02/04 15:31:30 UTC

[maven-integration-testing] branch MNG-6114 updated (f9d49f6 -> c65bc95)

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

michaelo pushed a change to branch MNG-6114
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.


    omit f9d49f6  [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
     add 5a8858f  [MNG-4660] Increase usefulness of logging
     add 765228f  [MNG-5760] Add `-r/--resume` to automatically resume from the last failure point
     add 3123928  [MNG-6972] Allow access to org.apache.maven.graph
     add ac581fd  Trim line endings as done by Maven Resolver
     add 672728a  Correct last remaining incorrect checksums
     add ef67e61  Test for consistent logging
     add fbd3713  [MNG-6972] Fix IT - explicitly set compiler target versions to 8
     add 9a1a648  Set minimal default target/source/release for maven-compiler to Java 7
     add 800f83b  Clean to avoid stale files
     add 771b738  Correct terms: Java operates on files and directories
     add 4db5702  [MNG-7051] Optionally skip non-existing profiles and break on missing required profiles.
     add 46fbd48  [MNG-7029] Remove super POM release profile
     new c65bc95  [MNG-6114] Elements from the global settings should be ordered before elements from the user settings

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f9d49f6)
            \
             N -- N -- N   refs/heads/MNG-6114 (c65bc95)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../org/apache/maven/it/IntegrationTestSuite.java  |   1 +
 .../maven/it/MavenIT0051ReleaseProfileTest.java    |   2 +-
 .../MavenITmng2309ProfileInjectionOrderTest.java   |  18 ++-
 ...MavenITmng3641ProfileActivationWarningTest.java |   2 +-
 .../maven/it/MavenITmng3732ActiveProfilesTest.java |   9 +-
 ...ng4106InterpolationUsesDominantProfileTest.java |   9 +-
 .../it/MavenITmng4660OutdatedPackagedArtifact.java |  66 +++++++++--
 .../maven/it/MavenITmng4660ResumeFromTest.java     |   2 +-
 .../MavenITmng5572ReactorPluginExtensionsTest.java |   2 +-
 .../maven/it/MavenITmng5760ResumeFeatureTest.java  |  15 +--
 ...nITmng6256SpecialCharsAlternatePOMLocation.java |  18 +--
 ...avenITmng6972AllowAccessToGraphPackageTest.java |   8 +-
 ...avenITmng7051OptionalProfileActivationTest.java | 128 +++++++++++++++++++++
 .../bootstrap/{group-7 => group-12}/pom.xml        |  60 +++++-----
 core-it-suite/src/test/resources/bootstrap/pom.xml |   1 +
 .../managed-dep/1.0.3/managed-dep-1.0.3.pom.md5    |   2 +-
 .../its/mng0479/parent/0.1/parent-0.1.pom.md5      |   2 +-
 .../a/0.2-SNAPSHOT/a-0.2-20100824.163154-1.pom.md5 |   2 +-
 .../0.2-SNAPSHOT/a-0.2-20100824.163154-1.pom.sha1  |   2 +-
 .../mng0956/component/0.1/component-0.1.pom.md5    |   2 +-
 .../mng1088/p/0.1-SNAPSHOT/p-0.1-SNAPSHOT.pom.md5  |   2 +-
 .../it0083/direct-dep/0.1/direct-dep-0.1.pom.md5   |   2 +-
 .../its/it0083/trans-dep/0.1/trans-dep-0.1.pom.md5 |   2 +-
 .../maven/its/mng1349/md5-b/0.1/md5-b-0.1.jar.md5  |   2 +-
 .../maven/its/mng1349/md5-b/0.1/md5-b-0.1.pom.md5  |   2 +-
 .../maven/its/mng1349/md5-b/maven-metadata.xml.md5 |   2 +-
 .../its/mng1349/sha1-b/0.1/sha1-b-0.1.jar.sha1     |   2 +-
 .../its/mng1349/sha1-b/maven-metadata.xml.sha1     |   2 +-
 .../apache/maven/its/mng1895/a/0.1/a-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/c/0.1/c-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/d/0.1/d-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/a/0.1/a-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/c/0.1/c-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng1895/x/0.1/x-0.1.pom.md5   |   2 +-
 .../mng2228/component/0.1/component-0.1.pom.md5    |   2 +-
 .../org/apache/maven/its/mng2744/a/1/a-1.pom.sha1  |   2 +-
 .../org/apache/maven/its/mng2744/b/1/b-1.pom.sha1  |   2 +-
 .../mng2749/extension/0.1/extension-0.1.pom.md5    |   2 +-
 .../mng2861/new/project/1.2/project-1.2.pom.md5    |   2 +-
 .../mng2861/new/project/2.0/project-2.0.pom.md5    |   2 +-
 .../mng2861/old/project/1.0/project-1.0.pom.md5    |   2 +-
 .../mng2861/old/project/1.1/project-1.1.pom.md5    |   2 +-
 .../mng2861/old/project/1.2/project-1.2.pom.md5    |   2 +-
 .../poms/dep-1.0-SNAPSHOT.pom.md5                  |   2 +-
 .../poms/dep-1.0-SNAPSHOT.pom.sha1                 |   2 +-
 .../poms/parent-1.0-SNAPSHOT.pom.md5               |   2 +-
 .../poms/parent-1.0-SNAPSHOT.pom.sha1              |   2 +-
 .../poms/plugin-1.0-SNAPSHOT.pom.md5               |   2 +-
 .../poms/plugin-1.0-SNAPSHOT.pom.sha1              |   2 +-
 .../mng3052/direct/0.1-SNAPSHOT/template.pom.md5   |   2 +-
 .../mng3380/new/transitive/1/transitive-1.pom.md5  |   2 +-
 .../mng3380/new/transitive/2/transitive-2.pom.md5  |   2 +-
 .../mng3380/old/transitive/1/transitive-1.pom.md5  |   2 +-
 .../maven/its/mng3470/dep/0.1/dep-0.1.pom.md5      |   2 +-
 .../apache/maven/its/mng3482/dep/1/dep-1.pom.md5   |   2 +-
 .../apache/maven/its/mng3482/dep/1/dep-1.pom.sha1  |   2 +-
 .../apache/maven/its/mng3482/dep2/1/dep2-1.pom.md5 |   2 +-
 .../maven/its/mng3482/dep2/1/dep2-1.pom.sha1       |   2 +-
 .../its/mng3586/plugin/0.1/plugin-0.1.pom.md5      |   2 +-
 .../mng3680/transitive/0.1/transitive-0.1.pom.md5  |   2 +-
 .../its/mng3948/parent/0.1/parent-0.1.pom.md5      |   2 +-
 .../its/mng3948/parent/0.2/parent-0.2.pom.md5      |   2 +-
 .../its/mng4036/parent/0.2/parent-0.2.pom.md5      |   2 +-
 .../2.0.4274/maven-core-2.0.4274.pom.md5           |   2 +-
 .../1.1.4274/plexus-utils-1.1.4274.pom.md5         |   2 +-
 .../1.1.4276/plexus-utils-1.1.4276.pom.md5         |   2 +-
 .../test/0.1-SNAPSHOT/maven-metadata.xml.md5       |   2 +-
 .../maven/its/mng4309/test/maven-metadata.xml.md5  |   2 +-
 .../mng4353/dependency/0.1/dependency-0.1.pom.md5  |   2 +-
 .../mng4355/extension/0.1/extension-0.1.pom.md5    |   2 +-
 .../mng4357/extension/0.1/extension-0.1.pom.md5    |   2 +-
 .../mng4357/extension/0.2/extension-0.2.pom.md5    |   2 +-
 .../mng4561/plugin-dep/0.1/plugin-dep-0.1.pom.md5  |   2 +-
 .../its/mng4600/direct/0.2/direct-0.2.pom.md5      |   2 +-
 .../0.1-stub/maven-core-0.1-stub.pom.md5           |   2 +-
 .../0.1-stub/maven-model-0.1-stub.pom.md5          |   2 +-
 .../0.1-stub/maven-project-0.1-stub.pom.md5        |   2 +-
 .../0.1-stub/plexus-utils-0.1-stub.pom.md5         |   2 +-
 .../0.1-stub/aether-api-0.1-stub.pom.md5           |   2 +-
 .../0.1-stub/aether-impl-0.1-stub.pom.md5          |   2 +-
 .../0.1-stub/aether-spi-0.1-stub.pom.md5           |   2 +-
 .../maven/its/mng4761/deps/0.1/deps-0.1.pom.md5    |   2 +-
 .../maven/its/mng4761/deps/0.1/deps-0.1.pom.sha1   |   2 +-
 .../mng4761/direct-dep/0.1/direct-dep-0.1.pom.md5  |   2 +-
 .../mng4761/direct-dep/0.1/direct-dep-0.1.pom.sha1 |   2 +-
 .../mng4761/middle-dep/0.1/middle-dep-0.1.pom.md5  |   2 +-
 .../mng4761/middle-dep/0.1/middle-dep-0.1.pom.sha1 |   2 +-
 .../mng4761/middle-dep/0.2/middle-dep-0.2.pom.md5  |   2 +-
 .../mng4761/middle-dep/0.2/middle-dep-0.2.pom.sha1 |   2 +-
 .../override-dep/0.1/override-dep-0.1.pom.md5      |   2 +-
 .../override-dep/0.1/override-dep-0.1.pom.sha1     |   2 +-
 .../its/mng4761/parent/0.1/parent-0.1.pom.md5      |   2 +-
 .../its/mng4761/parent/0.1/parent-0.1.pom.sha1     |   2 +-
 .../required-dep/0.1/required-dep-0.1.pom.md5      |   2 +-
 .../required-dep/0.1/required-dep-0.1.pom.sha1     |   2 +-
 .../its/mng4834/parent/0.1/parent-0.1.pom.md5      |   2 +-
 .../its/mng4834/parent/0.1/parent-0.1.pom.sha1     |   2 +-
 .../maven/its/mng4842/dep/0.1/dep-0.1.pom.md5      |   2 +-
 .../maven/its/mng4842/dep/0.1/dep-0.1.pom.sha1     |   2 +-
 .../its/mng4842/parent/0.1/parent-0.1.pom.md5      |   2 +-
 .../its/mng4842/parent/0.1/parent-0.1.pom.sha1     |   2 +-
 .../apache/maven/its/mng4883/a/1.0/a-1.0.pom.md5   |   2 +-
 .../apache/maven/its/mng4883/a/1.0/a-1.0.pom.sha1  |   2 +-
 .../apache/maven/its/mng4883/a/1.1/a-1.1.pom.md5   |   2 +-
 .../apache/maven/its/mng4883/a/1.1/a-1.1.pom.sha1  |   2 +-
 .../apache/maven/its/mng4883/b/1.0/b-1.0.pom.md5   |   2 +-
 .../apache/maven/its/mng4883/b/1.0/b-1.0.pom.sha1  |   2 +-
 .../apache/maven/its/mng4883/c/1.0/c-1.0.pom.md5   |   2 +-
 .../apache/maven/its/mng4883/c/1.0/c-1.0.pom.sha1  |   2 +-
 .../its/mng4895/mvnapi/0.1/mvnapi-0.1.pom.md5      |   2 +-
 .../its/mng4895/mvnapi/0.1/mvnapi-0.1.pom.sha1     |   2 +-
 .../apache/maven/its/mng4913/a/0.1/a-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng4913/a/0.1/a-0.1.pom.sha1  |   2 +-
 .../apache/maven/its/mng4913/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng4913/b/0.1/b-0.1.pom.sha1  |   2 +-
 .../maven/its/mng4991/dep/0.1/dep-0.1.pom.md5      |   2 +-
 .../maven/its/mng4991/dep/0.1/dep-0.1.pom.sha1     |   2 +-
 .../apache/maven/its/mng5006/a/0.1/a-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng5006/a/0.1/a-0.1.pom.sha1  |   2 +-
 .../apache/maven/its/mng5006/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng5006/b/0.1/b-0.1.pom.sha1  |   2 +-
 .../its/mng5006/parent/0.1/parent-0.1.pom.md5      |   2 +-
 .../its/mng5006/parent/0.1/parent-0.1.pom.sha1     |   2 +-
 .../apache/maven/its/mng5096/a/0.1/a-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng5096/a/0.1/a-0.1.pom.sha1  |   2 +-
 .../apache/maven/its/mng5096/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng5096/b/0.1/b-0.1.pom.sha1  |   2 +-
 .../apache/maven/its/mng5096/c/0.1/c-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng5096/c/0.1/c-0.1.pom.sha1  |   2 +-
 .../maven/its/mng5135/dep/0.1/dep-0.1.pom.md5      |   2 +-
 .../maven/its/mng5135/dep/0.1/dep-0.1.pom.sha1     |   2 +-
 ...n-it-core-extensions-no-descriptor-0.1.pom.sha1 |   2 +-
 .../0.1/maven-it-core-extensions-0.1.pom.sha1      |   2 +-
 ...n-it-plugin-core-extensions-client-0.1.pom.sha1 |   2 +-
 .../pom.xml                                        |   0
 .../pom.xml                                        |   0
 .../apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1  |   2 +-
 .../apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5   |   2 +-
 .../apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1  |   2 +-
 .../build-plugin/pom.xml                           |   2 +-
 .../pom.xml                                        |  17 +--
 .../maven/it/AbstractMavenIntegrationTestCase.java |  16 +--
 .../MavenITmngXXXXDescriptionOfProblemTest.java    |   4 +-
 .../it/MavenITmngXXXXDescriptionOfProblemTest.java |   4 +-
 run-its.bat                                        |   2 +-
 run-its.sh                                         |   2 +-
 149 files changed, 419 insertions(+), 219 deletions(-)
 create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java
 copy core-it-suite/src/test/resources/bootstrap/{group-7 => group-12}/pom.xml (57%)
 rename core-it-suite/src/test/resources/mng-6256-special-chars-alternate-pom-location/{folder-with-)-closing-bracket => directory-with- -space}/pom.xml (100%)
 rename core-it-suite/src/test/resources/mng-6256-special-chars-alternate-pom-location/{folder-with- -space => directory-with-)-closing-bracket}/pom.xml (100%)
 copy core-it-suite/src/test/resources/{mng-6981-pl-should-include-children/module-a/module-a-1 => mng-7051-optional-profile-activation}/pom.xml (82%)


[maven-integration-testing] 01/01: [MNG-6114] Elements from the global settings should be ordered before elements from the user settings

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c65bc95fbbcb27759b39e446634334735f0bfa9a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Dec 25 00:09:13 2020 +0100

    [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
    
    Central from global settings with 'file:' comes first and is ignored by the
    mirrorOf definition. The next central definition is ignored too due to
    MNG-7018/MNG-5984. As long as these issues aren't resolved we need to mirror
    even local repos to make the IT work as intended.
    
    This closes #92
---
 .../mng-5771-core-extensions/settings-template-mirror-auth.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml b/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
index a338822..85e82e6 100644
--- a/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
+++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
@@ -12,7 +12,7 @@
       <id>repoman</id>
       <name>Mirror</name>
       <url>http://localhost:@port@</url>
-      <mirrorOf>external:*</mirrorOf>
+      <mirrorOf>*</mirrorOf>
     </mirror>
   </mirrors>