You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/06/08 21:52:03 UTC
svn commit: r1491049 - in /maven/enforcer/trunk:
enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/
enforcer-rules/src/site/apt/ maven-enforcer-plugin/src/it/mrm/repository/
maven-enforcer-plugin/src/it/projects/require-upper-bound-depende...
Author: rfscholte
Date: Sat Jun 8 19:52:01 2013
New Revision: 1491049
URL: http://svn.apache.org/r1491049
Log:
[MENFORCER-134] Require Upper Bound Dependencies and matching Snapshot Dependencies
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.042904-7222.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.044324-5638.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_modelbuilder-1.0-SNAPSHOT.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_project-1.0-SNAPSHOT.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/invoker.properties
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireUpperBoundDeps.apt.vm
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java?rev=1491049&r1=1491048&r2=1491049&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java Sat Jun 8 19:52:01 2013
@@ -60,6 +60,21 @@ public class RequireUpperBoundDeps
private static I18N i18n;
/**
+ * @since 1.3
+ */
+ private boolean uniqueVersions;
+
+ /**
+ *
+ * @param uniqueVersions
+ * @since 1.3
+ */
+ public void setUniqueVersions( boolean uniqueVersions )
+ {
+ this.uniqueVersions = uniqueVersions;
+ }
+
+ /**
* Uses the {@link EnforcerRuleHelper} to populate the values of the
* {@link DependencyTreeBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)}
* factory method. <br/>
@@ -117,6 +132,7 @@ public class RequireUpperBoundDeps
}
DependencyNode node = getNode( helper );
RequireUpperBoundDepsVisitor visitor = new RequireUpperBoundDepsVisitor();
+ visitor.setUniqueVersions( uniqueVersions );
node.accept( visitor );
List<String> errorMessages = buildErrorMessages( visitor.getConflicts() );
if ( errorMessages.size() > 0 )
@@ -193,6 +209,13 @@ public class RequireUpperBoundDeps
private static class RequireUpperBoundDepsVisitor
implements DependencyNodeVisitor
{
+
+ private boolean uniqueVersions;
+
+ public void setUniqueVersions( boolean uniqueVersions )
+ {
+ this.uniqueVersions = uniqueVersions;
+ }
private Map<String, List<DependencyNodeHopCountPair>> keyToPairsMap =
new LinkedHashMap<String, List<DependencyNodeHopCountPair>>();
@@ -238,10 +261,10 @@ public class RequireUpperBoundDeps
@SuppressWarnings( "unchecked" )
private boolean containsConflicts( List<DependencyNodeHopCountPair> pairs )
{
- ArtifactVersion resolvedVersion = pairs.get( 0 ).extractArtifactVersion();
+ ArtifactVersion resolvedVersion = pairs.get( 0 ).extractArtifactVersion( uniqueVersions );
for ( DependencyNodeHopCountPair pair : pairs )
{
- ArtifactVersion version = pair.extractArtifactVersion();
+ ArtifactVersion version = pair.extractArtifactVersion( uniqueVersions );
if ( resolvedVersion.compareTo( version ) < 0 )
{
return true;
@@ -288,10 +311,10 @@ public class RequireUpperBoundDeps
return node;
}
- private ArtifactVersion extractArtifactVersion()
+ private ArtifactVersion extractArtifactVersion( boolean uniqueVersions )
{
Artifact artifact = node.getArtifact();
- String version = artifact.getVersion();
+ String version = uniqueVersions ? artifact.getVersion() : artifact.getBaseVersion();
if ( version != null )
{
return new DefaultArtifactVersion( version );
@@ -315,7 +338,6 @@ public class RequireUpperBoundDeps
{
return Integer.valueOf( hopCount ).compareTo( Integer.valueOf( other.getHopCount() ) );
}
-
}
}
Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requireUpperBoundDeps.apt.vm
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/requireUpperBoundDeps.apt.vm?rev=1491049&r1=1491048&r2=1491049&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/site/apt/requireUpperBoundDeps.apt.vm (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/apt/requireUpperBoundDeps.apt.vm Sat Jun 8 19:52:01 2013
@@ -84,7 +84,6 @@ and
</dependencies>
-----------------------------------------------------------------------------------
-
Here is how a project should be setup to use this rule
-----------------------------------------------------------------------------------
@@ -102,7 +101,10 @@ and
<id>enforce</id>
<configuration>
<rules>
- <requireUpperBoundDeps/>
+ <requireUpperBoundDeps>
+ <!-- 'uniqueVersions' (default:false) can be set to true if you want to compare the timestamped SNAPSHOTs -->
+ <!-- <uniqueVersions>true</uniqueVersions> -->
+ </requireUpperBoundDeps>
</rules>
</configuration>
<goals>
@@ -117,3 +119,5 @@ and
...
</project>
-----------------------------------------------------------------------------------
+
+
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.042904-7222.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.042904-7222.pom?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.042904-7222.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.042904-7222.pom Sat Jun 8 19:52:01 2013
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_model</artifactId>
+ <version>1.0-SNAPSHOT</version>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.044324-5638.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.044324-5638.pom?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.044324-5638.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_model-1.0-20130423.044324-5638.pom Sat Jun 8 19:52:01 2013
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_model</artifactId>
+ <version>1.0-SNAPSHOT</version>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_modelbuilder-1.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_modelbuilder-1.0-SNAPSHOT.pom?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_modelbuilder-1.0-SNAPSHOT.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_modelbuilder-1.0-SNAPSHOT.pom Sat Jun 8 19:52:01 2013
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_modelbuilder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_model</artifactId>
+ <version>1.0-20130423.044324-5638</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_project-1.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_project-1.0-SNAPSHOT.pom?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_project-1.0-SNAPSHOT.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer134_project-1.0-SNAPSHOT.pom Sat Jun 8 19:52:01 2013
@@ -0,0 +1,19 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_modelbuilder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_model</artifactId>
+ <version>1.0-20130423.042904-7222</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/invoker.properties
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/invoker.properties?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/invoker.properties (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/invoker.properties Sat Jun 8 19:52:01 2013
@@ -0,0 +1 @@
+invoker.buildResult=failure
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml Sat Jun 8 19:52:01 2013
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.enforcer.its</groupId>
+ <artifactId>requireUpperBoundDependenciesUnique</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireUpperBoundDeps>
+ <unique>true</unique>
+ </requireUpperBoundDeps>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml?rev=1491049&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml Sat Jun 8 19:52:01 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.enforcer.its</groupId>
+ <artifactId>requireUpperBoundDependenciesUnique</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireUpperBoundDeps/> <!-- 'unique' is false by default -->
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer134_project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </project>
\ No newline at end of file