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

[mi...@apache.org]

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.


 discard 40318f7  [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
     new f9d49f6  [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   (40318f7)
            \
             N -- N -- N   refs/heads/MNG-6114 (f9d49f6)

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:

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

[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 f9d49f6dbe4129dff4f86e7f0e6eaf6fd531bcb8
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>