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

Lock the target platform onto stable update sites #1585

Merged
merged 1 commit into from Mar 11, 2024

Conversation

merks
Copy link
Contributor

@merks merks commented Mar 11, 2024

Update the setup for generating this target platform, but also easily configured to switch back to on-going development versions.

Fix compile problems compiling against the latest GEF release.

#1572

Update the setup for generating this target platform, but also easily
configured to switch back to on-going development versions.

Fix compile problems compiling against the latest GEF release.

eclipse-birt#1572
@merks merks merged commit 00fe855 into eclipse-birt:master Mar 11, 2024
3 checks passed
@merks merks deleted the issue-1572-tp branch March 11, 2024 10:07
@speckyspooky speckyspooky added this to the 4.15 milestone Mar 11, 2024
@speckyspooky speckyspooky added the Dependencies Pull requests that update a dependency file label Mar 11, 2024
@speckyspooky
Copy link
Contributor

Hello Ed,
in your target-file I can see that we have know both javascript-libraries added.
If you want it in such combination to have both at same time?
Could it be that it as an effect on #1590... or it is independent (?)

grafik

@merks
Copy link
Contributor Author

merks commented Mar 12, 2024

If I try to exclude it via a negative requirement:

image

The resolution fails:

ERROR: org.eclipse.equinox.p2.director code=1 Cannot complete the install because some dependencies are not satisfiable
  at org.eclipse.oomph.targlets.internal.core.TargletContainer.forceUpdate(TargletContainer.java:919)
  at org.eclipse.oomph.setup.targlets.impl.TargletTaskImpl$4.run(TargletTaskImpl.java:1232)
  at org.eclipse.oomph.util.pde.TargetPlatformUtil.runWithTargetPlatformService(TargetPlatformUtil.java:120)
  at org.eclipse.oomph.setup.targlets.impl.TargletTaskImpl.perform(TargletTaskImpl.java:1092)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.doPerformNeededSetupTasks(SetupTaskPerformer.java:3864)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer$WorkspaceUtil$1.run(SetupTaskPerformer.java:5200)
  at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2448)
  at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2473)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer$WorkspaceUtil.performNeededSetupTasks(SetupTaskPerformer.java:5193)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.performNeededSetupTasks(SetupTaskPerformer.java:3798)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.performTriggeredSetupTasks(SetupTaskPerformer.java:3773)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.perform(SetupTaskPerformer.java:3651)
  at org.eclipse.oomph.setup.ui.wizards.ProgressPage$9.run(ProgressPage.java:592)
  at org.eclipse.oomph.setup.ui.wizards.ProgressPage$11$1.run(ProgressPage.java:721)
  at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
  ERROR: org.eclipse.equinox.p2.director code=0 Software being installed: artificial_root 1.0.0.v1710227605661
  ERROR: org.eclipse.equinox.p2.director code=1 Cannot satisfy dependency:
    ERROR: org.eclipse.equinox.p2.director code=0 From: artificial_root 1.0.0.v1710227605661
    ERROR: org.eclipse.equinox.p2.director code=0 To: org.eclipse.equinox.p2.iu; org.mozilla.javascript 0.0.0, min=0, max=0
  ERROR: org.eclipse.equinox.p2.director code=1 Cannot satisfy dependency:
    ERROR: org.eclipse.equinox.p2.director code=0 From: artificial_root 1.0.0.v1710227605661
    ERROR: org.eclipse.equinox.p2.director code=0 To: org.eclipse.equinox.p2.iu; org.eclipse.birt.core 0.0.0
  ERROR: org.eclipse.equinox.p2.director code=1 Cannot satisfy dependency:
    ERROR: org.eclipse.equinox.p2.director code=0 From: BIRT Core Package 4.12.0.v202211281949 (org.eclipse.birt.core 4.12.0.v202211281949)
    ERROR: org.eclipse.equinox.p2.director code=0 To: osgi.bundle; org.mozilla.javascript 1.7.4

So we'll need to eliminate that use of the bundle to eliminate the bundle from the target platform (and if the wtp dependencies don't require it).

Oh, strange, that is an older version of BIRT. Investigating.

merks added a commit to merks/birt that referenced this pull request Mar 12, 2024
This is relevant when using the release train in the target platform
during resolution/generation because the train includes some much older
versions of BIRT.

eclipse-birt#1585
@merks
Copy link
Contributor Author

merks commented Mar 12, 2024

I see now! Targlet resolution was including binary equivalents, so for any project being imported, if there is a corresponding binary version available in one of the p2 repositories, that version is included in the target platform. But we really don't want that for BIRT especially because the release train repository includes really old versions of BIRT with old dependencies. So I turned that off and regenerated the target platform.

All that being said, I think this had zero impact on your problem and zero impact the build. The final build result only includes the new version of the bundle:

image

And the problem you show is the result of restrictive access rules on the debug package of the rhino bundle.

merks added a commit that referenced this pull request Mar 12, 2024
This is relevant when using the release train in the target platform
during resolution/generation because the train includes some much older
versions of BIRT.

#1585
@speckyspooky
Copy link
Contributor

Sounds good Ed, I will update my fork with that and go ahead with the test on my side.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants