You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/12/28 22:46:22 UTC
[maven] branch MNG-6213 updated (859e344 -> 9c94626)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6213
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 859e344 [MNG-6213] Validate scope in dependencyManagement
new 9c94626 [MNG-6213] Validate scope in dependencyManagement
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 (859e344)
\
N -- N -- N refs/heads/MNG-6213 (9c94626)
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:
.../validation/bad-dependency-management-scope.xml | 144 ++++++++++-----------
1 file changed, 72 insertions(+), 72 deletions(-)
[maven] 01/01: [MNG-6213] Validate scope in dependencyManagement
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6213
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 9c946263facbfa851fb646b3fac62cf1d3302ded
Author: Michael Warnecke <13...@nordakademie.de>
AuthorDate: Sat Sep 23 18:37:09 2017 +0200
[MNG-6213] Validate scope in dependencyManagement
This closes #131
---
.../model/validation/DefaultModelValidator.java | 10 ++-
.../validation/DefaultModelValidatorTest.java | 10 +++
.../validation/bad-dependency-management-scope.xml | 72 ++++++++++++++++++++++
3 files changed, 90 insertions(+), 2 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 1c84776..f58d03a 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
@@ -105,13 +105,13 @@ public class DefaultModelValidator
+ ", the parent element cannot have the same groupId:artifactId as the project.",
parent );
}
-
+
if ( equals( "LATEST", parent.getVersion() ) || equals( "RELEASE", parent.getVersion() ) )
{
addViolation( problems, Severity.WARNING, Version.BASE, "parent.version", null,
"is either LATEST or RELEASE (both of them are being deprecated)", parent );
}
-
+
}
if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
@@ -598,6 +598,12 @@ public class DefaultModelValidator
validateEffectiveModelAgainstDependency( prefix, problems, m, d, request );
}
+ else
+ {
+ validateEnum( prefix + "scope", problems, Severity.WARNING, Version.V20, d.getScope(),
+ d.getManagementKey(), d, "provided", "compile", "runtime", "test", "system",
+ "import" );
+ }
}
}
}
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 3f31526..a9d4c00 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
@@ -339,6 +339,16 @@ public class DefaultModelValidatorTest
assertTrue( result.getWarnings().get( 1 ).contains( "test:g" ) );
}
+ public void testBadDependencyManagementScope()
+ throws Exception
+ {
+ SimpleProblemCollector result = validate( "bad-dependency-management-scope.xml" );
+
+ assertViolations( result, 0, 0, 1 );
+
+ assertContains( result.getWarnings().get( 0 ), "test:g" );
+ }
+
public void testBadDependencyVersion()
throws Exception
{
diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml b/maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml
new file mode 100644
index 0000000..be07267
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml
@@ -0,0 +1,72 @@
+<!--
+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>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>aid</artifactId>
+ <groupId>gid</groupId>
+ <version>0.1</version>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>c</artifactId>
+ <version>0.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>d</artifactId>
+ <version>0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>e</artifactId>
+ <version>0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>f</artifactId>
+ <version>0.2</version>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>g</artifactId>
+ <version>1</version>
+ <type>pom</type>
+ <scope>include</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>