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/01/24 22:18:38 UTC
[maven-integration-testing] branch MNG-4991_fix updated (a264dd8 ->
b8afc98)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-4991_fix
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
omit a264dd8 [MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't evaluate non-proxy hosts
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
new b8afc98 [MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't evaluate non-proxy hosts
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 (a264dd8)
\
N -- N -- N refs/heads/MNG-4991_fix (b8afc98)
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:
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 66 +++++++++++++++++++---
.../maven/it/MavenITmng4660ResumeFromTest.java | 2 +-
.../MavenITmng5572ReactorPluginExtensionsTest.java | 2 +-
.../maven/it/MavenITmng5760ResumeFeatureTest.java | 15 ++---
...nITmng6256SpecialCharsAlternatePOMLocation.java | 18 +++---
...avenITmng6972AllowAccessToGraphPackageTest.java | 8 +--
.../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 +-
.../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 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 16 +++---
.../MavenITmngXXXXDescriptionOfProblemTest.java | 4 +-
.../it/MavenITmngXXXXDescriptionOfProblemTest.java | 4 +-
run-its.bat | 2 +-
run-its.sh | 2 +-
139 files changed, 248 insertions(+), 200 deletions(-)
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%)
[maven-integration-testing] 01/01: [MNG-4991]
LegacyRepositorySystem#injectProxy(repositories,
proxies) doesn't evaluate non-proxy hosts
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-4991_fix
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit b8afc98fc214c1eeab47356f27a153e2b2bbda30
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 26 19:08:32 2020 +0100
[MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't evaluate non-proxy hosts
Remove empty override of 'it-defaults' profile because it breaks MNG-4645. It is
still reliable for both cases because:
before MNG-4645) It relied on the fact that the override removes the global
settings Maven Central definition of 'file:target/null' while Maven internally
still added canonical Maven Central back.
with MNG-4645) The empty profile override completely removes Maven Central
definition which means that the mirror won't proxy a non-existing repository.
This closes #95
---
core-it-suite/src/test/resources/mng-4991/settings-template.xml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-4991/settings-template.xml b/core-it-suite/src/test/resources/mng-4991/settings-template.xml
index 75dd1ab..10e62e5 100644
--- a/core-it-suite/src/test/resources/mng-4991/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-4991/settings-template.xml
@@ -37,13 +37,4 @@ under the License.
<nonProxyHosts>@localhost@</nonProxyHosts>
</proxy>
</proxies>
- <profiles>
- <profile>
- <id>it-defaults</id>
- <!-- disable central override and use built-in values -->
- </profile>
- </profiles>
- <activeProfiles>
- <activeProfile>it-defaults</activeProfile>
- </activeProfiles>
</settings>