You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/11/11 20:47:42 UTC
[2/2] maven-integration-testing git commit: [MNG-4645] Move central
repo definition out of Maven's core so it can be more easily changed.
[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed.
This reverts commit 81b1de88da12d98e90258bd21dd87c54dd6d6df5.
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/ee10d999
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ee10d999
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ee10d999
Branch: refs/heads/master
Commit: ee10d9991f27a012259de61280254ea45da758d6
Parents: 63d453a
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Nov 11 21:28:13 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Nov 11 21:28:13 2016 +0100
----------------------------------------------------------------------
...ITmng4963ParentResolutionFromMirrorTest.java | 6 +---
.../resources/mng-4991/settings-template.xml | 35 --------------------
2 files changed, 1 insertion(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ee10d999/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 3eaa8d7..1aadfdd 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,11 +35,7 @@ public class MavenITmng4963ParentResolutionFromMirrorTest
public MavenITmng4963ParentResolutionFromMirrorTest()
{
- // 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)" );
+ super( "[2.0.5,3.0-alpha-1),[3.0.3,)" );
}
/**
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ee10d999/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 5d99005..75dd1ab 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,41 +41,6 @@ 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>