This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push: new 4eca443b Stop setting deprecated dependency artifacts (#457) 4eca443b is described below commit 4eca443b3b10197554d3c5f1c58b8abc832c57eb Author: Elliotte Rusty Harold <elh...@users.noreply.github.com> AuthorDate: Mon Nov 18 22:03:03 2024 +0000 Stop setting deprecated dependency artifacts (#457) * Stop using deprecated dependency artifacts --- .../plugins/dependency/TestPropertiesMojo.java | 2 -- .../fromDependencies/TestCopyDependenciesMojo.java | 32 ++++++++-------------- .../TestCopyDependenciesMojo2.java | 13 --------- .../TestUnpackDependenciesMojo.java | 23 +--------------- .../TestUnpackDependenciesMojo2.java | 6 ---- .../plugins/dependency/tree/TestTreeMojo.java | 1 - 6 files changed, 13 insertions(+), 64 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestPropertiesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/TestPropertiesMojo.java index ede675d2..75ae7cab 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/TestPropertiesMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/TestPropertiesMojo.java @@ -56,9 +56,7 @@ public class TestPropertiesMojo extends AbstractDependencyMojoTestCase { artifacts.addAll(directArtifacts); project.setArtifacts(artifacts); - project.setDependencyArtifacts(directArtifacts); - // this.assertNull( project.getProperties().getProperty( "org.apacha ) ) mojo.execute(); for (Artifact artifact : artifacts) { diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java index 91ebbd46..ff2d4261 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java @@ -74,7 +74,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { artifacts.addAll(directArtifacts); project.setArtifacts(artifacts); - project.setDependencyArtifacts(directArtifacts); mojo.markersDirectory = new File(this.testDir, "markers"); ArtifactHandlerManager manager = lookup(ArtifactHandlerManager.class); @@ -160,7 +159,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { mojo.excludeTransitive = true; mojo.execute(); - Set<Artifact> artifacts = mojo.getProject().getDependencyArtifacts(); + Set<Artifact> artifacts = mojo.getProject().getArtifacts(); for (Artifact artifact : artifacts) { String fileName = DependencyUtil.getFormattedFileName(artifact, false); File file = new File(mojo.outputDirectory, fileName); @@ -170,7 +169,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeTypes = "jar"; mojo.execute(); @@ -184,7 +183,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeTypes = "jar"; mojo.excludeTypes = "jar"; @@ -212,7 +210,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeArtifactId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getArtifactArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeArtifactIds = "one"; mojo.execute(); @@ -226,7 +223,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeArtifactId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getArtifactArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeArtifactIds = "one"; mojo.excludeArtifactIds = "one"; @@ -254,7 +250,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeGroupId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getGroupIdArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.includeGroupIds = "one"; mojo.excludeGroupIds = "one"; // shouldn't get anything @@ -281,7 +277,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeGroupId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getGroupIdArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeGroupIds = "one"; mojo.execute(); @@ -296,7 +292,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeMultipleGroupIds() throws Exception { mojo.getProject().setArtifacts(stubFactory.getGroupIdArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeGroupIds = "one,two"; mojo.execute(); @@ -312,7 +308,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeClassifier() throws Exception { mojo.getProject().setArtifacts(stubFactory.getClassifiedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeClassifiers = "one"; mojo.execute(); @@ -326,7 +322,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeClassifier() throws Exception { mojo.getProject().setArtifacts(stubFactory.getClassifiedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeClassifiers = "one"; mojo.excludeClassifiers = "one"; @@ -354,7 +349,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testSubPerType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.useSubDirectoryPerType = true; mojo.execute(); @@ -455,7 +450,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { artifacts.add(release); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteIfNewer = false; @@ -486,7 +480,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { artifacts.add(release); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteReleases = true; mojo.overWriteIfNewer = false; @@ -514,7 +507,6 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { artifacts.add(snap); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteReleases = false; mojo.overWriteSnapshots = false; @@ -569,7 +561,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeProvidedScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeScope = "provided"; mojo.execute(); @@ -586,7 +578,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeSystemScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeScope = "system"; mojo.execute(); @@ -603,7 +595,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeCompileScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeScope = "compile"; mojo.execute(); ScopeArtifactFilter saf = new ScopeArtifactFilter(mojo.excludeScope); @@ -619,7 +611,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeTestScope() throws IOException, MojoFailureException { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeScope = "test"; try { @@ -632,7 +624,7 @@ public class TestCopyDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeRuntimeScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); + mojo.excludeScope = "runtime"; mojo.execute(); ScopeArtifactFilter saf = new ScopeArtifactFilter(mojo.excludeScope); diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java index aaf07685..f46370d2 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java @@ -24,7 +24,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collection; -import java.util.HashSet; import java.util.Set; import org.apache.commons.lang3.StringUtils; @@ -79,7 +78,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { artifacts.addAll(directArtifacts); project.setArtifacts(artifacts); - project.setDependencyArtifacts(directArtifacts); mojo.markersDirectory = new File(this.testDir, "markers"); LegacySupport legacySupport = lookup(LegacySupport.class); @@ -89,7 +87,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testCopyDependenciesMojoIncludeCompileScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "compile"; mojo.execute(); @@ -107,7 +104,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testCopyDependenciesMojoIncludeTestScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "test"; mojo.execute(); @@ -125,7 +121,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testCopyDependenciesMojoIncludeRuntimeScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "runtime"; mojo.execute(); @@ -143,7 +138,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testCopyDependenciesMojoIncludeprovidedScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "provided"; mojo.execute(); @@ -159,7 +153,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testCopyDependenciesMojoIncludesystemScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "system"; mojo.execute(); @@ -190,7 +183,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testSubPerArtifactAndType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerArtifact = true; mojo.useSubDirectoryPerType = true; @@ -208,7 +200,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testSubPerArtifactAndScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerArtifact = true; mojo.useSubDirectoryPerScope = true; @@ -233,12 +224,10 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { createExpandedVersionArtifact(baseVersion, groupId, artifactId, "compile", "jar", null); mojo.getProject().getArtifacts().add(expandedSnapshot); - mojo.getProject().getDependencyArtifacts().add(expandedSnapshot); Artifact pomExpandedSnapshot = createExpandedVersionArtifact(baseVersion, groupId, artifactId, "compile", "pom", null); mojo.getProject().getArtifacts().add(pomExpandedSnapshot); - mojo.getProject().getDependencyArtifacts().add(pomExpandedSnapshot); mojo.useRepositoryLayout = true; mojo.execute(); @@ -329,7 +318,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testSubPerArtifactAndTypeRemoveVersion() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerArtifact = true; mojo.useSubDirectoryPerType = true; mojo.stripVersion = true; @@ -364,7 +352,6 @@ public class TestCopyDependenciesMojo2 extends AbstractDependencyMojoTestCase { public void testSubPerArtifactAndTypeRemoveType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerArtifact = true; mojo.useSubDirectoryPerType = true; mojo.stripType = true; diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java index ef795a2e..9c913e2a 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java @@ -20,7 +20,6 @@ package org.apache.maven.plugins.dependency.fromDependencies; import java.io.File; import java.io.IOException; -import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -86,7 +85,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { artifacts.addAll(directArtifacts); project.setArtifacts(artifacts); - project.setDependencyArtifacts(directArtifacts); mojo.markersDirectory = new File(this.testDir, "markers"); ArtifactHandlerManager manager = lookup(ArtifactHandlerManager.class); @@ -140,14 +138,13 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testNoTransitive() throws Exception { mojo.excludeTransitive = true; mojo.execute(); - for (Artifact artifact : mojo.getProject().getDependencyArtifacts()) { + for (Artifact artifact : mojo.getProject().getArtifacts()) { assertUnpacked(artifact); } } public void testExcludeType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArchiveArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeTypes = "jar"; mojo.execute(); @@ -158,7 +155,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeProvidedScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeScope = "provided"; mojo.execute(); @@ -170,7 +166,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeSystemScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeScope = "system"; mojo.execute(); @@ -182,7 +177,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeCompileScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeScope = "compile"; mojo.execute(); ScopeArtifactFilter saf = new ScopeArtifactFilter(mojo.excludeScope); @@ -194,7 +188,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeTestScope() throws IOException, MojoFailureException { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeScope = "test"; try { @@ -207,7 +200,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeRuntimeScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeScope = "runtime"; mojo.execute(); ScopeArtifactFilter saf = new ScopeArtifactFilter(mojo.excludeScope); @@ -219,7 +211,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArchiveArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeTypes = "jar"; mojo.excludeTypes = "jar"; @@ -247,7 +238,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testSubPerType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArchiveArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerType = true; mojo.execute(); @@ -267,7 +257,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testSubPerArtifactAndType() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArchiveArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerArtifact = true; mojo.useSubDirectoryPerType = true; mojo.execute(); @@ -289,7 +278,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testSubPerArtifactAndTypeRemoveVersion() throws Exception { mojo.getProject().setArtifacts(stubFactory.getTypedArchiveArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.useSubDirectoryPerArtifact = true; mojo.useSubDirectoryPerType = true; mojo.stripVersion = true; @@ -302,7 +290,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeCompileScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "compile"; mojo.execute(); ScopeArtifactFilter saf = new ScopeArtifactFilter(mojo.includeScope); @@ -314,7 +301,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeTestScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "test"; mojo.execute(); @@ -327,7 +313,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeRuntimeScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "runtime"; mojo.execute(); ScopeArtifactFilter saf = new ScopeArtifactFilter(mojo.includeScope); @@ -339,7 +324,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeprovidedScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "provided"; mojo.execute(); @@ -350,7 +334,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludesystemScope() throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeScope = "system"; mojo.execute(); @@ -362,7 +345,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeArtifactId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getArtifactArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeArtifactIds = "one"; mojo.excludeArtifactIds = "one"; @@ -386,7 +368,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeArtifactId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getArtifactArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeArtifactIds = "one"; mojo.execute(); @@ -400,7 +381,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testExcludeGroupId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getGroupIdArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.excludeGroupIds = "one"; mojo.execute(); @@ -411,7 +391,6 @@ public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase { public void testIncludeGroupId() throws Exception { mojo.getProject().setArtifacts(stubFactory.getGroupIdArtifacts()); - mojo.getProject().setDependencyArtifacts(new HashSet<>()); mojo.includeGroupIds = "one"; mojo.excludeGroupIds = "one"; // shouldn't get anything diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java index cba5392f..27e43c9f 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java @@ -70,7 +70,6 @@ public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase artifacts.addAll(directArtifacts); project.setArtifacts(artifacts); - project.setDependencyArtifacts(directArtifacts); mojo.markersDirectory = new File(this.testDir, "markers"); } @@ -106,7 +105,6 @@ public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase artifacts.add(release); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteIfNewer = false; @@ -125,7 +123,6 @@ public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase artifacts.add(release); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteReleases = true; mojo.overWriteIfNewer = false; @@ -145,7 +142,6 @@ public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase artifacts.add(snap); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteReleases = false; mojo.overWriteSnapshots = false; @@ -166,7 +162,6 @@ public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase artifacts.add(snap); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteReleases = false; mojo.overWriteSnapshots = true; @@ -187,7 +182,6 @@ public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase artifacts.add(snap); mojo.getProject().setArtifacts(artifacts); - mojo.getProject().setDependencyArtifacts(artifacts); mojo.overWriteReleases = false; mojo.overWriteSnapshots = false; diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java index edbceb87..ad096f03 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java @@ -111,7 +111,6 @@ public class TestTreeMojo extends AbstractDependencyMojoTestCase { Arrays.asList("testGroupId:release:jar:1.0:compile", "testGroupId:snapshot:jar:2.0-SNAPSHOT:compile"); assertTrue(expectedNodes.containsAll(actualNodes)); - ; } /**