From 4f16d5ecd94f85e6e7d793e6b6b82f20c9afbf56 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 25 Apr 2024 19:24:11 +0200 Subject: [PATCH] [MRESOLVER-547] Just use setVersion (#483) No need for full copy, Artifact is already immutable. Moreover, the instance may be not DefaultArtifact but something else. And finally, setVersion already have "optimization" to return this if version is same as the one we want to copy with. --- https://issues.apache.org/jira/browse/MRESOLVER-547 --- .github/workflows/maven-verify.yml | 2 +- .../impl/collect/bf/BfDependencyCollector.java | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index e160fa904..41144f5e4 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -24,7 +24,7 @@ on: jobs: build: name: Verify - uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 + uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 with: ff-site-run: false maven-matrix: '[ "3.9.6" ]' diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java index 68a417579..85d267e9c 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java @@ -45,8 +45,6 @@ import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.RequestTrace; import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactType; -import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.collection.CollectRequest; import org.eclipse.aether.collection.DependencyManager; import org.eclipse.aether.collection.DependencySelector; @@ -431,14 +429,7 @@ private void resolveArtifactDescriptorAsync(Args args, DependencyProcessingConte private ArtifactDescriptorResult resolveDescriptorForVersion( Args args, DependencyProcessingContext context, Results results, Dependency dependency, Version version) { Artifact original = dependency.getArtifact(); - Artifact newArtifact = new DefaultArtifact( - original.getGroupId(), - original.getArtifactId(), - original.getClassifier(), - original.getExtension(), - version.toString(), - original.getProperties(), - (ArtifactType) null); + Artifact newArtifact = original.setVersion(version.toString()); Dependency newDependency = new Dependency(newArtifact, dependency.getScope(), dependency.isOptional(), dependency.getExclusions()); DependencyProcessingContext newContext = context.copy();