diff --git a/0001-Port-to-Maven-3-API.patch b/0001-Port-to-Maven-3-API.patch index 455b235..5c04188 100644 --- a/0001-Port-to-Maven-3-API.patch +++ b/0001-Port-to-Maven-3-API.patch @@ -1,23 +1,23 @@ -From bc6624eea53b697f920a27939c73e4ab9dfbad4f Mon Sep 17 00:00:00 2001 +From 6a4c8a3177ad95989baa4df28d8a3479faf8be8c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 12 Oct 2015 15:48:16 +0200 Subject: [PATCH] Port to Maven 3 API --- - enforcer-rules/pom.xml | 8 +++++-- - .../plugins/enforcer/AbstractBanDependencies.java | 5 +++- - .../enforcer/BanTransitiveDependencies.java | 3 ++- - .../plugins/enforcer/DependencyConvergence.java | 27 +++++++++------------- - .../plugins/enforcer/RequireMavenVersion.java | 5 ++-- - .../plugins/enforcer/RequireNoRepositories.java | 9 ++------ - .../plugins/enforcer/RequirePluginVersions.java | 26 +++++++++------------ - .../plugins/enforcer/RequireUpperBoundDeps.java | 27 +++++++++------------- - .../enforcer/utils/DependencyVersionMap.java | 4 ++-- - .../plugins/enforcer/utils/EnforcerRuleUtils.java | 21 +++++++++-------- - maven-enforcer-plugin/pom.xml | 4 ---- - .../maven/plugins/enforcer/DisplayInfoMojo.java | 4 ++-- - pom.xml | 19 +++++++++------ - 13 files changed, 77 insertions(+), 85 deletions(-) + enforcer-rules/pom.xml | 8 +++- + .../plugins/enforcer/AbstractBanDependencies.java | 14 ++++-- + .../enforcer/BanTransitiveDependencies.java | 7 ++- + .../plugins/enforcer/DependencyConvergence.java | 31 +++++------- + .../plugins/enforcer/RequireMavenVersion.java | 5 +- + .../plugins/enforcer/RequireNoRepositories.java | 9 +--- + .../plugins/enforcer/RequirePluginVersions.java | 45 +++++++----------- + .../plugins/enforcer/RequireUpperBoundDeps.java | 32 +++++-------- + .../enforcer/utils/DependencyVersionMap.java | 4 +- + .../plugins/enforcer/utils/EnforcerRuleUtils.java | 55 +++++----------------- + maven-enforcer-plugin/pom.xml | 4 -- + .../maven/plugins/enforcer/DisplayInfoMojo.java | 4 +- + pom.xml | 19 +++++--- + 13 files changed, 94 insertions(+), 143 deletions(-) diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml index 5ecd495..379bef0 100644 @@ -48,7 +48,7 @@ index 5ecd495..379bef0 100644 plexus-utils diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java -index 960ef40..b5909ac 100644 +index 960ef40..954ea2b 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java @@ -23,12 +23,15 @@ import org.apache.maven.artifact.Artifact; @@ -57,51 +57,85 @@ index 960ef40..b5909ac 100644 import org.apache.maven.plugin.logging.Log; +import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; ++import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; import org.apache.maven.shared.dependency.graph.DependencyNode; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; + -+import java.util.Collections; import java.util.HashSet; import java.util.Set; -@@ -124,7 +127,7 @@ public abstract class AbstractBanDependencies +@@ -58,10 +61,11 @@ public abstract class AbstractBanDependencies + { + + // get the project +- MavenProject project = null; ++ ProjectBuildingRequest projectBuildingRequest = null; + try + { +- project = (MavenProject) helper.evaluate( "${project}" ); ++ projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) ); ++ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) ); + } + catch ( ExpressionEvaluationException eee ) + { +@@ -88,7 +92,7 @@ public abstract class AbstractBanDependencies + } + + // get the correct list of dependencies +- Set dependencies = getDependenciesToCheck( project ); ++ Set dependencies = getDependenciesToCheck( projectBuildingRequest ); + + // look for banned dependencies + Set foundExcludes = checkDependencies( dependencies, helper.getLog() ); +@@ -119,12 +123,12 @@ public abstract class AbstractBanDependencies + return "Found Banned Dependency: " + artifact.getId() + "\n"; + } + +- protected Set getDependenciesToCheck( MavenProject project ) ++ protected Set getDependenciesToCheck( ProjectBuildingRequest projectBuildingRequest ) + { Set dependencies = null; try { - DependencyNode node = graphBuilder.buildDependencyGraph( project, null ); -+ DependencyNode node = graphBuilder.buildDependencyGraph( new DefaultProjectBuildingRequest(), null, Collections.singleton( project ) ); ++ DependencyNode node = graphBuilder.buildDependencyGraph( projectBuildingRequest, null ); if ( searchTransitive ) { dependencies = getAllDescendants( node ); diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java -index c40e057..73bfd1d 100644 +index c40e057..deb149c 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java -@@ -27,6 +27,7 @@ import org.apache.maven.enforcer.rule.api.EnforcerRule; +@@ -27,7 +27,9 @@ import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.plugins.enforcer.utils.ArtifactMatcher; +import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; ++import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; import org.apache.maven.shared.dependency.graph.DependencyNode; -@@ -157,7 +158,7 @@ public class BanTransitiveDependencies + import org.apache.maven.shared.dependency.graph.internal.DefaultDependencyGraphBuilder; +@@ -156,8 +158,9 @@ public class BanTransitiveDependencies + try { - MavenProject project = (MavenProject) helper.evaluate( "${project}" ); +- MavenProject project = (MavenProject) helper.evaluate( "${project}" ); - rootNode = createDependencyGraphBuilder().buildDependencyGraph( project, null ); -+ rootNode = createDependencyGraphBuilder().buildDependencyGraph( new DefaultProjectBuildingRequest(), null, Collections.singleton( project ) ); ++ ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) ); ++ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) ); ++ rootNode = createDependencyGraphBuilder().buildDependencyGraph( projectBuildingRequest, null ); } catch ( Exception e ) { diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java -index 6d42810..a607304 100644 +index 6d42810..46ed075 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java -@@ -24,20 +24,18 @@ import java.util.Collections; +@@ -24,20 +24,19 @@ import java.util.Collections; import java.util.List; import org.apache.maven.artifact.Artifact; @@ -120,18 +154,22 @@ index 6d42810..a607304 100644 -import org.apache.maven.shared.dependency.tree.DependencyNode; -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; ++import org.apache.maven.project.ProjectBuildingRequest; +import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; +import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; +import org.apache.maven.shared.dependency.graph.DependencyNode; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.i18n.I18N; -@@ -78,17 +76,14 @@ public class DependencyConvergence +@@ -77,18 +76,14 @@ public class DependencyConvergence + { try { - MavenProject project = (MavenProject) helper.evaluate( "${project}" ); +- MavenProject project = (MavenProject) helper.evaluate( "${project}" ); - DependencyTreeBuilder dependencyTreeBuilder = - (DependencyTreeBuilder) helper.getComponent( DependencyTreeBuilder.class ); ++ ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) ); ++ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) ); + DependencyGraphBuilder dependencyGraphBuilder = + (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class ); ArtifactRepository repository = (ArtifactRepository) helper.evaluate( "${localRepository}" ); @@ -140,12 +178,11 @@ index 6d42810..a607304 100644 - (ArtifactMetadataSource) helper.getComponent( ArtifactMetadataSource.class ); - ArtifactCollector collector = (ArtifactCollector) helper.getComponent( ArtifactCollector.class ); ArtifactFilter filter = null; // we need to evaluate all scopes -+ DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(); -+ projectBuildingRequest.setLocalRepository( repository ); - DependencyNode node = +- DependencyNode node = - dependencyTreeBuilder.buildDependencyTree( project, repository, factory, metadataSource, filter, - collector ); -+ dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, filter, Collections.singleton( project ) ); ++ projectBuildingRequest.setLocalRepository( repository ); ++ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, filter ); return node; } catch ( ExpressionEvaluationException e ) @@ -220,7 +257,7 @@ index bc225b7..9bc9762 100644 throw new EnforcerRuleException( e.getLocalizedMessage() ); } diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java -index 4b1a8b4..aaf6927 100644 +index 4b1a8b4..f6754b9 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java @@ -40,7 +40,6 @@ import org.apache.maven.artifact.factory.ArtifactFactory; @@ -231,19 +268,53 @@ index 4b1a8b4..aaf6927 100644 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; -@@ -66,8 +65,11 @@ import org.apache.maven.plugin.version.PluginVersionNotFoundException; +@@ -66,8 +65,12 @@ import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtils; import org.apache.maven.plugins.enforcer.utils.PluginWrapper; +import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; ++import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.settings.Settings; +import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.ReflectionUtils; -@@ -345,11 +347,7 @@ public class RequirePluginVersions +@@ -169,12 +172,6 @@ public class RequirePluginVersions + /** The resolver. */ + ArtifactResolver resolver; + +- /** The local. */ +- ArtifactRepository local; +- +- /** The remote repositories. */ +- List remoteRepositories; +- + /** The log. */ + Log log; + +@@ -223,8 +220,8 @@ public class RequirePluginVersions + pluginManager = (PluginManager) helper.getComponent( PluginManager.class ); + factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class ); + resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class ); +- local = (ArtifactRepository) helper.evaluate( "${localRepository}" ); +- remoteRepositories = project.getRemoteArtifactRepositories(); ++ ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) ); ++ projectBuildingRequest.setProject( project ); + + utils = new EnforcerRuleUtils( helper ); + +@@ -296,7 +293,7 @@ public class RequirePluginVersions + { + newMsg.append( ". \tThe version currently in use is " ); + +- Plugin currentPlugin = findCurrentPlugin( plugin, project ); ++ Plugin currentPlugin = findCurrentPlugin( plugin, projectBuildingRequest ); + + if ( currentPlugin != null ) + { +@@ -345,11 +342,7 @@ public class RequirePluginVersions { throw new EnforcerRuleException( e.getLocalizedMessage() ); } @@ -256,14 +327,47 @@ index 4b1a8b4..aaf6927 100644 { throw new EnforcerRuleException( e.getLocalizedMessage() ); } -@@ -560,14 +558,13 @@ public class RequirePluginVersions +@@ -519,12 +512,12 @@ public class RequirePluginVersions + * @param project project to search + * @return matching plugin, null if not found. + */ +- protected Plugin findCurrentPlugin( Plugin plugin, MavenProject project ) ++ protected Plugin findCurrentPlugin( Plugin plugin, ProjectBuildingRequest projectBuildingRequest ) + { + Plugin found = null; + try + { +- Model model = project.getModel(); ++ Model model = projectBuildingRequest.getProject().getModel(); + @SuppressWarnings( "unchecked" ) + Map plugins = model.getBuild().getPluginsAsMap(); + found = plugins.get( plugin.getKey() ); +@@ -536,7 +529,7 @@ public class RequirePluginVersions + + if ( found == null ) + { +- found = resolvePlugin( plugin, project ); ++ found = resolvePlugin( plugin, projectBuildingRequest ); + } + + return found; +@@ -549,25 +542,20 @@ public class RequirePluginVersions + * @param project the project + * @return the plugin + */ +- protected Plugin resolvePlugin( Plugin plugin, MavenProject project ) ++ protected Plugin resolvePlugin( Plugin plugin, ProjectBuildingRequest projectBuildingRequest ) + { + + @SuppressWarnings( "unchecked" ) +- List pluginRepositories = project.getPluginArtifactRepositories(); + Artifact artifact = + factory.createPluginArtifact( plugin.getGroupId(), plugin.getArtifactId(), + VersionRange.createFromVersion( "LATEST" ) ); try { - this.resolver.resolve( artifact, pluginRepositories, this.local ); -+ DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(); -+ projectBuildingRequest.setLocalRepository( local ); -+ projectBuildingRequest.setPluginArtifactRepositories( pluginRepositories ); + this.resolver.resolveArtifact( projectBuildingRequest, artifact ); plugin.setVersion( artifact.getVersion() ); } @@ -276,7 +380,7 @@ index 4b1a8b4..aaf6927 100644 { //What does this mean? } -@@ -1048,13 +1045,12 @@ public class RequirePluginVersions +@@ -1048,13 +1036,12 @@ public class RequirePluginVersions * * @param project the project * @return the all plugin entries wrapped in a PluginWrapper Object @@ -293,7 +397,7 @@ index 4b1a8b4..aaf6927 100644 List plugins = new ArrayList(); // get all the pom models diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java -index 71210e2..0209fe1 100644 +index 71210e2..5642746 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java @@ -26,10 +26,7 @@ import java.util.List; @@ -307,7 +411,7 @@ index 71210e2..0209fe1 100644 import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -@@ -37,11 +34,12 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException; +@@ -37,11 +34,13 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.plugin.logging.Log; @@ -317,6 +421,7 @@ index 71210e2..0209fe1 100644 -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; -import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; ++import org.apache.maven.project.ProjectBuildingRequest; +import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; +import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; +import org.apache.maven.shared.dependency.graph.DependencyNode; @@ -324,30 +429,31 @@ index 71210e2..0209fe1 100644 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.i18n.I18N; -@@ -93,17 +91,14 @@ public class RequireUpperBoundDeps +@@ -92,18 +91,11 @@ public class RequireUpperBoundDeps + { try { - MavenProject project = (MavenProject) helper.evaluate( "${project}" ); +- MavenProject project = (MavenProject) helper.evaluate( "${project}" ); - DependencyTreeBuilder dependencyTreeBuilder = - (DependencyTreeBuilder) helper.getComponent( DependencyTreeBuilder.class ); -+ DependencyGraphBuilder dependencyGraphBuilder = -+ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class ); - ArtifactRepository repository = (ArtifactRepository) helper.evaluate( "${localRepository}" ); +- ArtifactRepository repository = (ArtifactRepository) helper.evaluate( "${localRepository}" ); - ArtifactFactory factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class ); - ArtifactMetadataSource metadataSource = - (ArtifactMetadataSource) helper.getComponent( ArtifactMetadataSource.class ); - ArtifactCollector collector = (ArtifactCollector) helper.getComponent( ArtifactCollector.class ); - ArtifactFilter filter = null; // we need to evaluate all scopes -+ DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(); -+ projectBuildingRequest.setLocalRepository( repository ); - DependencyNode node = +- ArtifactFilter filter = null; // we need to evaluate all scopes +- DependencyNode node = - dependencyTreeBuilder.buildDependencyTree( project, repository, factory, metadataSource, filter, - collector ); -+ dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, filter, Collections.singleton( project ) ); ++ ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) ); ++ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) ); ++ DependencyGraphBuilder dependencyGraphBuilder = ++ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class ); ++ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null ); return node; } catch ( ExpressionEvaluationException e ) -@@ -114,7 +109,7 @@ public class RequireUpperBoundDeps +@@ -114,7 +106,7 @@ public class RequireUpperBoundDeps { throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e ); } @@ -372,7 +478,7 @@ index 2ec4ac2..ece772b 100644 /** * @author Brian Fox diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java -index 386b629..ab58b98 100644 +index 386b629..cb83e92 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java @@ -28,9 +28,6 @@ import java.util.List; @@ -385,18 +491,78 @@ index 386b629..ab58b98 100644 import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; -@@ -38,7 +35,10 @@ import org.apache.maven.model.Plugin; +@@ -38,7 +35,11 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; ++import org.apache.maven.project.ProjectBuildingRequest; +import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.ReaderFactory; -@@ -163,13 +163,12 @@ public class EnforcerRuleUtils +@@ -60,45 +61,16 @@ public class EnforcerRuleUtils + /** The resolver. */ + ArtifactResolver resolver; + +- /** The local. */ +- ArtifactRepository local; +- +- /** The remote repositories. */ +- List remoteRepositories; +- + /** The log. */ + Log log; + +- /** The project. */ +- MavenProject project; ++ ProjectBuildingRequest projectBuildingRequest; + + private EnforcerRuleHelper helper; + + /** + * Instantiates a new enforcer rule utils. + * +- * @param theFactory the the factory +- * @param theResolver the the resolver +- * @param theLocal the the local +- * @param theRemoteRepositories the the remote repositories +- * @param project the project +- * @param theLog the the log +- */ +- public EnforcerRuleUtils( ArtifactFactory theFactory, ArtifactResolver theResolver, ArtifactRepository theLocal, +- List theRemoteRepositories, MavenProject project, Log theLog ) +- { +- super(); +- this.factory = theFactory; +- this.resolver = theResolver; +- this.local = theLocal; +- this.remoteRepositories = theRemoteRepositories; +- this.log = theLog; +- this.project = project; +- } +- +- /** +- * Instantiates a new enforcer rule utils. +- * + * @param helper the helper + */ + @SuppressWarnings( "unchecked" ) +@@ -112,9 +84,8 @@ public class EnforcerRuleUtils + { + factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class ); + resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class ); +- local = (ArtifactRepository) helper.evaluate( "${localRepository}" ); +- project = (MavenProject) helper.evaluate( "${project}" ); +- remoteRepositories = project.getRemoteArtifactRepositories(); ++ projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) ); ++ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) ); + } + catch ( ComponentLookupException e ) + { +@@ -163,13 +134,12 @@ public class EnforcerRuleUtils * @param version the version * @param pom the pom * @return the pom model @@ -412,19 +578,16 @@ index 386b629..ab58b98 100644 { Model model = null; -@@ -206,7 +205,10 @@ public class EnforcerRuleUtils +@@ -206,7 +176,7 @@ public class EnforcerRuleUtils if ( !found ) { Artifact pomArtifact = factory.createArtifact( groupId, artifactId, version, null, "pom" ); - resolver.resolve( pomArtifact, remoteRepositories, local ); -+ DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(); -+ projectBuildingRequest.setLocalRepository( local ); -+ projectBuildingRequest.setRemoteRepositories( remoteRepositories ); + resolver.resolveArtifact( projectBuildingRequest, pomArtifact ); model = readModel( pomArtifact.getFile() ); } -@@ -221,13 +223,12 @@ public class EnforcerRuleUtils +@@ -221,13 +191,12 @@ public class EnforcerRuleUtils * @param version the version * @param pom the pom * @return the models recursively diff --git a/maven-enforcer.spec b/maven-enforcer.spec index 7257998..066a00e 100644 --- a/maven-enforcer.spec +++ b/maven-enforcer.spec @@ -1,6 +1,6 @@ Name: maven-enforcer Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Enforcer License: ASL 2.0 URL: http://maven.apache.org/enforcer @@ -88,6 +88,9 @@ sed -e "s|plexus-maven-plugin|plexus-compon %doc LICENSE NOTICE %changelog +* Mon Oct 12 2015 Mikolaj Izdebski - 1.4.1-3 +- Fix Maven 3 patch + * Mon Oct 12 2015 Mikolaj Izdebski - 1.4.1-2 - Port to Maven 3 API