Skip to content
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.

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

backport: Use the actual system-packages from the JVM for export #16

Merged

Conversation

gireeshpunathil
Copy link

@gireeshpunathil
Copy link
Author

surprisingly, ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java is appearing a completely new file in this web interface! is this some sort of a bug? or am I making anything wrong?

@HannesWell
Copy link
Member

surprisingly, ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java is appearing a completely new file in this web interface! is this some sort of a bug? or am I making anything wrong?

o.e.pde.core always lived in PDE's 'main' repo and was never in this one.
If the backported commit contains changes in that file it has to be done in the other repo on the corresponding maintance branch, if it is not already there.

Probably the best is to have both repos checked out at the R4_23 branch and import the pde.build projects from this repo and then make it work.

@@ -26,6 +26,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.equinox.p2.director.app;bundle-version="1.0.200",
org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0"
org.eclipse.jdt.core;bundle-version="[3.28.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)"
Copy link
Author

Choose a reason for hiding this comment

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

fyi - this is the only change that was required for the back port on top of @HannesWell 's original PR

from org.eclipse.jdt.launching;bundle-version="[3.19.700,4.0.0)"
to org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)"

to match what is in there for 4.23

Copy link
Author

Choose a reason for hiding this comment

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

for that reason I intent to keep the second commit as is rather than squashing, but let me know if you think otherwise. (I understand that each project may have different rules)

Copy link
Member

Choose a reason for hiding this comment

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

That's reasonable, would keep it separated too.

@vik-chand
Copy link
Member

" > surprisingly, ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java is appearing a

Probably the best is to have both repos checked out at the R4_23 branch and import the pde.build projects from this repo and then make it work. :"

Yes, also knowing that the change is in 1-2 files ( max 3 files) should make this easier

Copy link
Member

@HannesWell HannesWell left a comment

Choose a reason for hiding this comment

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

LGTM
But I havn't checked the code, assuming you left it unchanged.

@gireeshpunathil
Copy link
Author

But I havn't checked the code, assuming you left it unchanged.

yes, no change in the code except downgrading of org.eclipse.jdt.launching to match the 4.23 prevalence.

@gireeshpunathil gireeshpunathil merged commit fb0c302 into eclipse-pde:R4_23_maintenance Jun 21, 2023
gireeshpunathil added a commit to gireeshpunathil/eclipse.pde.build that referenced this pull request Jun 21, 2023
 - add a missing comma in the manifest
 - bump the bundle version

Refs: eclipse-pde#16
gireeshpunathil added a commit that referenced this pull request Jun 21, 2023
 - add a missing comma in the manifest
 - bump the bundle version

Refs: #16
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.

3 participants