You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/09/24 15:13:54 UTC
[33/40] 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.
[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/MNG-6012-Missing-Profile-At-End
Commit: a2249ce21ca1e5f28858422c3018153b8eba4d3a
Parents: a1da731
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Aug 18 06:36:14 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
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()