diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 0ac45ee459d3..87146116defc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -852,10 +852,11 @@ private ModelData readParent( Model childModel, ModelSource childSource, ModelBu
File pomFile = parentData.getModel().getPomFile();
if ( pomFile != null )
{
+ FileModelSource pomSource = new FileModelSource( pomFile );
ModelSource expectedParentSource = getParentPomFile( childModel, childSource );
if ( expectedParentSource == null || ( expectedParentSource instanceof ModelSource2
- && !pomFile.toURI().equals( ( (ModelSource2) expectedParentSource ).getLocationURI() ) ) )
+ && !pomSource.equals( expectedParentSource ) ) )
{
parentData = readParentExternally( childModel, request, problems );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
index a2e114176950..aa80b2f899de 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
@@ -80,4 +80,27 @@ public URI getLocationURI()
{
return getFile().toURI();
}
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ {
+ return true;
+ }
+
+ if ( ( obj == null ) || !( obj instanceof FileModelSource ) )
+ {
+ return false;
+ }
+ FileModelSource other = ( FileModelSource ) obj;
+ return getFile().equals( other.getFile() );
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return super.hashCode();
+ }
+
}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
new file mode 100644
index 000000000000..a2e1854004bc
--- /dev/null
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
@@ -0,0 +1,74 @@
+package org.apache.maven.model.building;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.io.File;
+import junit.framework.TestCase;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import org.apache.commons.lang3.SystemUtils;
+import static org.junit.Assume.assumeTrue;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+/**
+ *
+ * @author fabiano
+ */
+public class FileModelSourceTest
+{
+
+ @Rule
+ public TemporaryFolder folder = new TemporaryFolder();
+
+ /**
+ * Test of equals method, of class FileModelSource.
+ */
+ @Test
+ public void testEquals()
+ throws Exception
+ {
+ File tempFile = File.createTempFile( "pomTest-", ".xml" );
+ tempFile.deleteOnExit();
+ FileModelSource instance = new FileModelSource( tempFile );
+
+ assertFalse( instance.equals( null ) );
+ assertFalse( instance.equals( new Object() ) );
+ assertTrue( instance.equals( instance ) );
+ assertTrue( instance.equals( new FileModelSource( tempFile ) ) );
+ }
+
+ @Test
+ public void testWindowsPaths()
+ throws Exception
+ {
+ assumeTrue( SystemUtils.IS_OS_WINDOWS );
+
+ File upperCaseFolder = folder.newFolder( "TESTE" );
+ String absolutePath = upperCaseFolder.getAbsolutePath();
+ File lowerCaseFolder = new File( absolutePath.toLowerCase() );
+
+ FileModelSource upperCaseFolderSouce = new FileModelSource( upperCaseFolder );
+ FileModelSource lowerCaseFolderSouce = new FileModelSource( lowerCaseFolder );
+
+ assertTrue( upperCaseFolderSouce.equals( lowerCaseFolderSouce ) );
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index d822c1fa5207..d504e02be405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,6 +147,9 @@ under the License.
Joseph Walton (MNG-5297)
+
+ Fabiano Cipriano de Oliveira (MNG-6261)
+