diff --git a/src/it-harness-poms/mdep-66/pom.xml b/src/it-harness-poms/mdep-66/pom.xml index d1fecc628..62e1c19a4 100644 --- a/src/it-harness-poms/mdep-66/pom.xml +++ b/src/it-harness-poms/mdep-66/pom.xml @@ -50,7 +50,7 @@ under the License. compile-sources generate-sources - sources + resolve-sources compile @@ -60,7 +60,7 @@ under the License. test-sources generate-sources - sources + resolve-sources test diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java deleted file mode 100644 index 866c1b84e..000000000 --- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.plugins.dependency.resolvers; - -import javax.inject.Inject; - -import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.ResolutionScope; -import org.apache.maven.plugins.dependency.utils.ResolverUtil; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.ProjectBuilder; -import org.sonatype.plexus.build.incremental.BuildContext; - -/** - * Goal that resolves the project source dependencies from the repository. - * - * @author Brian Fox - * @since 2.0-alpha2 - * @deprecated in favor of {@code resolve-sources} goal and will be removed in a future version - */ -@Mojo( - name = "sources", - defaultPhase = LifecyclePhase.GENERATE_SOURCES, - requiresDependencyResolution = ResolutionScope.TEST, - threadSafe = true) -@Deprecated -public class OldResolveDependencySourcesMojo extends ResolveDependencySourcesMojo { - - @Inject - // CHECKSTYLE_OFF: ParameterNumber - public OldResolveDependencySourcesMojo( - MavenSession session, - BuildContext buildContext, - MavenProject project, - ResolverUtil resolverUtil, - ProjectBuilder projectBuilder, - ArtifactHandlerManager artifactHandlerManager) { - super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager); - } - // CHECKSTYLE_ON: ParameterNumber -} diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index ca058aeff..88b783f12 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -55,7 +55,6 @@ The Dependency plugin has several goals: - [dependency:resolve](./resolve-mojo.html) tells Maven to resolve all dependencies and displays the version. **JAVA 9 NOTE:** _will display the module name when running with Java 9._ - [dependency:resolve-plugins](./resolve-plugins-mojo.html) tells Maven to resolve plugins and their dependencies. - [dependency:resolve-sources](./resolve-sources-mojo.html) tells Maven to resolve all dependencies and their source attachments, and displays the version. -- [dependency:sources](./sources-mojo.html) has been deprecated for removal in favor of [dependency:resolve-sources](./resolve-sources-mojo.html). - [dependency:tree](./tree-mojo.html) displays the dependency tree for this project. - [dependency:unpack](./unpack-mojo.html) like copy but unpacks. - [dependency:unpack-dependencies](./unpack-dependencies-mojo.html) like copy-dependencies but unpacks. diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestSkip.java b/src/test/java/org/apache/maven/plugins/dependency/TestSkip.java index 582b56879..b7f24d7a2 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/TestSkip.java +++ b/src/test/java/org/apache/maven/plugins/dependency/TestSkip.java @@ -39,8 +39,8 @@ import org.apache.maven.plugins.dependency.fromDependencies.UnpackDependenciesMojo; import org.apache.maven.plugins.dependency.resolvers.GoOfflineMojo; import org.apache.maven.plugins.dependency.resolvers.ListMojo; -import org.apache.maven.plugins.dependency.resolvers.OldResolveDependencySourcesMojo; import org.apache.maven.plugins.dependency.resolvers.ResolveDependenciesMojo; +import org.apache.maven.plugins.dependency.resolvers.ResolveDependencySourcesMojo; import org.apache.maven.plugins.dependency.resolvers.ResolvePluginsMojo; import org.apache.maven.plugins.dependency.tree.TreeMojo; import org.junit.jupiter.api.Test; @@ -173,9 +173,9 @@ void testSkipResolvePlugins(ResolvePluginsMojo mojo) throws Exception { } @Test - @InjectMojo(goal = "sources") + @InjectMojo(goal = "resolve-sources") @MojoParameter(name = "skip", value = "true") - void testSkipSources(OldResolveDependencySourcesMojo mojo) throws Exception { + void testSkipResolveSources(ResolveDependencySourcesMojo mojo) throws Exception { doTest(mojo); }