You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2019/02/24 19:11:40 UTC
[maven-enforcer] 04/05: Safe state.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MENFORCER-267
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 530ef47d205899119937e0aeda381249c60743e3
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 22 15:16:07 2018 +0200
Safe state.
---
.../java/org/apache/maven/plugins/enforcer/BannedPlugins.java | 2 +-
.../org/apache/maven/plugins/enforcer/RequirePluginVersions.java | 5 ++++-
.../org/apache/maven/plugins/enforcer/MockPlexusContainer.java | 4 +---
pom.xml | 8 +-------
4 files changed, 7 insertions(+), 12 deletions(-)
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 03201fd..dd4c397 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
@@ -33,7 +33,7 @@ public class BannedPlugins
extends BannedDependencies
{
@Override
- protected Set<Artifact> getDependenciesToCheck( MavenProject project )
+ protected Set<Artifact> getDependencies( MavenProject project )
{
return project.getPluginArtifacts();
}
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 724516e..5b7ef86 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
@@ -69,6 +69,7 @@ import org.codehaus.plexus.util.ReflectionUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.sonatype.aether.impl.ArtifactResolver;
+import org.sonatype.aether.resolution.ArtifactRequest;
/**
* This rule will enforce that all plugins specified in the poms have a version declared.
@@ -556,7 +557,9 @@ public class RequirePluginVersions
try
{
- this.resolver.resolve( artifact, pluginRepositories, this.local );
+
+ this.resolver.resolveArtifact( session, request );
+ //esolve( artifact, pluginRepositories, this.local );
plugin.setVersion( artifact.getVersion() );
}
catch ( ArtifactResolutionException e )
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java
index da67086..b54af0b 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java
@@ -25,9 +25,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.RuntimeInfo;
+import org.apache.maven.rtinfo.RuntimeInformation;
import org.codehaus.classworlds.ClassRealm;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
@@ -37,7 +36,6 @@ import org.codehaus.plexus.component.factory.ComponentInstantiationException;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.component.repository.exception.ComponentRepositoryException;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
import org.codehaus.plexus.context.Context;
diff --git a/pom.xml b/pom.xml
index 86fef47..fbce4e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,14 +100,8 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${maven.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${maven.version}</version>
+ <version>3.0.3</version> <!-- TESTING: Runtimeinformation -->
</dependency>
-
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>