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

Fix stable_9.3 update site #29

Merged

Conversation

bhufmann
Copy link
Contributor

  • Upgrade target of stable-9.3 branch to e4.31
  • Add missing dependencies on incubator update site to allow installing incubator features from update-site

 
Signed-off-by: Bernd Hufmann [email protected]

PatrickTasse and others added 2 commits May 23, 2024 13:50
Installing scripting or open tracing fails. Provide missing dependencies
on incubator update site for stable-9.3.

Signed-off-by: Bernd Hufmann <[email protected]>
@@ -89,6 +89,9 @@
<bundle id="org.eclipse.wst.jsdt.manipulation"/>
<bundle id="org.eclipse.nebula.widgets.opal.commons"/>
<bundle id="org.eclipse.nebula.widgets.opal.duallist"/>
<bundle id="jakarta.activation-api" version="1.2.2"/>
<bundle id="jakarta.xml.bind-api" version="2.3.3"/>
<bundle id="javax.inject"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

I worry if this should be jakarta.inject.jakarta.inject-api in order to get the same version than in orbit-aggregation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll try that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not able to make it work with this one. Maybe it's ok to use as-is. Soon we have the 10.0 version.

Copy link
Contributor Author

@bhufmann bhufmann May 24, 2024

Choose a reason for hiding this comment

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

For some reason plug-in org.eclipse.ease.modules.platform needs exact version 1.0.0 of javax.inject. Here is what we get from the MANIFEST.MF file:

`javax.inject;bundle-version="1.0.0"`

@@ -131,7 +131,7 @@
<unit id="org.eclipse.tracecompass.lttng2.control.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tracecompass.jsontrace.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tracecompass.tmf.cli.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/tracecompass/master/repository/"/>
<repository location="https://download.eclipse.org/tracecompass/releases/9.3.0/repository/"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this mean all stable branches from incubator must diverge from master branch from now on? They haven't usually.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

all stable branches don't build because they reference tc master. We would have to change the targets in ALL stable branches. But I think it's overkill. We can do it on need base.

@bhufmann bhufmann merged commit 189a674 into eclipse-tracecompass-incubator:stable-9.3 May 24, 2024
2 checks passed
@bhufmann bhufmann deleted the fix_stable_9_3 branch May 24, 2024 18:20
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