Skip to content

Merge java/openjdk-*.xml into single java/openjdk.xml#1358

Merged
bastianeicher merged 2 commits intomasterfrom
copilot/merge-openjdk-xml-files
Mar 22, 2026
Merged

Merge java/openjdk-*.xml into single java/openjdk.xml#1358
bastianeicher merged 2 commits intomasterfrom
copilot/merge-openjdk-xml-files

Conversation

Copy link
Contributor

Copilot AI commented Mar 22, 2026

Consolidates 18 per-version OpenJDK feed files (openjdk-9.xml through openjdk-26.xml) into a single java/openjdk.xml, and renames openjdk-26.xml.template / openjdk-26.watch.py to drop the version suffix.

Structure of merged openjdk.xml

Groups are merged where arch attribute and command set are identical; otherwise kept separate. Results in 11 groups:

Groups arch Versions Notes
1 Linux-x86_64 9–10 servertool, appletviewer, idlj, schemagen, ws* tools
2 Linux-x86_64 11 stripped legacy tools, no jfr
3 Linux-x86_64 12–15 adds jfr
4 (none) 16–18 same commands as group 3; multi-arch impls
5 (none) 19–23 drops rmid/jjs/jaotc/rmic; adds jpackage, jwebserver
6 (none) 24–26 adds jnativescan
7 Windows-x86_64 9–10
8 Windows-x86_64 11
9 Windows-x86_64 12–18 adds jfr
10 Windows-x86_64 19–23
11 Windows-x86_64 24–26 adds jnativescan

All 98 implementations from the source files are preserved.

Reference updates

  • jdk.xml: 18 individual <feed> elements replaced with one:
    <feed src="https://apps.0install.net/java/openjdk.xml"/>
  • openjdk.xml.template: <feed-for> updated from openjdk-26.xmlopenjdk.xml
  • openjdk-26.watch.pyopenjdk.watch.py (no content change)

Bug fix

Pre-existing copy-paste bug in versions 16–25: implementations inside arch="Windows-x86_64" groups carried a spurious arch="Linux-x86_64" attribute (overriding the group, making them invisible to Windows clients). These incorrect attributes are removed in the merged file.


💬 Send tasks to Copilot coding agent from Slack and Teams to turn conversations into code. Copilot posts an update in your thread when it's finished.

Co-authored-by: bastianeicher <414366+bastianeicher@users.noreply.github.com>
Agent-Logs-Url: https://github.com/0install/apps/sessions/03fe435d-9598-42fb-8baf-4078682d997e
Copilot AI changed the title [WIP] Merge various openjdk XML files into a single file Merge java/openjdk-*.xml into single java/openjdk.xml Mar 22, 2026
Copilot AI requested a review from bastianeicher March 22, 2026 17:56
@bastianeicher bastianeicher marked this pull request as ready for review March 22, 2026 21:30
@bastianeicher bastianeicher merged commit 5915995 into master Mar 22, 2026
1 check passed
@bastianeicher bastianeicher deleted the copilot/merge-openjdk-xml-files branch March 22, 2026 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants