Skip to content

Fixes #1295: getAllUpdates(boolean) should respect currentVersionRange #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slachiewicz merged 1 commit into from
Oct 26, 2025
Merged

Fixes #1295: getAllUpdates(boolean) should respect currentVersionRange #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion versions-common/src/main/java/org/codehaus/mojo/versions/api/AbstractVersionDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,16 @@ public final ArtifactVersion[] getAllUpdates(Optional<Segment> updateScope, bool

@Override
public final ArtifactVersion[] getAllUpdates(boolean includeSnapshots) {
return getAllUpdates((VersionRange) null, includeSnapshots);
ArtifactVersion[] updates = getAllUpdates((VersionRange) null, includeSnapshots);
if (getCurrentVersion() == null) {
ArtifactVersion lowerBound = getHighestLowerBound(null);
return Arrays.stream(updates)
.filter(v -> !getCurrentVersionRange().containsVersion(v))
.filter(v -> v.compareTo(lowerBound) > 0)
.toArray(ArtifactVersion[]::new);
} else {
return updates;
}
}

@Override
Expand Down
32 changes: 32 additions & 0 deletions versions-common/src/test/java/org/codehaus/mojo/versions/api/ArtifactVersionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,22 @@
*/

import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.Restriction;
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
import org.codehaus.mojo.versions.utils.ArtifactVersionService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static java.util.Optional.of;
import static org.codehaus.mojo.versions.api.Segment.INCREMENTAL;
Expand All @@ -38,10 +45,13 @@
import static org.codehaus.mojo.versions.utils.ArtifactVersionUtils.version;
import static org.codehaus.mojo.versions.utils.ArtifactVersionUtils.versions;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -272,4 +282,26 @@ void testGetNewestVersionWithLesserSegmentWithSnapshots() throws InvalidSegmentE
instance.getNewestVersion("1.0.0", of(INCREMENTAL), true, false).get(),
hasToString("1.0.0-1-SNAPSHOT"));
}

@ParameterizedTest
@ValueSource(strings = {"(1, 3]", "(0, 1], (2, 3]"})
void testAllUpdatesWithCurrentVersionRange(String versionRange) throws InvalidVersionSpecificationException {
ArtifactVersions instance = new ArtifactVersions(
new DefaultArtifact(
"default-group",
"dummy-api",
VersionRange.createFromVersionSpec(versionRange),
"foo",
"bar",
"jar",
null),
Stream.of("1", "2", "3", "4")
.map(ArtifactVersionService::getArtifactVersion)
.collect(Collectors.toList()));
List<String> allUpdates = Arrays.stream(instance.getAllUpdates(false))
.map(Object::toString)
.collect(Collectors.toList());
assertThat(allUpdates, hasItem("4"));
assertThat(allUpdates, allOf(not(hasItem("1")), not(hasItem("2")), not(hasItem("3"))));
}
}