Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2FF07200B66 for ; Thu, 18 Aug 2016 22:16:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2E7B0160AB7; Thu, 18 Aug 2016 20:16:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 71D95160AAE for ; Thu, 18 Aug 2016 22:16:03 +0200 (CEST) Received: (qmail 5328 invoked by uid 500); 18 Aug 2016 20:16:02 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 5312 invoked by uid 99); 18 Aug 2016 20:16:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Aug 2016 20:16:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E8BCDFE2E; Thu, 18 Aug 2016 20:16:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: schulte@apache.org To: commits@maven.apache.org Date: Thu, 18 Aug 2016 20:16:03 -0000 Message-Id: <391d961a0511444f91a8bec92f1a5b5a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] maven git commit: [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. archived-at: Thu, 18 Aug 2016 20:16:04 -0000 [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. o This reverts commit 6460063c3527031c2366365b1d29edc2cab3e093. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a2249ce2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a2249ce2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a2249ce2 Branch: refs/heads/master Commit: a2249ce21ca1e5f28858422c3018153b8eba4d3a Parents: a1da731 Author: Christian Schulte Authored: Thu Aug 18 06:36:14 2016 +0200 Committer: Christian Schulte Committed: Thu Aug 18 22:04:46 2016 +0200 ---------------------------------------------------------------------- .../apache/maven/project/DefaultMavenProjectBuilderTest.java | 4 ++-- .../java/org/apache/maven/project/PomConstructionTest.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/a2249ce2/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 2d6f903..3959cdd 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() ); - assertTrue( project.getRemoteArtifactRepositories().isEmpty() ); + assertFalse( project.getRemoteArtifactRepositories().isEmpty() ); assertNotNull( project.getPluginArtifactRepositories() ); - assertTrue( project.getPluginArtifactRepositories().isEmpty() ); + assertFalse( project.getPluginArtifactRepositories().isEmpty() ); assertNull( project.getParent() ); assertNull( project.getParentArtifact() ); http://git-wip-us.apache.org/repos/asf/maven/blob/a2249ce2/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 0c5c715..988df76 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( 2, ( (List) pom.getValue( "repositories" ) ).size() ); + assertEquals( 3, ( (List) pom.getValue( "repositories" ) ).size() ); } /** MNG-3965 */ @@ -1261,10 +1261,12 @@ 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( 1, ( (List) pom.getValue( "repositories" ) ).size() ); + assertEquals( 2, ( (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" ) ); @@ -1480,7 +1482,7 @@ public class PomConstructionTest throws Exception { PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" ); - assertEquals( 8, ( (List) pom.getValue( "build/pluginManagement/plugins" ) ).size() ); + assertEquals( 12, ( (List) pom.getValue( "build/pluginManagement/plugins" ) ).size() ); } public void testDistributionManagement()