rpms/maven-enforcer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream verssion 3.0.0~M2

Browse Source
This commit is contained in:
Marian Koncek 2019-08-08 09:50:08 +02:00
parent c7a38aa573
commit e956ca25cf
4 changed files with 138 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ enforcer-1.0-beta-2.tar.xz
/enforcer-1.3.1-source-release.zip
/enforcer-1.4-source-release.zip
/enforcer-1.4.1-source-release.zip
/enforcer-3.0.0-M2-source-release.zip

396
0001-Port-to-Maven-3-API.patch
View File

@ -4,31 +4,23 @@ 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 | 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(-)
enforcer-rules/pom.xml | 6 ++-
.../enforcer/AbstractBanDependencies.java | 13 +++--
.../enforcer/BanTransitiveDependencies.java | 7 ++-
.../maven/plugins/enforcer/BannedPlugins.java | 7 +--
.../enforcer/DependencyConvergence.java | 29 +++++------
.../enforcer/RequirePluginVersions.java | 48 +++++++------------
.../enforcer/RequireUpperBoundDeps.java | 31 +++++-------
.../enforcer/utils/DependencyVersionMap.java | 6 +--
.../enforcer/utils/EnforcerRuleUtils.java | 40 +++-------------
pom.xml | 11 +++--
10 files changed, 80 insertions(+), 118 deletions(-)
diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml
index 5ecd495..379bef0 100644
index 2b3dd62..c68a7da 100644
--- a/enforcer-rules/pom.xml
+++ b/enforcer-rules/pom.xml
@@ -43,17 +43,21 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
@@ -43,12 +43,16 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@ -39,19 +31,18 @@ index 5ecd495..379bef0 100644
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
</dependency>
<dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
+ </dependency>
+ <dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
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..954ea2b 100644
index bab10ef..b791781 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;
@@ -23,7 +23,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.plugin.logging.Log;
@ -61,13 +52,7 @@ index 960ef40..954ea2b 100644
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.HashSet;
import java.util.Set;
@@ -58,10 +61,11 @@ public abstract class AbstractBanDependencies
@@ -53,10 +55,11 @@ public abstract class AbstractBanDependencies
{
// get the project
@ -77,11 +62,11 @@ index 960ef40..954ea2b 100644
{
- project = (MavenProject) helper.evaluate( "${project}" );
+ projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) );
+ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) );
+ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) );
}
catch ( ExpressionEvaluationException eee )
{
@@ -88,7 +92,7 @@ public abstract class AbstractBanDependencies
@@ -83,7 +86,7 @@ public abstract class AbstractBanDependencies
}
// get the correct list of dependencies
@ -90,7 +75,7 @@ index 960ef40..954ea2b 100644
// look for banned dependencies
Set<Artifact> foundExcludes = checkDependencies( dependencies, helper.getLog() );
@@ -119,12 +123,12 @@ public abstract class AbstractBanDependencies
@@ -114,12 +117,12 @@ public abstract class AbstractBanDependencies
return "Found Banned Dependency: " + artifact.getId() + "\n";
}
@ -106,7 +91,7 @@ index 960ef40..954ea2b 100644
{
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..deb149c 100644
index d6993c7..860969f 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,7 +27,9 @@ import org.apache.maven.enforcer.rule.api.EnforcerRule;
@ -119,20 +104,46 @@ index c40e057..deb149c 100644
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
import org.apache.maven.shared.dependency.graph.DependencyNode;
import org.apache.maven.shared.dependency.graph.internal.DefaultDependencyGraphBuilder;
@@ -156,8 +158,9 @@ public class BanTransitiveDependencies
@@ -157,8 +159,9 @@ public class BanTransitiveDependencies
try
{
- MavenProject project = (MavenProject) helper.evaluate( "${project}" );
- rootNode = createDependencyGraphBuilder().buildDependencyGraph( project, null );
+ ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) );
+ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) );
+ 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/BannedPlugins.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
index ddcfb26..6085f47 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
@@ -23,6 +23,7 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingRequest;
/**
* This rule checks that lists of plugins are not included.
@@ -32,10 +33,10 @@ import org.apache.maven.project.MavenProject;
public class BannedPlugins
extends BannedDependencies
{
- @Override
- protected Set<Artifact> getDependenciesToCheck( MavenProject project )
+ @Override
+ protected Set<Artifact> getDependenciesToCheck( ProjectBuildingRequest projectBuildingRequest )
{
- return project.getPluginArtifacts();
+ return projectBuildingRequest.getProject().getPluginArtifacts();
}
@Override
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..46ed075 100644
index 0f12a2d..dbc85d4 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,19 @@ import java.util.Collections;
@ -160,8 +171,8 @@ index 6d42810..46ed075 100644
+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;
@@ -77,18 +76,14 @@ public class DependencyConvergence
@@ -74,17 +73,13 @@ public class DependencyConvergence
{
try
{
@ -170,23 +181,21 @@ index 6d42810..46ed075 100644
- (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 );
+ DependencyGraphBuilder dependencyGraphBuilder = (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
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
- DependencyNode node =
- dependencyTreeBuilder.buildDependencyTree( project, repository, factory, metadataSource, filter,
- collector );
- DependencyNode node = dependencyTreeBuilder.buildDependencyTree( project, repository, factory,
- metadataSource, filter, collector );
+ projectBuildingRequest.setLocalRepository( repository );
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, filter );
return node;
}
catch ( ExpressionEvaluationException e )
@@ -99,9 +94,9 @@ public class DependencyConvergence
@@ -95,9 +90,9 @@ public class DependencyConvergence
{
throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e );
}
@ -198,69 +207,11 @@ index 6d42810..46ed075 100644
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java
index 46f83fd..5fab507 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java
@@ -20,9 +20,10 @@ package org.apache.maven.plugins.enforcer;
*/
import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-import org.apache.maven.execution.RuntimeInformation;
+import org.apache.maven.rtinfo.RuntimeInformation;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
@@ -46,7 +47,7 @@ public class RequireMavenVersion
try
{
RuntimeInformation rti = (RuntimeInformation) helper.getComponent( RuntimeInformation.class );
- ArtifactVersion detectedMavenVersion = rti.getApplicationVersion();
+ ArtifactVersion detectedMavenVersion = new DefaultArtifactVersion( rti.getMavenVersion() );
helper.getLog().debug( "Detected Maven Version: " + detectedMavenVersion );
enforceVersion( helper.getLog(), "Maven", getVersion(), detectedMavenVersion );
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
index bc225b7..9bc9762 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
@@ -25,14 +25,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtils;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -192,11 +191,7 @@ public class RequireNoRepositories
{
throw new EnforcerRuleException( e.getLocalizedMessage() );
}
- catch ( ArtifactResolutionException e )
- {
- throw new EnforcerRuleException( e.getLocalizedMessage() );
- }
- catch ( ArtifactNotFoundException e )
+ catch ( ArtifactResolverException e )
{
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..f6754b9 100644
index b78c6cf..f564d36 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;
@@ -37,7 +37,6 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@ -268,7 +219,7 @@ index 4b1a8b4..f6754b9 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,12 @@ import org.apache.maven.plugin.version.PluginVersionNotFoundException;
@@ -63,8 +62,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;
@ -281,7 +232,7 @@ index 4b1a8b4..f6754b9 100644
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.ReflectionUtils;
@@ -169,12 +172,6 @@ public class RequirePluginVersions
@@ -168,12 +171,6 @@ public class RequirePluginVersions
/** The resolver. */
ArtifactResolver resolver;
@ -294,7 +245,7 @@ index 4b1a8b4..f6754b9 100644
/** The log. */
Log log;
@@ -223,8 +220,8 @@ public class RequirePluginVersions
@@ -219,8 +216,8 @@ public class RequirePluginVersions
pluginManager = (PluginManager) helper.getComponent( PluginManager.class );
factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class );
resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class );
@ -305,7 +256,7 @@ index 4b1a8b4..f6754b9 100644
utils = new EnforcerRuleUtils( helper );
@@ -296,7 +293,7 @@ public class RequirePluginVersions
@@ -291,7 +288,7 @@ public class RequirePluginVersions
{
newMsg.append( ". \tThe version currently in use is " );
@ -314,7 +265,7 @@ index 4b1a8b4..f6754b9 100644
if ( currentPlugin != null )
{
@@ -345,11 +342,7 @@ public class RequirePluginVersions
@@ -340,11 +337,7 @@ public class RequirePluginVersions
{
throw new EnforcerRuleException( e.getLocalizedMessage() );
}
@ -327,7 +278,7 @@ index 4b1a8b4..f6754b9 100644
{
throw new EnforcerRuleException( e.getLocalizedMessage() );
}
@@ -519,12 +512,12 @@ public class RequirePluginVersions
@@ -513,12 +506,12 @@ public class RequirePluginVersions
* @param project project to search
* @return matching plugin, <code>null</code> if not found.
*/
@ -339,10 +290,10 @@ index 4b1a8b4..f6754b9 100644
{
- Model model = project.getModel();
+ Model model = projectBuildingRequest.getProject().getModel();
@SuppressWarnings( "unchecked" )
Map<String, Plugin> plugins = model.getBuild().getPluginsAsMap();
found = plugins.get( plugin.getKey() );
@@ -536,7 +529,7 @@ public class RequirePluginVersions
}
@@ -529,7 +522,7 @@ public class RequirePluginVersions
if ( found == null )
{
@ -351,15 +302,14 @@ index 4b1a8b4..f6754b9 100644
}
return found;
@@ -549,25 +542,20 @@ public class RequirePluginVersions
@@ -542,24 +535,18 @@ 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<ArtifactRepository> pluginRepositories = project.getPluginArtifactRepositories();
Artifact artifact =
factory.createPluginArtifact( plugin.getGroupId(), plugin.getArtifactId(),
@ -380,7 +330,7 @@ index 4b1a8b4..f6754b9 100644
{
//What does this mean?
}
@@ -1048,13 +1036,12 @@ public class RequirePluginVersions
@@ -1034,13 +1021,12 @@ public class RequirePluginVersions
*
* @param project the project
* @return the all plugin entries wrapped in a PluginWrapper Object
@ -396,8 +346,15 @@ index 4b1a8b4..f6754b9 100644
{
List<PluginWrapper> plugins = new ArrayList<PluginWrapper>();
// get all the pom models
@@ -1263,4 +1249,4 @@ public class RequirePluginVersions
{
return additionalPlugins;
}
-}
\ No newline at end of file
+}
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..5642746 100644
index da8da08..7299d3b 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;
@ -428,8 +385,8 @@ index 71210e2..5642746 100644
+import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.i18n.I18N;
@@ -92,18 +91,11 @@ public class RequireUpperBoundDeps
@@ -105,18 +104,10 @@ public class RequireUpperBoundDeps
{
try
{
@ -447,13 +404,12 @@ index 71210e2..5642746 100644
- collector );
+ ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) );
+ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) );
+ DependencyGraphBuilder dependencyGraphBuilder =
+ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
+ DependencyGraphBuilder dependencyGraphBuilder = (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null );
return node;
}
catch ( ExpressionEvaluationException e )
@@ -114,7 +106,7 @@ public class RequireUpperBoundDeps
@@ -127,7 +118,7 @@ public class RequireUpperBoundDeps
{
throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e );
}
@ -463,7 +419,7 @@ index 71210e2..5642746 100644
throw new EnforcerRuleException( "Could not build dependency tree " + e.getLocalizedMessage(), e );
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
index 2ec4ac2..ece772b 100644
index 64f6742..4d95ed9 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
@@ -26,8 +26,8 @@ import java.util.Map;
@ -477,23 +433,25 @@ index 2ec4ac2..ece772b 100644
/**
* @author Brian Fox
@@ -132,4 +132,4 @@ public class DependencyVersionMap
}
return output;
}
-}
\ No newline at end of file
+}
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..cb83e92 100644
index ef72a27..31c7885 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;
import org.apache.maven.artifact.Artifact;
@@ -23,12 +23,15 @@ import java.util.List;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
@@ -38,7 +35,11 @@ import org.apache.maven.model.Plugin;
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;
@ -502,8 +460,8 @@ index 386b629..cb83e92 100644
+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;
@@ -60,45 +61,16 @@ public class EnforcerRuleUtils
@@ -46,42 +49,14 @@ public class EnforcerRuleUtils
/** The resolver. */
ArtifactResolver resolver;
@ -516,15 +474,15 @@ index 386b629..cb83e92 100644
/** The log. */
Log log;
- /** The project. */
/** The project. */
- MavenProject project;
+ ProjectBuildingRequest projectBuildingRequest;
private EnforcerRuleHelper helper;
/**
* Instantiates a new enforcer rule utils.
*
- /**
- * Instantiates a new enforcer rule utils.
- *
- * @param theFactory the the factory
- * @param theResolver the the resolver
- * @param theLocal the the local
@ -544,13 +502,10 @@ index 386b629..cb83e92 100644
- this.project = project;
- }
-
- /**
- * Instantiates a new enforcer rule utils.
- *
* @param helper the helper
*/
@SuppressWarnings( "unchecked" )
@@ -112,9 +84,8 @@ public class EnforcerRuleUtils
/**
* Instantiates a new enforcer rule utils.
*
@@ -97,9 +72,8 @@ public class EnforcerRuleUtils
{
factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class );
resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class );
@ -558,150 +513,38 @@ index 386b629..cb83e92 100644
- project = (MavenProject) helper.evaluate( "${project}" );
- remoteRepositories = project.getRemoteArtifactRepositories();
+ projectBuildingRequest = new DefaultProjectBuildingRequest( (ProjectBuildingRequest) helper.evaluate( "${session.projectBuildingRequest}" ) );
+ projectBuildingRequest.setProject( (MavenProject) helper.evaluate( "${project}" ) );
+ 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
- * @throws ArtifactResolutionException the artifact resolution exception
- * @throws ArtifactNotFoundException the artifact not found exception
+ * @throws ArtifactResolverException the artifact resolution exception
* @throws XmlPullParserException the xml pull parser exception
* @throws IOException Signals that an I/O exception has occurred.
*/
private Model getPomModel( String groupId, String artifactId, String version, File pom )
- throws ArtifactResolutionException, ArtifactNotFoundException, IOException, XmlPullParserException
+ throws ArtifactResolverException, IOException, XmlPullParserException
{
Model model = null;
@@ -206,7 +176,7 @@ public class EnforcerRuleUtils
if ( !found )
{
Artifact pomArtifact = factory.createArtifact( groupId, artifactId, version, null, "pom" );
- resolver.resolve( pomArtifact, remoteRepositories, local );
+ resolver.resolveArtifact( projectBuildingRequest, pomArtifact );
model = readModel( pomArtifact.getFile() );
}
@@ -221,13 +191,12 @@ public class EnforcerRuleUtils
* @param version the version
* @param pom the pom
* @return the models recursively
- * @throws ArtifactResolutionException the artifact resolution exception
- * @throws ArtifactNotFoundException the artifact not found exception
+ * @throws ArtifactResolverException the artifact resolution exception
* @throws IOException Signals that an I/O exception has occurred.
* @throws XmlPullParserException the xml pull parser exception
*/
public List<Model> getModelsRecursively( String groupId, String artifactId, String version, File pom )
- throws ArtifactResolutionException, ArtifactNotFoundException, IOException, XmlPullParserException
+ throws ArtifactResolverException, IOException, XmlPullParserException
{
List<Model> models = null;
Model model = getPomModel( groupId, artifactId, version, pom );
diff --git a/maven-enforcer-plugin/pom.xml b/maven-enforcer-plugin/pom.xml
index 7dbab66..1448df3 100644
--- a/maven-enforcer-plugin/pom.xml
+++ b/maven-enforcer-plugin/pom.xml
@@ -49,10 +49,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
diff --git a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
index 8133809..f7b7fc2 100644
--- a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
+++ b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.enforcer;
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
@@ -30,6 +29,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.path.PathTranslator;
+import org.apache.maven.rtinfo.RuntimeInformation;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -96,7 +96,7 @@ public class DisplayInfoMojo
DefaultEnforcementRuleHelper helper = new DefaultEnforcementRuleHelper( session, evaluator, getLog(),
container );
RuntimeInformation rti = (RuntimeInformation) helper.getComponent( RuntimeInformation.class );
- getLog().info( "Maven Version: " + rti.getApplicationVersion() );
+ getLog().info( "Maven Version: " + rti.getMavenVersion() );
getLog().info( "JDK Version: " + SystemUtils.JAVA_VERSION + " normalized as: "
+ RequireJavaVersion.normalizeJDKVersion( SystemUtils.JAVA_VERSION_TRIMMED ) );
RequireOS os = new RequireOS();
diff --git a/pom.xml b/pom.xml
index 423b7f7..a33d992 100644
index 4343304..1f5e962 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<inceptionYear>2007</inceptionYear>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>3.3.3</maven>
</prerequisites>
<modules>
@@ -66,7 +66,7 @@
@@ -63,7 +63,7 @@
</site>
</distributionManagement>
<properties>
- <maven.version>2.2.1</maven.version>
+ <maven.version>3.3.3</maven.version>
<mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
- <maven.version>3.0</maven.version>
+ <maven.version>3.3.1</maven.version>
<maven.site.path>enforcer-archives/enforcer-LATEST</maven.site.path>
<surefire.version>2.21.0</surefire.version>
</properties>
@@ -102,18 +102,23 @@
@@ -139,16 +139,21 @@
<artifactId>commons-codec</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.4</version>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
+ <version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -144,12 +149,12 @@
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.3</version>
- <version>2.1</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@ -709,8 +552,7 @@ index 423b7f7..a33d992 100644
- <version>2.2</version>
+ <version>3.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependency>
<groupId>org.assertj</groupId>
--
2.4.3
2.20.1

22
maven-enforcer.spec
View File

@ -1,12 +1,14 @@
%global upstream_version %(echo '%{version}' | tr '~' '-')
Name: maven-enforcer
Version: 1.4.1
Release: 11%{?dist}
Version: 3.0.0~M2
Release: 1%{?dist}
Summary: Maven Enforcer
License: ASL 2.0
URL: http://maven.apache.org/enforcer
BuildArch: noarch
Source0: http://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer/%{version}/enforcer-%{version}-source-release.zip
Source0: http://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer/%{upstream_version}/enforcer-%{upstream_version}-source-release.zip
# TODO forward upstream
# https://issues.apache.org/jira/browse/MENFORCER-267
@ -62,9 +64,16 @@ This component contains the standard Enforcer Rules.
%prep
%setup -q -n enforcer-%{version}
%setup -q -n enforcer-%{upstream_version}
# Use Unix line endings
find -name '*.java' -exec sed -i 's/\r//' {} \;
find -name 'pom.xml' -exec sed -i 's/\r//' {} \;
%patch0 -p1
%pom_remove_plugin :maven-enforcer-plugin
# Avoid dependency cycle
%pom_xpath_inject pom:build/pom:pluginManagement/pom:plugins "
<plugin>
@ -97,6 +106,9 @@ sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-compon
%doc LICENSE NOTICE
%changelog
* Thu Aug 08 2019 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M2-1
- Update to upstream verssion 3.0.0~M2
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
@ -172,7 +184,7 @@ sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-compon
* Mon Dec 3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
- Update to upstream version 1.2
* Fri Nov 22 2012 Jaromir Capik <jcapik@redhat.com> - 1.1.1-3
* Thu Nov 22 2012 Jaromir Capik <jcapik@redhat.com> - 1.1.1-3
- Including LICENSE and NOTICE
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-2

2
sources
View File

@ -1 +1 @@
48414d7715bc1c65fa4cf3f1e3f29158 enforcer-1.4.1-source-release.zip
SHA512 (enforcer-3.0.0-M2-source-release.zip) = d75273c1c4a534ed8e9e68581107160ffce15cb79de1b9e11d481d5c89e2c8f1f42324e5245d4bf6922972a5957f9aa6ea4db3f83a16afde8e52cd957e2698ec