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:36 UTC
[maven-enforcer] branch MENFORCER-267 updated (ee27104 -> 5f5d826)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MENFORCER-267
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git.
discard ee27104 Added patch from MENFORCER-277 Not yet compiling.
discard 59370c0 Continued..not compiling yet.
discard 8c4df95 Upgraded to 3.0.1 fails the builds.
add cd47545 fixed dist directory
add 554dde3 removed configuration inherited from old svn days
add f388633 [MNGSITE-328] use sha1 checksum instead of md5
add 8b7c40a Set surefire to 2.21.0 to support java 10 Normalize LICENSE file for Windows in IT to get same checksums
add eac2712 Upgrade mockito to support Java 10
add 84f2c66 Fix Javadoc errors
add 62e3682 [maven-release-plugin] prepare release enforcer-3.0.0-M2
add 7a98f2b [maven-release-plugin] prepare for next development iteration
add 9c4ab3e [MENFORCER-142] - Specify enforcer rule in command line without modifying any pom o Merged initial PoC implementation o Added some basic integration tests.
add ae18153 [MENFORCER-305] - Add documentation information for GitHub
add 8269426 Updated version.
add 94843f0 MENFORCER-142: documentation - add example for checking rules via cli
add 389bcc1 Merge pull request #36 from sparsick/master
add 6cf25ef Code improvements o Removed unused class. o Some minore improvements.
add 95b22be Update dependencyConvergence.apt.vm
add b7b9911 Switch to asfMavenTlpPlgnBuild
add 32c6034 [INFRA-16467] move components documentation out of CMS space
add 100eb8c [MNGSITE-341] use https for sigs, hashes and KEYS
add fd64d87 [MPOM-205] use sha512 checksums instead of sha1
add 7b02571 Changed configuration for allowedPluginRepositories
add df77932 [MENFORCER-315] - Add thirdparty rules page to the enforcer site o Add thirdparty-rules page to site for enumerating thirdparty Maven Enforcer rules; o Add link to Sonatype OSS Index rules documentation
add 208c5c7 [MENFORCER-317] - Fix RequireFileChecksum ignores configured message - Introduce configurable message for nonexistent file - Including small refactoring: extract checksum calculation into private method.
add caef332 [MENFORCER-320] - RequireProfileIdsExist check fails if no profiles have been specified - RequireProfileIdsExist check must not fail if there are no profiles in the pom.xml and no profiles have been specified in the command line - fix site: breadcrumbs on the "requireProfileIdsExist" page.
add 02ab1b2 [MENFORCER-312] - Upgrade maven-parent to 33
add 3f49c2f Removed $Id$ from SVN
add 9106689 [MENFORCER-322] requireProfileIdsExist triggers if profile is defined at parent o Fixed iterating over parent poms. Added IT.
add 5ac7679 [MENFORCER-323] - Improve output of "Some plugins are missing valid versions" error
add 7e2a57b [MENFORCER-324] - Use System.lineSeparator() instead of '\n'
add bb6ef07 Add Travis CI configuration file
add c2f1ce2 [MENFORCER-319] Handle parsing of pom.xml in BanDuplicatePomDependencyVersions.java similarly to how actual Maven model parser handles it to fix handling of pom.xml files with UTF-8 BOM.
add 9bf2bac [MENFORCER-314] - Warn if EnforcerRuleException has no message
add 546d285 [MENFORCER-328] - Lift JDK Minimum to 7
add bd34060 [MENFORCER-306] - [REGRESSION] RequirePluginVersions fails o Added simple IT's for this case. o Make it Maven 3.0.5 compatible. o Changed IT's according to parameter definition with List. o Cleaned up code.
new c69ce6a Upgraded to 3.0.1 fails the builds.
new ee4dea4 Continued..not compiling yet.
new 5c78dde Added patch from MENFORCER-277 Not yet compiling.
new 530ef47 Safe state.
new 5f5d826 Fixed prerequisites
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 (ee27104)
\
N -- N -- N refs/heads/MENFORCER-267 (5f5d826)
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 5 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:
.github/pull_request_template.md | 28 ++
.../invoker.properties => .travis.yml | 17 +-
CONTRIBUTING.md | 80 ++++
Jenkinsfile | 2 +-
README.TXT | 24 --
README.md | 96 +++++
.../maven/enforcer/rule/api/EnforcerRule.java | 1 -
.../maven/enforcer/rule/api/EnforcerRule2.java | 1 -
.../plugins/enforcer/AbstractBanDependencies.java | 5 +-
.../enforcer/AbstractNonCacheableEnforcerRule.java | 1 -
.../enforcer/AbstractPropertyEnforcerRule.java | 1 -
.../plugins/enforcer/AbstractRequireFiles.java | 6 +-
.../plugins/enforcer/AbstractVersionEnforcer.java | 1 -
.../apache/maven/plugins/enforcer/AlwaysFail.java | 2 +-
.../apache/maven/plugins/enforcer/AlwaysPass.java | 2 +-
.../BanDuplicatePomDependencyVersions.java | 14 +-
.../enforcer/BanTransitiveDependencies.java | 4 +-
.../maven/plugins/enforcer/BannedDependencies.java | 1 -
.../maven/plugins/enforcer/BannedPlugins.java | 4 +-
.../maven/plugins/enforcer/BannedRepositories.java | 6 +-
.../enforcer/DefaultEnforcementRuleHelper.java | 1 -
.../plugins/enforcer/DependencyConvergence.java | 9 +-
.../plugins/enforcer/ReactorModuleConvergence.java | 8 +-
.../plugins/enforcer/RequireActiveProfile.java | 4 +-
.../plugins/enforcer/RequireFileChecksum.java | 118 ++++--
.../plugins/enforcer/RequireFilesDontExist.java | 2 +-
.../maven/plugins/enforcer/RequireFilesExist.java | 2 +-
.../maven/plugins/enforcer/RequireJavaVersion.java | 1 -
.../plugins/enforcer/RequireMavenVersion.java | 3 +-
.../plugins/enforcer/RequireNoRepositories.java | 2 +-
.../apache/maven/plugins/enforcer/RequireOS.java | 1 -
.../plugins/enforcer/RequirePluginVersions.java | 420 ++++++++++++---------
.../plugins/enforcer/RequireProfileIdsExist.java | 39 +-
.../maven/plugins/enforcer/RequireReleaseDeps.java | 1 -
.../plugins/enforcer/RequireReleaseVersion.java | 2 +-
.../plugins/enforcer/RequireSameVersions.java | 7 +-
.../plugins/enforcer/RequireSnapshotVersion.java | 2 +-
.../plugins/enforcer/RequireUpperBoundDeps.java | 8 +-
.../src/site/apt/dependencyConvergence.apt.vm | 2 +-
.../src/site/apt/requireProfileIdsExist.apt.vm | 2 +-
.../maven/plugins/enforcer/MockPathTranslator.java | 76 ----
.../plugins/enforcer/MockPlexusContainer.java | 4 +-
.../plugins/enforcer/TestRequireFileChecksum.java | 60 ++-
.../enforcer/TestRequirePluginVersions.java | 1 +
.../utils/MockEnforcerExpressionEvaluator.java | 11 +-
maven-enforcer-plugin/pom.xml | 9 +-
.../parent}/pom.xml | 218 +++++------
.../menforcer281-module => MENFORCER-306}/pom.xml | 67 ++--
.../src/it/projects/always-fail-warn/pom.xml | 7 +
.../src/it/projects/always-fail/pom.xml | 7 +
.../src/it/projects/always-pass/pom.xml | 7 +
.../pom.xml | 9 +-
.../pom.xml | 9 +-
.../projects/ban-distribution-management/pom.xml | 7 +
.../invoker.properties | 0
.../pom.xml | 17 +-
.../verify.groovy | 50 +--
.../it/projects/ban-pom-dependency-version/pom.xml | 11 +-
.../ban-transitive-dependencies-fail/pom.xml | 11 +-
.../projects/ban-transitive-dependencies/pom.xml | 11 +-
.../banned-dependencies-versionrange-fail/pom.xml | 9 +-
.../banned-dependencies-versionrange/pom.xml | 9 +-
.../projects/banned-dependencies-wildcards/pom.xml | 9 +-
.../src/it/projects/banned-dependencies/pom.xml | 7 +
.../src/it/projects/banned-plugins/pom.xml | 7 +
.../it/projects/builds_a_pom_noop/module/pom.xml | 3 +-
.../src/it/projects/builds_a_pom_noop/pom.xml | 10 +-
.../invoker.properties | 2 +-
.../{always-pass => cli-always-fail}/pom.xml | 20 +-
.../invoker.properties | 2 +-
.../{always-pass => cli-always-pass}/pom.xml | 7 +
.../projects/dependencies_converge/module/pom.xml | 3 +-
.../src/it/projects/dependencies_converge/pom.xml | 10 +-
.../dependencies_not_converging/module/pom.xml | 3 +-
.../projects/dependencies_not_converging/pom.xml | 10 +-
.../module/pom.xml | 3 +-
.../dependencies_not_converging_test_scope/pom.xml | 12 +-
.../src/it/projects/display-info/pom.xml | 7 +
.../src/it/projects/evaluate-beanshell/pom.xml | 14 +
.../src/it/projects/multimodule/pom.xml | 9 +-
.../it/projects/require-active-profile-all/pom.xml | 7 +
.../require-active-profile-from-settings/pom.xml | 7 +
.../src/it/projects/require-active-profile/pom.xml | 7 +
.../src/it/projects/require-file-checksum/pom.xml | 15 +-
.../it/projects/require-file-checksum/setup.groovy | 8 +-
.../it/projects/require-files-dont-exist/pom.xml | 7 +
.../src/it/projects/require-files-exist/pom.xml | 7 +
.../src/it/projects/require-files-size/pom.xml | 14 +
.../src/it/projects/require-java-version/pom.xml | 7 +
.../src/it/projects/require-maven-version/pom.xml | 14 +
.../pom.xml | 11 +-
.../require-no-repositories-allow-repo/pom.xml | 11 +-
.../it/projects/require-no-repositories/pom.xml | 7 +
.../require-no-repositories_failure/pom.xml | 9 +-
.../pom.xml | 16 +-
.../pom.xml | 7 +
.../pom.xml | 11 +-
.../it/projects/require-no-repositories_mm/pom.xml | 7 +
.../projects/require-no-repositories_mm_ci/pom.xml | 7 +
.../it/projects/require-plugin-versions-ci/pom.xml | 7 +
.../require-plugin-versions-ci/verify.groovy | 2 +-
.../pom.xml | 7 +
.../require-plugin-versions-expressions/pom.xml | 45 ++-
.../require-plugin-versions-mm-ci-friendly/pom.xml | 15 +-
.../pom.xml | 10 +-
.../pom.xml | 14 +-
.../pom.xml | 17 +-
.../it/projects/require-plugin-versions/pom.xml | 8 +
.../MENFORCER-322-module}/pom.xml | 22 +-
.../invoker.properties | 45 ++-
.../pom.xml | 18 +-
.../verify.groovy | 4 +-
.../require-profile-ids-exist_failure/pom.xml | 9 +-
.../require-profile-ids-exist_success/pom.xml | 9 +-
.../src/it/projects/require-property/pom.xml | 14 +
.../require-release-dependencies-excludes/pom.xml | 12 +-
.../pom.xml | 12 +-
.../projects/require-release-dependencies/pom.xml | 7 +
.../it/projects/require-release-version/pom.xml | 7 +
.../projects/require-same-versions_failure/pom.xml | 23 +-
.../projects/require-same-versions_success/pom.xml | 23 +-
.../require-snapshot-version_failure/pom.xml | 7 +
.../require-snapshot-version_success/pom.xml | 7 +
.../pom.xml | 10 +-
.../pom.xml | 10 +-
.../pom.xml | 12 +-
.../pom.xml | 12 +-
.../module/pom.xml | 3 +-
.../require-upper-bound-deps_failure/pom.xml | 10 +-
.../module/pom.xml | 3 +-
.../require-upper-bound-deps_ignored/pom.xml | 10 +-
.../module/pom.xml | 3 +-
.../require-upper-bound-deps_success/pom.xml | 10 +-
.../projects/resolve_collect_dependencies/pom.xml | 9 +-
.../maven/plugins/enforcer/DisplayInfoMojo.java | 1 -
.../apache/maven/plugins/enforcer/EnforceMojo.java | 69 +++-
.../examples/check-specific-rule-via-cli.apt.vm | 34 ++
maven-enforcer-plugin/src/site/apt/index.apt | 4 +
.../src/site/apt/thirdparty-rules.apt | 14 +-
maven-enforcer-plugin/src/site/site.xml | 4 +
.../maven/plugins/enforcer/TestEnforceMojo.java | 92 ++++-
pom.xml | 20 +-
src/site/xdoc/download.xml.vm | 10 +-
143 files changed, 1788 insertions(+), 753 deletions(-)
create mode 100644 .github/pull_request_template.md
copy maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-build/invoker.properties => .travis.yml (81%)
create mode 100644 CONTRIBUTING.md
delete mode 100644 README.TXT
create mode 100644 README.md
delete mode 100644 enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPathTranslator.java
copy maven-enforcer-plugin/src/it/projects/{require-plugin-versions-mm-ci-friendly => MENFORCER-306/parent}/pom.xml (65%)
copy maven-enforcer-plugin/src/it/projects/{require-plugin-versions-mm-ci-friendly/menforcer281-module => MENFORCER-306}/pom.xml (66%)
copy maven-enforcer-plugin/src/it/projects/{require-upper-bound-deps_failure => ban-pom-dependency-version-utf8-with-bom}/invoker.properties (100%)
copy maven-enforcer-plugin/src/it/projects/{ban-pom-dependency-version => ban-pom-dependency-version-utf8-with-bom}/pom.xml (81%)
copy maven-enforcer-plugin/src/it/projects/{ban-pom-dependency-version => ban-pom-dependency-version-utf8-with-bom}/verify.groovy (97%)
copy maven-enforcer-plugin/src/it/projects/{ban-transitive-dependencies-fail => cli-always-fail}/invoker.properties (88%)
copy maven-enforcer-plugin/src/it/projects/{always-pass => cli-always-fail}/pom.xml (79%)
copy maven-enforcer-plugin/src/it/projects/{always-fail-warn => cli-always-pass}/invoker.properties (88%)
copy maven-enforcer-plugin/src/it/projects/{always-pass => cli-always-pass}/pom.xml (88%)
copy Jenkinsfile => maven-enforcer-plugin/src/it/projects/require-file-checksum/setup.groovy (90%)
copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_success => require-profile-id-exist_defined_in_parent/MENFORCER-322-module}/pom.xml (75%)
copy maven-enforcer-plugin/src/it/projects/{ban-distribution-management-multi-module-build => require-profile-id-exist_defined_in_parent}/invoker.properties (74%)
copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_success => require-profile-id-exist_defined_in_parent}/pom.xml (80%)
copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent}/verify.groovy (82%)
create mode 100644 maven-enforcer-plugin/src/site/apt/examples/check-specific-rule-via-cli.apt.vm
copy enforcer-api/src/site/apt/index.apt => maven-enforcer-plugin/src/site/apt/thirdparty-rules.apt (67%)
[maven-enforcer] 03/05: Added patch from MENFORCER-277 Not yet
compiling.
Posted by kh...@apache.org.
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 5c78ddea402e6acd74120f78e60a8338df5c9d02
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Feb 14 20:37:58 2018 +0100
Added patch from MENFORCER-277
Not yet compiling.
---
.../maven/plugins/enforcer/AbstractBanDependencies.java | 7 ++++---
.../maven/plugins/enforcer/BanTransitiveDependencies.java | 2 +-
.../maven/plugins/enforcer/DependencyConvergence.java | 11 ++++++++---
.../maven/plugins/enforcer/RequirePluginVersions.java | 9 +++++++++
.../maven/plugins/enforcer/RequireUpperBoundDeps.java | 10 ++++++++--
.../maven/plugins/enforcer/utils/EnforcerRuleUtils.java | 5 ++++-
.../plugins/enforcer/BannedDependenciesTestSetup.java | 5 +++--
.../apache/maven/plugins/enforcer/EnforcerTestUtils.java | 11 ++++++++---
.../apache/maven/plugins/enforcer/MockPlexusContainer.java | 1 +
.../maven/plugins/enforcer/TestRequireReleaseDeps.java | 14 ++++++++------
10 files changed, 54 insertions(+), 21 deletions(-)
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 227d5c0..0f7425d 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
@@ -27,6 +27,7 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
+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;
@@ -73,7 +74,7 @@ public abstract class AbstractBanDependencies
}
// get the correct list of dependencies
- Set<Artifact> dependencies = getDependenciesToCheck( session );
+ Set<Artifact> dependencies = getDependenciesToCheck( session.getProjectBuildingRequest() );
// look for banned dependencies
Set<Artifact> foundExcludes = checkDependencies( dependencies, helper.getLog() );
@@ -104,12 +105,12 @@ public abstract class AbstractBanDependencies
return "Found Banned Dependency: " + artifact.getId() + System.lineSeparator();
}
- protected Set<Artifact> getDependenciesToCheck( MavenSession session )
+ protected Set<Artifact> getDependenciesToCheck( ProjectBuildingRequest request)
{
Set<Artifact> dependencies = null;
try
{
- DependencyNode node = graphBuilder.buildDependencyGraph( session.getProjectBuildingRequest(), null );
+ DependencyNode node = graphBuilder.buildDependencyGraph( request, 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 15388f8..df99ed7 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
@@ -28,7 +28,6 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugins.enforcer.utils.ArtifactMatcher;
-import org.apache.maven.project.MavenProject;
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;
@@ -159,6 +158,7 @@ public class BanTransitiveDependencies
try
{
MavenSession session = (MavenSession) helper.evaluate( "${session}" );
+
rootNode = createDependencyGraphBuilder().buildDependencyGraph( session.getProjectBuildingRequest(), 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 3b78612..53ada9f 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,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.enforcer.rule.api.EnforcerRule;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
@@ -32,7 +31,9 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.enforcer.utils.DependencyVersionMap;
+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;
@@ -58,7 +59,7 @@ public class DependencyConvergence
// CHECKSTYLE_OFF: LineLength
/**
* Uses the {@link EnforcerRuleHelper} to populate the values of the
- * {@link DependencyTreeBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)}
+ * {@link DependencyGraphBuilder#buildDependencyGraph(org.apache.maven.project.ProjectBuildingRequest, ArtifactFilter)}
* factory method. <br/>
* This method simply exists to hide all the ugly lookup that the {@link EnforcerRuleHelper} has to do.
*
@@ -72,12 +73,16 @@ public class DependencyConvergence
{
try
{
+ MavenProject project = (MavenProject) helper.evaluate( "${project}" );
MavenSession session = (MavenSession) helper.evaluate( "${session}" );
+
+ ProjectBuildingRequest request = new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
+ request.setProject( project );
DependencyGraphBuilder dependencyTreeBuilder =
(DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
ArtifactFilter filter = null; // we need to evaluate all scopes
- DependencyNode node = dependencyTreeBuilder.buildDependencyGraph(session.getProjectBuildingRequest(), filter );
+ DependencyNode node = dependencyTreeBuilder.buildDependencyGraph(request, filter );
return node;
}
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 2437281..724516e 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
@@ -68,6 +68,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
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;
/**
* This rule will enforce that all plugins specified in the poms have a version declared.
@@ -159,6 +160,12 @@ public class RequirePluginVersions
/** The lifecycles. */
private Collection<Lifecycle> lifecycles;
+ /** The factory. */
+ ArtifactFactory factory;
+
+ /** The resolver. */
+ ArtifactResolver resolver;
+
/** The local. */
private ArtifactRepository local;
@@ -196,6 +203,8 @@ public class RequirePluginVersions
session = (MavenSession) helper.evaluate( "${session}" );
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();
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 e56d1b6..6b457c4 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
@@ -34,7 +34,9 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.execution.MavenSession;
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;
@@ -88,7 +90,7 @@ public class RequireUpperBoundDeps
// CHECKSTYLE_OFF: LineLength
/**
* Uses the {@link EnforcerRuleHelper} to populate the values of the
- * {@link DependencyTreeBuilder#buildDependencyTree(MavenProject, ArtifactRepository, ArtifactFactory, ArtifactMetadataSource, ArtifactFilter, ArtifactCollector)}
+ * {@link DependencyGraphBuilder#buildDependencyGraph(org.apache.maven.project.ProjectBuildingRequest, ArtifactFilter)}
* factory method. <br/>
* This method simply exists to hide all the ugly lookup that the {@link EnforcerRuleHelper} has to do.
*
@@ -103,11 +105,15 @@ public class RequireUpperBoundDeps
try
{
MavenSession session = (MavenSession) helper.evaluate( "${session}" );
+ MavenProject project = (MavenProject) helper.evaluate( "${project}" );
+ ProjectBuildingRequest request = new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
+ request.setProject( project );
+
DependencyGraphBuilder dependencyTreeBuilder =
(DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
ArtifactFilter filter = null; // we need to evaluate all scopes
- DependencyNode node = dependencyTreeBuilder.buildDependencyGraph(session.getProjectBuildingRequest(), filter );
+ DependencyNode node = dependencyTreeBuilder.buildDependencyGraph(request, filter );
return node;
}
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 559e187..9af0233 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
@@ -42,7 +42,10 @@ public class EnforcerRuleUtils
/** The factory. */
ArtifactFactory factory;
-
+
+ /** The resolver. */
+ ArtifactResolver resolver;
+
/** The local. */
ArtifactRepository local;
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java
index 1d36ef7..8218c36 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java
@@ -29,6 +29,7 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingRequest;
public class BannedDependenciesTestSetup
{
@@ -92,10 +93,10 @@ public class BannedDependenciesTestSetup
{
BannedDependencies rule = new BannedDependencies()
{
- @SuppressWarnings( "unchecked" )
@Override
- protected Set<Artifact> getDependenciesToCheck( MavenProject project )
+ protected Set<Artifact> getDependenciesToCheck( ProjectBuildingRequest request )
{
+ MavenProject project = request.getProject();
// the integration with dependencyGraphTree is verified with the integration tests
// for unit-testing
return isSearchTransitive() ? project.getArtifacts() : project.getDependencyArtifacts();
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
index 29014a5..5b1461a 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
@@ -33,6 +33,7 @@ import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
import org.apache.maven.plugin.logging.SystemStreamLog;
import org.apache.maven.plugins.enforcer.utils.MockEnforcerExpressionEvaluator;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
@@ -58,9 +59,9 @@ public final class EnforcerTestUtils
Properties systemProperties = new Properties();
systemProperties.put( "maven.version", "3.0" );
- when( mer.getUserProperties() ).thenReturn( new Properties() );
- when( mer.getSystemProperties() ).thenReturn( systemProperties );
-
+ when( mer.getSystemProperties()).thenReturn( systemProperties );
+ when( mer.getProjectBuildingRequest() ).thenReturn( new DefaultProjectBuildingRequest() );
+
MavenExecutionResult meresult = mock( MavenExecutionResult.class );
return new MavenSession( mock, (RepositorySystemSession) null, mer, meresult );
}
@@ -107,6 +108,8 @@ public final class EnforcerTestUtils
public static EnforcerRuleHelper getHelper( MavenProject project, boolean mockExpression )
{
MavenSession session = getMavenSession();
+ session.getProjectBuildingRequest().setProject( project );
+
ExpressionEvaluator eval;
if ( mockExpression )
{
@@ -131,6 +134,8 @@ public final class EnforcerTestUtils
public static EnforcerRuleHelper getHelper( MavenProject project, ExpressionEvaluator eval )
{
MavenSession session = getMavenSession();
+ session.getProjectBuildingRequest().setProject( project );
+
return new DefaultEnforcementRuleHelper( session, eval, new SystemStreamLog(), null );
}
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 a73cbbd..da67086 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
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.RuntimeInfo;
import org.codehaus.classworlds.ClassRealm;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java
index 858e60f..9204233 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java
@@ -22,13 +22,14 @@ package org.apache.maven.plugins.enforcer;
import java.io.IOException;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtilsHelper;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingRequest;
+
+import junit.framework.TestCase;
/**
* The Class TestNoSnapshots.
@@ -81,7 +82,7 @@ public class TestRequireReleaseDeps
project.setParent( parent );
project.setArtifacts( null );
project.setDependencyArtifacts( null );
- helper = EnforcerTestUtils.getHelper(project);
+ helper = EnforcerTestUtils.getHelper( project );
rule.setFailWhenParentIsSnapshot( true );
EnforcerRuleUtilsHelper.execute( rule, helper, true );
@@ -89,15 +90,16 @@ public class TestRequireReleaseDeps
rule.setFailWhenParentIsSnapshot( false );
EnforcerRuleUtilsHelper.execute( rule, helper, false );
-
}
private RequireReleaseDeps newRequireReleaseDeps()
{
RequireReleaseDeps rule = new RequireReleaseDeps()
{
- protected Set<Artifact> getDependenciesToCheck( MavenProject project )
- {
+ @Override
+ protected Set<Artifact> getDependenciesToCheck( ProjectBuildingRequest request )
+ {
+ MavenProject project = request.getProject();
// the integration with dependencyGraphTree is verified with the integration tests
// for unit-testing
return isSearchTransitive() ? project.getArtifacts() : project.getDependencyArtifacts();
[maven-enforcer] 02/05: Continued..not compiling yet.
Posted by kh...@apache.org.
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 ee4dea4ef4070bb966b30ae0bf8a586a6618ab2f
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Jan 6 20:50:11 2018 +0100
Continued..not compiling yet.
---
enforcer-rules/pom.xml | 4 ---
.../plugins/enforcer/AbstractBanDependencies.java | 29 +++++++-------------
.../enforcer/BanTransitiveDependencies.java | 5 ++--
.../plugins/enforcer/DependencyConvergence.java | 28 ++++++++-----------
.../plugins/enforcer/RequirePluginVersions.java | 9 ------
.../plugins/enforcer/RequireUpperBoundDeps.java | 32 ++++++++--------------
.../enforcer/utils/DependencyVersionMap.java | 4 +--
.../plugins/enforcer/utils/EnforcerRuleUtils.java | 5 +---
.../plugins/enforcer/TestBannedRepositories.java | 1 -
9 files changed, 39 insertions(+), 78 deletions(-)
diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml
index abfd146..9b64fca 100644
--- a/enforcer-rules/pom.xml
+++ b/enforcer-rules/pom.xml
@@ -90,10 +90,6 @@
<artifactId>maven-dependency-tree</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
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 5bdbaf0..227d5c0 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
@@ -1,5 +1,8 @@
package org.apache.maven.plugins.enforcer;
+import java.util.HashSet;
+import java.util.Set;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,15 +25,13 @@ package org.apache.maven.plugins.enforcer;
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.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
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;
/**
* Abstract Rule for banning dependencies.
@@ -51,11 +52,11 @@ public abstract class AbstractBanDependencies
throws EnforcerRuleException
{
- // get the project
- MavenProject project = null;
+ // get the session
+ MavenSession session = null;
try
{
- project = (MavenProject) helper.evaluate( "${project}" );
+ session = (MavenSession) helper.evaluate( "${session}" );
}
catch ( ExpressionEvaluationException eee )
{
@@ -68,21 +69,11 @@ public abstract class AbstractBanDependencies
}
catch ( ComponentLookupException e )
{
- // real cause is probably that one of the Maven3 graph builder could not be initiated and fails with a
- // ClassNotFoundException
- try
- {
- graphBuilder =
- (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class.getName(), "maven2" );
- }
- catch ( ComponentLookupException e1 )
- {
throw new EnforcerRuleException( "Unable to lookup DependencyGraphBuilder: ", e );
- }
}
// get the correct list of dependencies
- Set<Artifact> dependencies = getDependenciesToCheck( project );
+ Set<Artifact> dependencies = getDependenciesToCheck( session );
// look for banned dependencies
Set<Artifact> foundExcludes = checkDependencies( dependencies, helper.getLog() );
@@ -113,12 +104,12 @@ public abstract class AbstractBanDependencies
return "Found Banned Dependency: " + artifact.getId() + System.lineSeparator();
}
- protected Set<Artifact> getDependenciesToCheck( MavenProject project )
+ protected Set<Artifact> getDependenciesToCheck( MavenSession session )
{
Set<Artifact> dependencies = null;
try
{
- DependencyNode node = graphBuilder.buildDependencyGraph( project, null );
+ DependencyNode node = graphBuilder.buildDependencyGraph( session.getProjectBuildingRequest(), 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 6e1dcd4..15388f8 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
@@ -26,6 +26,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException
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.execution.MavenSession;
import org.apache.maven.plugins.enforcer.utils.ArtifactMatcher;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
@@ -157,8 +158,8 @@ public class BanTransitiveDependencies
try
{
- MavenProject project = (MavenProject) helper.evaluate( "${project}" );
- rootNode = createDependencyGraphBuilder().buildDependencyGraph( project, null );
+ MavenSession session = (MavenSession) helper.evaluate( "${session}" );
+ rootNode = createDependencyGraphBuilder().buildDependencyGraph( session.getProjectBuildingRequest(), 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 684f984..3b78612 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;
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
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.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.enforcer.utils.DependencyVersionMap;
import org.apache.maven.project.MavenProject;
-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.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;
@@ -74,17 +72,13 @@ public class DependencyConvergence
{
try
{
- MavenProject project = (MavenProject) helper.evaluate( "${project}" );
- DependencyTreeBuilder dependencyTreeBuilder =
- (DependencyTreeBuilder) helper.getComponent( DependencyTreeBuilder.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 );
+ MavenSession session = (MavenSession) helper.evaluate( "${session}" );
+ DependencyGraphBuilder dependencyTreeBuilder =
+ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
ArtifactFilter filter = null; // we need to evaluate all scopes
- DependencyNode node = dependencyTreeBuilder.buildDependencyTree( project, repository, factory,
- metadataSource, filter, collector );
+
+ DependencyNode node = dependencyTreeBuilder.buildDependencyGraph(session.getProjectBuildingRequest(), filter );
+
return node;
}
catch ( ExpressionEvaluationException e )
@@ -95,7 +89,7 @@ public class DependencyConvergence
{
throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e );
}
- catch ( DependencyTreeBuilderException e )
+ catch ( DependencyGraphBuilderException e )
{
throw new EnforcerRuleException( "Could not build dependency tree " + e.getLocalizedMessage(), e );
}
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 34f0f20..2437281 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
@@ -36,7 +36,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;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
@@ -160,12 +159,6 @@ public class RequirePluginVersions
/** The lifecycles. */
private Collection<Lifecycle> lifecycles;
- /** The factory. */
- private ArtifactFactory factory;
-
- /** The resolver. */
- private ArtifactResolver resolver;
-
/** The local. */
private ArtifactRepository local;
@@ -203,8 +196,6 @@ public class RequirePluginVersions
session = (MavenSession) helper.evaluate( "${session}" );
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();
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 458554a..e56d1b6 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,22 +26,19 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
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.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
-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.shared.dependency.tree.traversal.DependencyNodeVisitor;
+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.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -105,18 +102,13 @@ public class RequireUpperBoundDeps
{
try
{
- MavenProject project = (MavenProject) helper.evaluate( "${project}" );
- DependencyTreeBuilder dependencyTreeBuilder =
- (DependencyTreeBuilder) helper.getComponent( DependencyTreeBuilder.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 );
+ MavenSession session = (MavenSession) helper.evaluate( "${session}" );
+ DependencyGraphBuilder dependencyTreeBuilder =
+ (DependencyGraphBuilder) helper.getComponent( DependencyGraphBuilder.class );
ArtifactFilter filter = null; // we need to evaluate all scopes
- DependencyNode node =
- dependencyTreeBuilder.buildDependencyTree( project, repository, factory, metadataSource, filter,
- collector );
+
+ DependencyNode node = dependencyTreeBuilder.buildDependencyGraph(session.getProjectBuildingRequest(), filter );
+
return node;
}
catch ( ExpressionEvaluationException e )
@@ -127,7 +119,7 @@ public class RequireUpperBoundDeps
{
throw new EnforcerRuleException( "Unable to lookup a component " + e.getLocalizedMessage(), e );
}
- catch ( DependencyTreeBuilderException e )
+ catch ( DependencyGraphBuilderException e )
{
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 b6213fa..ec78fc7 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;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.shared.dependency.tree.DependencyNode;
-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.DependencyNode;
+import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
/**
* @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 c122e10..559e187 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
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
@@ -31,6 +30,7 @@ import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.sonatype.aether.impl.ArtifactResolver;
/**
* The Class EnforcerRuleUtils.
@@ -43,9 +43,6 @@ public class EnforcerRuleUtils
/** The factory. */
ArtifactFactory factory;
- /** The resolver. */
- ArtifactResolver resolver;
-
/** The local. */
ArtifactRepository local;
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java
index e27ee86..740cf44 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.codehaus.plexus.PlexusTestCase;
[maven-enforcer] 05/05: Fixed prerequisites
Posted by kh...@apache.org.
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 5f5d826eeaea854f4a796327d8ee2abe55ef92b8
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Thu Nov 8 19:57:02 2018 +0100
Fixed prerequisites
---
maven-enforcer-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-enforcer-plugin/pom.xml b/maven-enforcer-plugin/pom.xml
index 6729d40..149cd53 100644
--- a/maven-enforcer-plugin/pom.xml
+++ b/maven-enforcer-plugin/pom.xml
@@ -32,7 +32,7 @@
<packaging>maven-plugin</packaging>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>${maven.version}</maven>
</prerequisites>
<name>Apache Maven Enforcer Plugin</name>
[maven-enforcer] 01/05: Upgraded to 3.0.1 fails the builds.
Posted by kh...@apache.org.
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 c69ce6a7a4f72866c56ad99f2dfaf0be9470c8de
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Jan 6 17:51:24 2018 +0100
Upgraded to 3.0.1 fails the builds.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dbad94b..86fef47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
- <version>2.2</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
[maven-enforcer] 04/05: Safe state.
Posted by kh...@apache.org.
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>