[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed [MNG-6054] Removal of super pom plugin management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6460063c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6460063c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6460063c Branch: refs/heads/MNG-6006 Commit: 6460063c3527031c2366365b1d29edc2cab3e093 Parents: 1b00a9e Author: Christian Schulte <schu...@apache.org> Authored: Wed Jun 29 05:12:33 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Jun 29 05:12:33 2016 +0200 ---------------------------------------------------------------------- .../apache/maven/project/DefaultMavenProjectBuilderTest.java | 4 ++-- .../java/org/apache/maven/project/PomConstructionTest.java | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/6460063c/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 3959cdd..2d6f903 100644 --- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -121,10 +121,10 @@ public class DefaultMavenProjectBuilderTest assertNotNull( project.getArtifactId() ); assertNotNull( project.getRemoteArtifactRepositories() ); - assertFalse( project.getRemoteArtifactRepositories().isEmpty() ); + assertTrue( project.getRemoteArtifactRepositories().isEmpty() ); assertNotNull( project.getPluginArtifactRepositories() ); - assertFalse( project.getPluginArtifactRepositories().isEmpty() ); + assertTrue( project.getPluginArtifactRepositories().isEmpty() ); assertNull( project.getParent() ); assertNull( project.getParentArtifact() ); http://git-wip-us.apache.org/repos/asf/maven/blob/6460063c/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 988df76..0c5c715 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -393,7 +393,7 @@ public class PomConstructionTest throws Exception { PomTestWrapper pom = buildPom( "multiple-repos/sub" ); - assertEquals( 3, ( (List<?>) pom.getValue( "repositories" ) ).size() ); + assertEquals( 2, ( (List<?>) pom.getValue( "repositories" ) ).size() ); } /** MNG-3965 */ @@ -1261,12 +1261,10 @@ public class PomConstructionTest assertEquals( "org.apache.maven.its", pom.getValue( "dependencies[1]/exclusions[1]/groupId" ) ); assertEquals( "excluded-dep", pom.getValue( "dependencies[1]/exclusions[1]/artifactId" ) ); - assertEquals( 2, ( (List<?>) pom.getValue( "repositories" ) ).size() ); + assertEquals( 1, ( (List<?>) pom.getValue( "repositories" ) ).size() ); assertEquals( "project-remote-repo", pom.getValue( "repositories[1]/id" ) ); assertEquals( "http://project.url/remote";, pom.getValue( "repositories[1]/url" ) ); assertEquals( "repo", pom.getValue( "repositories[1]/name" ) ); - assertEquals( RepositorySystem.DEFAULT_REMOTE_REPO_ID, pom.getValue( "repositories[2]/id" ) ); - assertEquals( RepositorySystem.DEFAULT_REMOTE_REPO_URL, pom.getValue( "repositories[2]/url" ) ); assertEquals( "test", pom.getValue( "build/defaultGoal" ) ); assertEquals( "coreit", pom.getValue( "build/finalName" ) ); @@ -1482,7 +1480,7 @@ public class PomConstructionTest throws Exception { PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" ); - assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() ); + assertEquals( 8, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() ); } public void testDistributionManagement()
