Skip to content

[release/10.0.1xx] [build] Recommend latest supported JDK in workload metadata #12543

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
jonathanpeppers merged 1 commit into from
Aug 28, 2026
Merged

[release/10.0.1xx] [build] Recommend latest supported JDK in workload metadata #12543

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
14 changes: 9 additions & 5 deletions tools/workload-dependencies/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ JProperty CreateJdkProperty (XDocument doc)
var v = new Version (JdkVersion ?? "17.0");
var start = new Version (v.Major, v.Minor);
var end = GetMaxJdkVersion (v);
var latestRevision = JdkVersion ?? GetLatestRevision (doc, "jdk");
var latestRevision = GetLatestRevision (doc, "jdk", start, new Version (end));
var contents = new JObject (
new JProperty ("version", $"[{start},{end})"));
if (!string.IsNullOrEmpty (latestRevision))
Expand Down Expand Up @@ -196,15 +196,19 @@ IEnumerable<XElement> GetSupportedElements (XDocument doc, string element)
;
}

IEnumerable<(XElement Element, string Revision)> GetByRevisions (XDocument doc, string element)
IEnumerable<(XElement Element, string Revision, Version Version)> GetByRevisions (XDocument doc, string element)
{
return GetSupportedElements (doc, element)
.OrderByRevision ();
}

string? GetLatestRevision (XDocument doc, string element)
string? GetLatestRevision (XDocument doc, string element, Version minimumVersion, Version maximumVersion)
{
return GetByRevisions (doc, element)
.Where (item => {
var version = item.Version;
return version >= minimumVersion && version < maximumVersion;
})
.LastOrDefault ()
.Revision;
}
Expand Down Expand Up @@ -375,12 +379,12 @@ public static string ReqAttr (this XElement e, string attribute)
return v;
}

public static IEnumerable<(XElement Element, string Revision)> OrderByRevision (this IEnumerable<XElement> elements)
public static IEnumerable<(XElement Element, string Revision, Version Version)> OrderByRevision (this IEnumerable<XElement> elements)
{
return from e in elements
let revision = e.ReqAttr ("revision")
let version = new Version (revision.Contains (".") ? revision : revision + ".0")
orderby version
select (e, revision);
select (e, revision, version);
}
}