You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/07/21 18:36:08 UTC
[maven] branch MNG-7020 updated (fa629ddda -> 21dfa0309)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7020
in repository https://gitbox.apache.org/repos/asf/maven.git
omit fa629ddda [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
add e1d359aa6 [MNG-7330] Revert MNG-7329
add 1fff17398 [MNG-7428] Upgrade Maven Parent to 35
add 20b6cec44 [MNG-7304] Use try-with-resources statement
add 48fc4c993 [MNG-7299] Simplify conditional expressions
add e8c35ae4a [MNG-7206] Properly prioritize JVM options from MAVEN_OPTS and jvm.config
add 8e5676c84 [MNG-7391] add execution strategy+runner required by Maven Build Cache (#661)
add b3d5c12c7 [master][MNG-7350] Introduce a factory for ModelCache (#629)
add 97c1e4b4a Remove unused test which should have been removed with MNG-7047 (#686)
add 7c79e634c Update DOAP with Maven 3.8.5 release
add 31193cbf0 [MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope (#693)
add e85ff889b [MNG-7413] fix anchor for XML elements with same name but not content
add d92538b80 [MNG-7445] - Refactoring, remove the useless line Contribution by JakcyHu Gakiii
add 896c707d3 [MNG-7447] - Several Improvements by using Stream API
add d14bb3b8d [MNG-7441] Update version of loback
add bdb35f2de [MNG-7432] Resolver session contains non-MavenWorkspaceReader
add c99028b9f [MNG-5222] Maven 3 no longer logs warnings about deprecated plugin parameters
add be2b7f890 [MNG-7454] Include resolver-transport-http in Maven (#711)
add 643d1e782 [MNG-7438] add execution id to "configuring mojo" debug message
add 551009ab4 [MNG-7454] Include resolver-transport-http in Maven (#720)
add 3fef9c685 [MNG-7453] Update Resolver to 1.8.0 (#723)
add bdfd8de96 Drop Java 16 from matrix
add 9ac2d08dc [MNG-5222] Improvement in deprecated params detection
add 702f52d0e [MNG-7457] Warn about deprecated plugin Mojo
add ca9aa8f4f [MNG-7466] Align assembly XSD version with plugin used (#728)
add 93196d4bb [MNG-7404] Drop deprecated prefixless expressions
add 1e95011a3 configure Jira integration
add 3dd0afd89 [MNG-7464] Warn about using read-only parameters for Mojo in configuration
add 1c22f9452 [MNG-7459] Revert "[MNG-7347] SessionScoped beans should be singletons for a given session (#621)"
add a83ed86c4 [MNG-7471] Make Resolver util and connector-basic provided (#732)
add ef1c17f62 [MNG-7405] Update animal-sniffer to 1.21 (#671)
add fc1962e65 [MNG-7478] Transport selection should use config properties (#739)
add 3ad4fe5a1 [MNG-7448] Don't ignore bin/ otherwise bin/ in apache-maven module cannot be readded
add 6767f2500 [MNG-7486] Create a multiline message helper for boxed log messages
add 2a276d0dc [MNG-7487] Fix deadlock during forked lifecycle executions
add 7da0214d1 [MNG-7476] Display a warning when an aggregator mojo is locking other mojos executions
add 3d4516720 [MNG-7488] Upgrade SLF4J to 1.7.36
add 7bd5fb38b deploy master, 3.8.x and 3.9.x
add 47fb9e812 [MNG-7491] Update parent POM 36 (#747)
add 54f9d91eb [MNG-7468] Check unsupported plugins parameters in configuration
add df38f1c07 Update DOAP with Maven 3.8.6 release
add 415eaf31d [MNG-7160] Ability to customize core extensions classloaders (#616)
add d82ab09ae [MNG-7499] Upgrade Maven Resolver to 1.8.1
add 4e88d62ab [MNG-7501] add relative path to pom.xml in module build start output
add 7dbbcc23a [MNG-7506] Upgrade Maven Wagon to 3.5.2
add 90c084dcf [MNG-7360] Fix xml transformation to ensure proper context (#744)
add f05397a88 Pull out lifecycle plugin versions (#766)
add 03b1faff7 [MNG-7511] Ensure the degreeOfConcurrency is a positive number in MavenExecutionRequest
add efa9f0c67 [MNG-7513] Address commons-io_commons-io vulnerability found in maven latest version
add 8ff8ebcae [MNG-7515] Cannot see a dependency tree for apache-maven module
new 21dfa0309 [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
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 (fa629ddda)
\
N -- N -- N refs/heads/MNG-7020 (21dfa0309)
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 1 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:
.asf.yaml | 9 ++
.gitignore | 2 -
Jenkinsfile | 4 +-
apache-maven/pom.xml | 37 ++---
apache-maven/src/assembly/bin.xml | 4 +-
apache-maven/src/assembly/dir.xml | 4 +-
.../maven/conf/logging/simplelogger.properties | 6 +-
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/shared/init.cmd | 7 +-
apache-maven/src/assembly/shared/run.cmd | 1 -
apache-maven/src/assembly/src.xml | 4 +-
...f4j-api-1.7.32.txt => MIT-slf4j-api-1.7.36.txt} | 0
doap_Maven.rdf | 34 +++++
maven-bom/pom.xml | 14 +-
.../legacy/DefaultUpdateCheckManager.java | 54 ++------
.../apache/maven/project/TestProjectBuilder.java | 5 +-
maven-core/pom.xml | 10 ++
.../apache/maven/DefaultArtifactFilterManager.java | 6 +-
.../main/java/org/apache/maven/DefaultMaven.java | 6 +-
.../main/java/org/apache/maven/ReactorReader.java | 102 +++++++-------
.../java/org/apache/maven/RepositoryUtils.java | 47 ++-----
.../resolver/filter/ExclusionArtifactFilter.java | 53 +++----
.../maven/classrealm/DefaultClassRealmManager.java | 8 +-
.../org/apache/maven/execution/MavenSession.java | 12 +-
.../maven/extension/internal/CoreExports.java | 14 +-
.../extension/internal/CoreExportsProvider.java | 22 +--
.../maven/internal/MultilineMessageHelper.java | 91 ++++++++++++
.../DefaultRepositorySystemSessionFactory.java | 57 ++++++++
.../aether/MavenChainedWorkspaceReader.java | 106 ++++++++++++++
.../apache/maven/lifecycle/DefaultLifecycles.java | 5 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 15 +-
.../internal/DefaultMojoExecutionConfigurator.java | 87 ++++++++++++
.../lifecycle/internal/LifecycleModuleBuilder.java | 13 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 5 +-
.../maven/lifecycle/internal/MojoExecutor.java | 135 ++++++++++++++----
.../maven/lifecycle/internal/ReactorContext.java | 14 +-
.../lifecycle/internal/builder/BuilderCommon.java | 34 ++---
.../multithreaded/MultiThreadedBuilder.java | 2 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 3 +-
.../AbstractLifecycleMappingProvider.java | 24 ++++
.../packaging/EarLifecycleMappingProvider.java | 11 +-
.../packaging/EjbLifecycleMappingProvider.java | 17 +--
.../packaging/JarLifecycleMappingProvider.java | 17 +--
.../MavenPluginLifecycleMappingProvider.java | 21 +--
.../packaging/PomLifecycleMappingProvider.java | 5 +-
.../packaging/RarLifecycleMappingProvider.java | 17 +--
.../packaging/WarLifecycleMappingProvider.java | 17 +--
.../plugin/DefaultMojosExecutionStrategy.java | 24 ++--
.../MojoExecutionRunner.java} | 23 ++--
.../MojosExecutionStrategy.java} | 35 +++--
.../AbstractMavenPluginParametersValidator.java | 152 +++++++++++++++++++++
.../plugin/internal/DefaultMavenPluginManager.java | 39 +++++-
.../plugin/internal/DeprecatedPluginValidator.java | 100 ++++++++++++++
...java => MavenPluginConfigurationValidator.java} | 21 +--
.../ReadOnlyPluginParametersValidator.java | 80 +++++++++++
.../internal/ValidatingConfigurationListener.java | 2 -
.../maven/project/DefaultProjectBuilder.java | 9 +-
.../maven/session/scope/internal/SessionScope.java | 137 +++++++++++--------
.../settings/DefaultMavenSettingsBuilder.java | 6 +-
.../main/resources/META-INF/maven/extension.xml | 5 +
.../java/org/apache/maven/DefaultMavenTest.java | 36 ++++-
.../maven/execution/DefaultMavenExecutionTest.java | 1 +
.../maven/internal/MultilineMessageHelperTest.java | 71 ++++++++++
.../maven/lifecycle/DefaultLifecyclesTest.java | 4 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 20 +--
.../project/DefaultMavenProjectBuilderTest.java | 10 --
.../apache/maven/project/PomConstructionTest.java | 34 -----
.../apache/maven/project/ProjectBuilderTest.java | 48 +++----
.../session/scope/internal/SessionScopeTest.java | 81 -----------
.../default-maven/simple/pom.xml} | 6 +-
.../child/pom.xml | 104 --------------
.../unprefixed-expression-interpolation/pom.xml | 36 -----
...pom-resolves-from-property-based-repository.xml | 31 -----
maven-embedder/pom.xml | 7 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 68 +++++++--
.../maven/cli/event/ExecutionEventLogger.java | 10 ++
.../internal/BootstrapCoreExtensionManager.java | 49 ++++++-
maven-embedder/src/main/mdo/core-extensions.mdo | 8 ++
.../java/org/apache/maven/cli/MavenCliTest.java | 45 ++++--
.../maven/cli/event/ExecutionEventLoggerTest.java | 56 ++++++++
.../AbstractStringBasedModelInterpolator.java | 15 +-
.../interpolation/ProblemDetectingValueSource.java | 86 ------------
.../StringSearchModelInterpolator.java | 2 +-
.../StringVisitorModelInterpolator.java | 2 +-
.../profile/DefaultProfileActivationContext.java | 27 ++--
.../profile/activation/FileProfileActivator.java | 2 +-
.../OperatingSystemProfileActivator.java | 8 +-
.../activation/PropertyProfileActivator.java | 8 +-
.../AbstractModelInterpolatorTest.java | 16 +--
.../transform/BuildToRawPomXMLFilterFactory.java | 4 +-
.../maven/model/transform/FastForwardFilter.java | 45 ++++--
.../RawToConsumerPomXMLFilterFactory.java | 7 +-
.../model/transform/pull/BufferingParser.java | 28 ++--
.../maven/model/transform/ParentXMLFilterTest.java | 85 +++++++++++-
maven-model/pom.xml | 5 -
maven-model/src/main/mdo/maven.mdo | 18 +--
maven-resolver-provider/pom.xml | 6 +-
.../internal/DefaultArtifactDescriptorReader.java | 8 +-
.../internal/DefaultModelCacheFactory.java | 21 ++-
.../repository/internal/MavenResolverModule.java | 3 +-
.../{package-info.java => ModelCacheFactory.java} | 18 ++-
pom.xml | 71 +++++-----
103 files changed, 1885 insertions(+), 1123 deletions(-)
rename apache-maven/src/main/appended-resources/licenses/{MIT-slf4j-api-1.7.32.txt => MIT-slf4j-api-1.7.36.txt} (100%)
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
copy maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java => maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java (60%)
copy maven-core/src/main/java/org/apache/maven/{lifecycle/MissingProjectException.java => plugin/MojoExecutionRunner.java} (66%)
copy maven-core/src/main/java/org/apache/maven/{execution/ProjectExecutionListener.java => plugin/MojosExecutionStrategy.java} (52%)
create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java
create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
copy maven-core/src/main/java/org/apache/maven/plugin/internal/{MavenPluginValidator.java => MavenPluginConfigurationValidator.java} (60%)
create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java
create mode 100644 maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/session/scope/internal/SessionScopeTest.java
copy maven-core/src/test/{resources/projects/badPom.xml => projects/default-maven/simple/pom.xml} (67%)
delete mode 100644 maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
delete mode 100644 maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
delete mode 100644 maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
delete mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
copy maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java => maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java (70%)
copy maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/{package-info.java => ModelCacheFactory.java} (77%)
[maven] 01/01: [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7020
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 21dfa030932e18f60c28c8a1c696bb4ef12e774d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Nov 13 23:25:52 2020 +0100
[MNG-7020] Remove Maven 2 WagonExcluder backward compat code
---
.../DefaultPluginDependenciesResolver.java | 7 +-
.../PluginDependencyResolutionListener.java | 150 ---------------------
.../maven/plugin/internal/WagonExcluder.java | 109 ---------------
3 files changed, 1 insertion(+), 265 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index 076a3cbfe..a31ca6201 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -42,7 +42,6 @@ import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.graph.DependencyVisitor;
@@ -58,7 +57,6 @@ import org.eclipse.aether.util.artifact.JavaScopes;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
-import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -189,11 +187,8 @@ public class DefaultPluginDependenciesResolver
try
{
- DependencySelector selector =
- AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );
-
DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
- pluginSession.setDependencySelector( selector );
+ pluginSession.setDependencySelector( session.getDependencySelector() );
pluginSession.setDependencyGraphTransformer( session.getDependencyGraphTransformer() );
CollectRequest request = new CollectRequest();
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
deleted file mode 100644
index 42eb80ed8..000000000
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.apache.maven.plugin.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ResolutionListener;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.VersionRange;
-
-/**
- * Assists in detecting wagon providers brought into the plugin class path via legacy Maven core artifacts (e.g.
- * maven-core:2.0.6) and excluding them. A plugin should be able to explicitly declare dependencies on specific wagons
- * for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not
- * intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the
- * core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561).
- *
- * @since 3.0
- * @author Benjamin Bentmann
- */
-class PluginDependencyResolutionListener
- implements ResolutionListener
-{
-
- private ArtifactFilter coreFilter;
-
- private LinkedList<Artifact> coreArtifacts = new LinkedList<>();
-
- private Artifact wagonProvider;
-
- private Map<Artifact, Object> bannedArtifacts = new IdentityHashMap<>();
-
- PluginDependencyResolutionListener( ArtifactFilter coreFilter )
- {
- this.coreFilter = coreFilter;
- }
-
- public void removeBannedDependencies( Collection<Artifact> artifacts )
- {
- if ( !bannedArtifacts.isEmpty() && artifacts != null )
- {
- artifacts.removeIf( artifact -> bannedArtifacts.containsKey( artifact ) );
- }
- }
-
- public void startProcessChildren( Artifact artifact )
- {
- if ( wagonProvider == null )
- {
- if ( isLegacyCoreArtifact( artifact ) )
- {
- coreArtifacts.addFirst( artifact );
- }
- else if ( !coreArtifacts.isEmpty() && isWagonProvider( artifact ) )
- {
- wagonProvider = artifact;
- bannedArtifacts.put( artifact, null );
- }
- }
- }
-
- private boolean isLegacyCoreArtifact( Artifact artifact )
- {
- String version = artifact.getVersion();
- return version != null && version.startsWith( "2." ) && !coreFilter.include( artifact );
- }
-
- public void endProcessChildren( Artifact artifact )
- {
- if ( wagonProvider == artifact )
- {
- wagonProvider = null;
- }
- else if ( coreArtifacts.peek() == artifact )
- {
- coreArtifacts.removeFirst();
- }
- }
-
- public void includeArtifact( Artifact artifact )
- {
- if ( wagonProvider != null )
- {
- bannedArtifacts.put( artifact, null );
- }
- }
-
- private boolean isWagonProvider( Artifact artifact )
- {
- if ( "org.apache.maven.wagon".equals( artifact.getGroupId() ) )
- {
- return artifact.getArtifactId().startsWith( "wagon-" );
- }
- return false;
- }
-
- public void manageArtifact( Artifact artifact, Artifact replacement )
- {
- }
-
- public void omitForCycle( Artifact artifact )
- {
- }
-
- public void omitForNearer( Artifact omitted, Artifact kept )
- {
- }
-
- public void restrictRange( Artifact artifact, Artifact replacement, VersionRange newRange )
- {
- }
-
- public void selectVersionFromRange( Artifact artifact )
- {
- }
-
- public void testArtifact( Artifact node )
- {
- }
-
- public void updateScope( Artifact artifact, String scope )
- {
- }
-
- public void updateScopeCurrentPom( Artifact artifact, String ignoredScope )
- {
- }
-
-}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
deleted file mode 100644
index d374cab9a..000000000
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.apache.maven.plugin.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.DependencyCollectionContext;
-import org.eclipse.aether.collection.DependencySelector;
-import org.eclipse.aether.graph.Dependency;
-
-/**
- * Assists in detecting wagon providers brought into the plugin class path via legacy Maven core artifacts (e.g.
- * maven-core:2.0.6) and excluding them. A plugin should be able to explicitly declare dependencies on specific wagons
- * for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not
- * intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the
- * core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561).
- *
- * @author Benjamin Bentmann
- */
-class WagonExcluder
- implements DependencySelector
-{
-
- private final boolean coreArtifact;
-
- WagonExcluder()
- {
- this( false );
- }
-
- private WagonExcluder( boolean coreArtifact )
- {
- this.coreArtifact = coreArtifact;
- }
-
- public boolean selectDependency( Dependency dependency )
- {
- return !coreArtifact || !isWagonProvider( dependency.getArtifact() );
- }
-
- public DependencySelector deriveChildSelector( DependencyCollectionContext context )
- {
- if ( coreArtifact || !isLegacyCoreArtifact( context.getDependency().getArtifact() ) )
- {
- return this;
- }
- else
- {
- return new WagonExcluder( true );
- }
- }
-
- private boolean isLegacyCoreArtifact( Artifact artifact )
- {
- String version = artifact.getVersion();
- return version != null && version.startsWith( "2." ) && artifact.getArtifactId().startsWith( "maven-" )
- && artifact.getGroupId().equals( "org.apache.maven" );
- }
-
- private boolean isWagonProvider( Artifact artifact )
- {
- if ( "org.apache.maven.wagon".equals( artifact.getGroupId() ) )
- {
- return artifact.getArtifactId().startsWith( "wagon-" );
- }
- return false;
- }
-
- @Override
- public boolean equals( Object obj )
- {
- if ( obj == this )
- {
- return true;
- }
- else if ( obj == null || !getClass().equals( obj.getClass() ) )
- {
- return false;
- }
-
- WagonExcluder that = (WagonExcluder) obj;
- return coreArtifact == that.coreArtifact;
- }
-
- @Override
- public int hashCode()
- {
- int hash = getClass().hashCode();
- hash = hash * 31 + ( coreArtifact ? 1 : 0 );
- return hash;
- }
-
-}