This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch maven-resolver-1.9.x in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/maven-resolver-1.9.x by this push: new 4f16d5ec [MRESOLVER-547] Just use setVersion (#483) 4f16d5ec is described below commit 4f16d5ecd94f85e6e7d793e6b6b82f20c9afbf56 Author: Tamas Cservenak <ta...@cservenak.net> AuthorDate: Thu Apr 25 19:24:11 2024 +0200 [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 +- .../internal/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 e160fa90..41144f5e 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 68a41757..85d267e9 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 java.util.stream.Stream; 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 @@ public class BfDependencyCollector extends DependencyCollectorDelegate implement 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();