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.

Sign up for GitHub

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

Jump to bottom

Fix stable_9.3 update site #29

Merged
merged 2 commits into from
May 24, 2024
Merged

Fix stable_9.3 update site #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13dd893
releng: Upgrade target to dependencies of 2024-03 (Eclipse 4.31) release
PatrickTasse Mar 21, 2024
b2512cb
Installing Add-ons in Trace Compass fails due to missing dependencies
bhufmann May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions common/org.eclipse.tracecompass.incubator.releng-site/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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"`

<category-def name="trace-types" label="Trace Types"/>
<category-def name="virtualization" label="Virtualization"/>
<category-def name="analyses" label="Analyses"/>
Expand All @@ -102,6 +105,6 @@
Additional functionalities for Trace Compass
</description>
</category-def>
<repository-reference location="https://download.eclipse.org/ease/release/0.8.0" enabled="true" />
<repository-reference location="https://eclipse.py4j.org" enabled="true" />
<repository-reference location="https://download.eclipse.org/ease/release/0.8.0" name="" enabled="true" />
<repository-reference location="https://eclipse.py4j.org" name="" enabled="true" />
</site>
54 changes: 28 additions & 26 deletions common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="tracecompass-incubator-master" sequenceNumber="74">
<target name="tracecompass-incubator-master" sequenceNumber="75">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
Expand All @@ -9,7 +9,7 @@
<unit id="org.eclipse.remote.ui" version="0.0.0"/>
<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/cdt/releases/11.4/cdt-11.4.0/"/>
<repository location="https://download.eclipse.org/tools/cdt/releases/11.5/cdt-11.5.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
Expand All @@ -36,10 +36,12 @@
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="0.0.0"/>
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.guava" version="32.1.3.jre"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.sun.xml.bind.jaxb-osgi" version="2.3.9"/>
<unit id="jakarta.activation-api" version="1.2.2"/>
<unit id="jakarta.el-api" version="5.0.1"/>
<unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
<unit id="jakarta.servlet.jsp-api" version="3.1.1"/>
<unit id="jakarta.servlet-api" version="0.0.0"/>
<unit id="jakarta.xml.bind-api" version="2.3.3"/>
<unit id="jakarta.ws.rs-api" version="2.1.6"/>
Expand All @@ -56,30 +58,30 @@
<unit id="org.apache.commons.math3" version="0.0.0"/>
<unit id="org.apache.xml.serializer" version="0.0.0"/>
<unit id="org.eclipse.jetty.servlet-api" version="0.0.0"/>
<unit id="org.glassfish.hk2.api" version="0.0.0"/>
<unit id="org.glassfish.hk2.api.source" version="0.0.0"/>
<unit id="org.glassfish.hk2.locator" version="0.0.0"/>
<unit id="org.glassfish.hk2.locator.source" version="0.0.0"/>
<unit id="org.glassfish.hk2.utils" version="0.0.0"/>
<unit id="org.glassfish.hk2.utils.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-client" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-client.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-common" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-common.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-server" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-server.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="0.0.0"/>
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="0.0.0"/>
<unit id="org.glassfish.hk2.api" version="2.6.1"/>
<unit id="org.glassfish.hk2.api.source" version="2.6.1"/>
<unit id="org.glassfish.hk2.locator" version="2.6.1"/>
<unit id="org.glassfish.hk2.locator.source" version="2.6.1"/>
<unit id="org.glassfish.hk2.utils" version="2.6.1"/>
<unit id="org.glassfish.hk2.utils.source" version="2.6.1"/>
<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="2.41.0"/>
<unit id="org.glassfish.jersey.core.jersey-client" version="2.41.0"/>
<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.41.0"/>
<unit id="org.glassfish.jersey.core.jersey-common" version="2.41.0"/>
<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.41.0"/>
<unit id="org.glassfish.jersey.core.jersey-server" version="2.41.0"/>
<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.41.0"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.41.0"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.41.0"/>
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.41.0"/>
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.41.0"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
<unit id="org.mozilla.rhino" version="1.7.14"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.yaml.snakeyaml" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
Expand All @@ -100,17 +102,17 @@
<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/R-3.32.0-20231114230950/repository/"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xsd" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0/"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
Expand All @@ -129,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.

</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository/"/>
Expand All @@ -142,7 +144,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.22.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtend.lib" version="0.0.0"/>
Expand Down
8 changes: 5 additions & 3 deletions rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Trace Compass (Incubator)" uid="org.eclipse.tracecompass.incubator.rcp" id="org.eclipse.tracecompass.incubator.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="0.9.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
<product name="Trace Compass (Incubator)" uid="org.eclipse.tracecompass.incubator.rcp" id="org.eclipse.tracecompass.incubator.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="0.9.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">

<aboutInfo>
<image path="/org.eclipse.tracecompass.incubator.rcp.branding/icons/tc_about.png"/>
Expand Down Expand Up @@ -116,6 +116,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</license>

<plugins>
<plugin id="jakarta.activation-api" version="1.2.2"/>
<plugin id="jakarta.xml.bind-api" version="2.3.3"/>
</plugins>

<features>
Expand Down Expand Up @@ -184,8 +186,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</configurations>

<repositories>
<repository location="http://download.eclipse.org/tracecompass/master/rcp-repository" enabled="true" />
<repository location="http://download.eclipse.org/tracecompass.incubator/master/repository" enabled="true" />
<repository location="http://download.eclipse.org/tracecompass/master/rcp-repository" name="" enabled="true" />
<repository location="http://download.eclipse.org/tracecompass.incubator/master/repository" name="" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down
Loading
Loading