You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2018/10/18 22:53:14 UTC
[maven] branch MNG-6490 updated (8a6354c -> 4f8275b)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6490
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 8a6354c [MNG-6490] Maven fails reporting circular dependency when the dependency is a classified secondary artifact
new 4f8275b [MNG-6490] Maven fails reporting circular dependency when the dependency is a classified secondary artifact
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8a6354c)
\
N -- N -- N refs/heads/MNG-6490 (4f8275b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/maven/model/validation/DefaultModelValidator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 01/01: [MNG-6490] Maven fails reporting circular dependency
when the dependency is a classified secondary artifact
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6490
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4f8275b7a4315e322ff3dc4e53f11d259bb9cd4c
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Oct 18 23:34:30 2018 +0200
[MNG-6490] Maven fails reporting circular dependency when the dependency is a classified secondary artifact
---
.../model/validation/DefaultModelValidator.java | 22 ++++++------
.../validation/DefaultModelValidatorTest.java | 7 ++++
.../raw-model/self-referencing-classifier.xml | 39 ++++++++++++++++++++++
3 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index 4018618..1c84776 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -546,21 +546,21 @@ public class DefaultModelValidator
List<Dependency> dependencies, String prefix,
ModelBuildingRequest request )
{
- // We only check for groupId/artifactId cause if there is another
- // module with the same groupId/artifactId this will fail the build
+ // We only check for groupId/artifactId/version/classifier cause if there is another
+ // module with the same groupId/artifactId/version/classifier this will fail the build
// earlier like "Project '...' is duplicated in the reactor.
- // So it is sufficient to check only groupId/artifactId and not the
+ // So it is sufficient to check only groupId/artifactId/version/classifier and not the
// packaging type.
for ( Dependency dependency : dependencies )
{
- String key = dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion();
+ String key = dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion()
+ + ( dependency.getClassifier() != null ? ":" + dependency.getClassifier() : "" );
String mKey = m.getGroupId() + ":" + m.getArtifactId() + ":" + m.getVersion();
if ( key.equals( mKey ) )
{
// This means a module which is build has a dependency which has the same
- // groupId, artifactId and version coordinates. This is in consequence
- // a self reference or in other words a circular reference which can not
- // being resolved.
+ // groupId, artifactId, version and classifier coordinates. This is in consequence
+ // a self reference or in other words a circular reference which can not being resolved.
addViolation( problems, Severity.FATAL, Version.V31, prefix + " " + key, key, "is referencing itself.",
dependency );
@@ -605,14 +605,14 @@ public class DefaultModelValidator
private void validateEffectiveModelAgainstDependency( String prefix, ModelProblemCollector problems, Model m,
Dependency d, ModelBuildingRequest request )
{
- String key = d.getGroupId() + ":" + d.getArtifactId() + ":" + d.getVersion();
+ String key = d.getGroupId() + ":" + d.getArtifactId() + ":" + d.getVersion()
+ + ( d.getClassifier() != null ? ":" + d.getClassifier() : "" );
String mKey = m.getGroupId() + ":" + m.getArtifactId() + ":" + m.getVersion();
if ( key.equals( mKey ) )
{
// This means a module which is build has a dependency which has the same
- // groupId, artifactId and version coordinates. This is in consequence
- // a self reference or in other words a circular reference which can not
- // being resolved.
+ // groupId, artifactId, version and classifier coordinates. This is in consequence
+ // a self reference or in other words a circular reference which can not being resolved.
addViolation( problems, Severity.FATAL, Version.V31, prefix + " " + key, key, "is referencing itself.", d );
}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index b02e0d9..3f31526 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -729,6 +729,13 @@ public class DefaultModelValidatorTest
}
+ public void testSelfReferencingDependencyWithClassifierInRawModel() throws Exception
+ {
+ SimpleProblemCollector result = validateRaw( "raw-model/self-referencing-classifier.xml" );
+
+ assertViolations( result, 0, 0, 0 );
+ }
+
public void testCiFriendlySha1()
throws Exception
{
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml
new file mode 100644
index 0000000..099e501
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml
@@ -0,0 +1,39 @@
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>testvalidpom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <description>
+ This will test if the module validator recognized that this dependency with classifier
+ is not the same as the module itself.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>com.example.group</groupId>
+ <artifactId>testvalidpom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <classifier>linux</classifier>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file