Skip to content

MavenVersionSettings: Stick to maven 3 plugins for now #7574

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
mbien merged 1 commit into from
Jul 14, 2024
Merged

MavenVersionSettings: Stick to maven 3 plugins for now #7574

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
7 changes: 5 additions & 2 deletions java/maven/src/org/netbeans/modules/maven/options/MavenVersionSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public final class MavenVersionSettings {
entry(key("org.netbeans.api", "org-netbeans-modules-editor"), nb_version), // represents all other nb artifacts
entry(key(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_COMPILER), "3.13.0"),
entry(key(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_RESOURCES), "3.3.1"),
entry(key(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_FAILSAFE), "3.2.5"),
entry(key(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_SUREFIRE), "3.2.5"),
entry(key(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_FAILSAFE), "3.3.1"),
entry(key(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_SUREFIRE), "3.3.1"),
entry(key("org.apache.netbeans.utilities", "utilities-parent"), nb_utilities_version),
entry(key("org.apache.netbeans.utilities", "nbm-maven-harness"), nb_utilities_version),
entry(key("org.apache.netbeans.utilities", "nbm-shared"), nb_utilities_version),
Expand Down Expand Up @@ -87,10 +87,13 @@ public String getVersion(String groupId, String artifactId) {
// non blocking query, might not succeed if index not available
private static String queryLatestKnownArtifactVersion(String gid, String aid, String min) {
RepositoryQueries.Result<NBVersionInfo> query = RepositoryQueries.getVersionsResult(gid, aid, null);
// TODO don't upgrade to maven 4 plugins for now - we should take the active mvn version into account for a proper fix
boolean onlyMaven3 = Constants.GROUP_APACHE_PLUGINS.equals(gid);
// Versions are sorted in descending order
return query.getResults().stream()
.map(NBVersionInfo::getVersion)
.filter(v -> !v.endsWith("-SNAPSHOT"))
.filter(v -> !onlyMaven3 || (onlyMaven3 && v.startsWith("3.")))
.findFirst()
.filter(v -> min == null || new ComparableVersion(v).compareTo(new ComparableVersion(min)) > 0) // don't downgrade
.orElse(min);
Expand Down