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 2020/12/26 18:38:45 UTC
[maven-integration-testing] branch MNG-4991_fix created (now
a264dd8)
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.
at a264dd8 [MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't evaluate non-proxy hosts
This branch includes the following new commits:
new a264dd8 [MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't evaluate non-proxy hosts
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.
[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 a264dd87ee47cbf39752712238220729a2cf8a74
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
still reliably on 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
---
.../repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.md5 | 2 +-
.../repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.sha1 | 2 +-
core-it-suite/src/test/resources/mng-4991/settings-template.xml | 9 ---------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.md5 b/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.md5
index 1765053..e1680fd 100644
--- a/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.md5
+++ b/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.md5
@@ -1 +1 @@
-d74d4988a6d9ab86030ca67b79801d0b
\ No newline at end of file
+ef671332dafa5fa1b5e97bd8bed5ead1
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.sha1 b/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.sha1
index 37071d3..22e20d3 100644
--- a/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom.sha1
@@ -1 +1 @@
-fd8ed2147ad4b76d8e0cfde4cc50ead76d16589c
\ No newline at end of file
+e7ddba1691ad3a9b4ffb17bda7a20351b8323dd6
\ No newline at end of file
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>