Skip to content

Conversation

@HannesWell
Copy link
Member

@HannesWell HannesWell commented Jul 16, 2025

Include the additional IU org.eclipse.equinox.executable directly in the platform P2-repository via the defining category.xml. This avoids the post-processing of the raw content.xml file using an XSL transformation and consequently ensures the content.xml is only provided in compressed form as 'content.jar' and content.xml.xz.
Due to the previous post-processing the content.xml was only provided uncompressed, which increases the load on the download-server, slows down metadata downloads and also complicates the RelEng process.

Fixes #1912

Comment on lines +22 to +26
<iu>
<query>
<expression type="match">id == 'org.eclipse.equinox.executable'</expression>
</query>
</iu>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an alternative approach to explicitly include the org.eclipse.equinox.executable generated by Equinox.
I copied this approach (and simplified it) from
https://github.com/eclipse-m2e/m2e-core/blob/f64b9290f2e3dd0c7b6f14a185edc36286590933/org.eclipse.m2e.repository/category.xml#L21-L30

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's certainly MUCH simpler!

Include the additional IU 'org.eclipse.equinox.executable' directly in
the platform P2-repository via the defining 'category.xml'. This avoids
the post-processing of the raw 'content.xml' file using an XSL
transformation and consequently ensures the 'content.xml' is only
provided in compressed form as 'content.jar' and 'content.xml.xz'.
Due to the previous post-processing the content.xml was only provided
uncompressed, which increases the load on the download-server, slows
down metadata downloads and also complicates the RelEng process.

Fixes eclipse-platform#1912
@HannesWell HannesWell force-pushed the restore-content.jar branch from 0000663 to efacec9 Compare July 17, 2025 17:25
@HannesWell HannesWell changed the title [Build] Repack platform repositorie's content.jar and content.xml.xz [Build] Restore compressed content.xml for platform repository Jul 17, 2025
@HannesWell
Copy link
Member Author

HannesWell commented Jul 17, 2025

The build is successful and the resulting artifacts.xml (which is now compressed again as artifacts.xml.xz and artifacts.jar as intended) contains the additional unit org.eclipse.equinox.executable as intended (although its removal is still to investigate).

So everything looks good and this is ready for submission.

@MohananRahul, with this applied, the (manually defined) Jenkins job to recreate the compressed artifacts is obsolete and I'll delete it:

As far as I can tell, it was never documented that this is to be run for milestone, RC and GA builds, so nothing has to be cleaned up in this regard.

@merks
Copy link
Contributor

merks commented Jul 17, 2025

That’s really great. 👍

@HannesWell HannesWell force-pushed the restore-content.jar branch from 60ed872 to efacec9 Compare July 17, 2025 19:02
@HannesWell HannesWell marked this pull request as ready for review July 17, 2025 19:02
@HannesWell HannesWell merged commit c15c955 into eclipse-platform:master Jul 17, 2025
9 of 10 checks passed
@HannesWell HannesWell deleted the restore-content.jar branch July 17, 2025 19:37
HannesWell added a commit to HannesWell/eclipse.platform.releng.aggregator that referenced this pull request Jul 18, 2025
Include the additional IU 'org.eclipse.equinox.executable' directly in
the platform P2-repository via the defining 'category.xml'. This avoids
the post-processing of the raw 'content.xml' file using an XSL
transformation and consequently ensures the 'content.xml' is only
provided in compressed form as 'content.jar' and 'content.xml.xz'.
Due to the previous post-processing the content.xml was only provided
uncompressed, which increases the load on the download-server, slows
down metadata downloads and also complicates the RelEng process.

Fixes eclipse-platform#1912

This was originally introduced via
- eclipse-platform#3187

and reverted due to a regression in I-builds via
- eclipse-platform#3189

As the cause of that regression is fixed, the change is introduced again
unchanged and
This reverts commit d4d0542.
HannesWell added a commit to HannesWell/eclipse.platform.releng.aggregator that referenced this pull request Jul 19, 2025
Include the additional IU 'org.eclipse.equinox.executable' directly in
the platform P2-repository via the defining 'category.xml'. This avoids
the post-processing of the raw 'content.xml' file using an XSL
transformation and consequently ensures the 'content.xml' is only
provided in compressed form as 'content.jar' and 'content.xml.xz'.
Due to the previous post-processing the content.xml was only provided
uncompressed, which increases the load on the download-server, slows
down metadata downloads and also complicates the RelEng process.

Fixes eclipse-platform#1912

This was originally introduced via
- eclipse-platform#3187

and reverted due to a regression in I-builds via
- eclipse-platform#3189

As the cause of that regression is fixed, the change is introduced again
unchanged and
This reverts commit d4d0542.
HannesWell added a commit that referenced this pull request Jul 19, 2025
Include the additional IU 'org.eclipse.equinox.executable' directly in
the platform P2-repository via the defining 'category.xml'. This avoids
the post-processing of the raw 'content.xml' file using an XSL
transformation and consequently ensures the 'content.xml' is only
provided in compressed form as 'content.jar' and 'content.xml.xz'.
Due to the previous post-processing the content.xml was only provided
uncompressed, which increases the load on the download-server, slows
down metadata downloads and also complicates the RelEng process.

Fixes #1912

This was originally introduced via
- #3187

and reverted due to a regression in I-builds via
- #3189

As the cause of that regression is fixed, the change is introduced again
unchanged and
This reverts commit d4d0542.
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.

The https://download.eclipse.org/eclipse/updates/4.32-I-builds don't have a content.jar/content.xml.xz

2 participants