Repository: maven-integration-testing Updated Branches: refs/heads/master faecb5dc5 -> 81b1de88d
[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/81b1de88 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/81b1de88 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/81b1de88 Branch: refs/heads/master Commit: 81b1de88da12d98e90258bd21dd87c54dd6d6df5 Parents: faecb5d Author: Christian Schulte <schu...@apache.org> Authored: Thu Jun 30 11:45:21 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Thu Jun 30 11:45:21 2016 +0200 ---------------------------------------------------------------------- ...ITmng4963ParentResolutionFromMirrorTest.java | 6 +++- .../resources/mng-4991/settings-template.xml | 35 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/81b1de88/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index 1aadfdd..3eaa8d7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -35,7 +35,11 @@ public class MavenITmng4963ParentResolutionFromMirrorTest public MavenITmng4963ParentResolutionFromMirrorTest() { - super( "[2.0.5,3.0-alpha-1),[3.0.3,)" ); + // This test got disabled for Maven >= 3.4 because the test is testing built-in repository behaviour. As of + // Maven 3.4 built-in repositories have been moved to the default settings and thus this test is obsolete as of + // Maven 3.4 because there is no way to test built-in repositories without declaring them in the settings or the + // pom. + super( "[2.0.5,3.0-alpha-1),[3.0.3,3.4)" ); } /** http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/81b1de88/core-it-suite/src/test/resources/mng-4991/settings-template.xml ---------------------------------------------------------------------- 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..5d99005 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 @@ -41,6 +41,41 @@ under the License. <profile> <id>it-defaults</id> <!-- disable central override and use built-in values --> + + <!-- + As of Maven 3.4, there are no built-in values other than what is declared in the default settings. In order to + use the built-in values, those values need to be provided here. It is essential the repositories below match + the built-in values prior to Maven 3.4. + --> + <repositories> + <repository> + <id>central</id> + <name>Central Repository</name> + <url>https://repo.maven.apache.org/maven2</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <updatePolicy>never</updatePolicy> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>central</id> + <name>Central Repository</name> + <url>https://repo.maven.apache.org/maven2</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <updatePolicy>never</updatePolicy> + </releases> + </pluginRepository> + </pluginRepositories> </profile> </profiles> <activeProfiles>
