diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
index ae46d5b30..fcd1ab7cd 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product b/rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product
index bbea194c9..6753343b4 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product
@@ -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"/>
@@ -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>
@@ -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>
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml b/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
index 0a390f7d9..7bb3273f0 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
@@ -51,232 +51,130 @@
 
    <plugin
          id="jakarta.activation-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="jakarta.ws.rs-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.lsp4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.lsp4j.jsonrpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtext.xbase.lib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.apache.commons.lang"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ease.ui.scripts"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ease"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ease.classloader"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ease.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.mozilla.javascript"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.wst.jsdt.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.wst.jsdt.debug.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.wst.jsdt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.google.javascript"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.wst.jsdt.debug.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.wst.jsdt.manipulation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="py4j-java"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="py4j-python"
-         download-size="0"
-         install-size="0"
          version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ease.modules.platform"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.nebula.widgets.opal.commons"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.nebula.widgets.opal.duallist"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.jersey.core.jersey-client"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="javassist"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.hk2.locator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.hk2.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.hk2.osgi-resource-locator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.hk2.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.aopalliance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.jersey.core.jersey-common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.glassfish.jersey.inject.jersey-hk2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.google.gson"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="javax.inject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java
index 7de968fa2..b5cff7c31 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java
@@ -603,7 +603,6 @@ public void testTableDataProvider() throws InterruptedException {
      */
     @Test
     public void testTimeGraphMetaDataSerializer() {
-        @SuppressWarnings("resource")
         Response treeResponse = null;
         try {
             ExperimentModelStub exp = assertPostExperiment(CONTEXT_SWITCHES_UST_STUB.getName(), CONTEXT_SWITCHES_UST_STUB);
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
index 7c0abcaf8..114856f20 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Import-Package: com.fasterxml.jackson.module.jaxb,
  com.google.common.base,
  com.google.common.collect,
  com.google.common.primitives,
+ javax.activation,
  javax.annotation,
  javax.validation;version="2.0.2",
  javax.validation.bootstrap;version="2.0.2",
@@ -58,7 +59,7 @@ Import-Package: com.fasterxml.jackson.module.jaxb,
  javax.ws.rs.core,
  javax.ws.rs.ext,
  javax.xml.bind,
- javax.xml.bind.annotation,
+ javax.xml.bind.annotation;version="2.3.3",
  org.apache.commons.io,
  org.eclipse.jetty.ee8.nested,
  org.eclipse.jetty.ee8.servlet,
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
index 526f2d0a5..80525646b 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
@@ -116,12 +116,12 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="io.swagger.core.v3.swagger-integration"/>
       <plugin id="io.swagger.core.v3.swagger-jaxrs2"/>
       <plugin id="io.swagger.core.v3.swagger-models"/>
-      <plugin id="jakarta.activation-api"/>
+      <plugin id="jakarta.activation-api" version="1.2.2"/>
       <plugin id="jakarta.annotation-api"/>
       <plugin id="jakarta.servlet-api"/>
       <plugin id="jakarta.validation.jakarta.validation-api"/>
       <plugin id="jakarta.ws.rs-api"/>
-      <plugin id="jakarta.xml.bind-api"/>
+      <plugin id="jakarta.xml.bind-api" version="2.3.3"/>
       <plugin id="javassist"/>
       <plugin id="javax.annotation-api"/>
       <plugin id="javax.inject"/>
@@ -143,8 +143,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filebuffers"/>
       <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
+      <plugin id="org.eclipse.core.filesystem.macosx"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.resources"/>
       <plugin id="org.eclipse.core.runtime"/>
@@ -152,14 +152,15 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.emf.common"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.http.service.api"/>
       <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
+      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
+      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.jetty.ee8.server"/>
       <plugin id="org.eclipse.jetty.ee8.security"/>
+      <plugin id="org.eclipse.jetty.ee8.server"/>
       <plugin id="org.eclipse.jetty.ee8.servlet"/>
       <plugin id="org.eclipse.jetty.http"/>
       <plugin id="org.eclipse.jetty.io"/>
@@ -171,7 +172,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.ltk.core.refactoring"/>
       <plugin id="org.eclipse.orbit.xml-apis-ext"/>
       <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+      <plugin id="org.eclipse.osgi.compatibility.state"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.text"/>
@@ -211,8 +212,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.glassfish.jersey.containers.jersey-container-servlet-core"/>
       <plugin id="org.glassfish.jersey.core.jersey-client"/>
       <plugin id="org.glassfish.jersey.core.jersey-common"/>
-      <plugin id="org.glassfish.jersey.ext.jersey-entity-filtering"/>
       <plugin id="org.glassfish.jersey.core.jersey-server"/>
+      <plugin id="org.glassfish.jersey.ext.jersey-entity-filtering"/>
       <plugin id="org.glassfish.jersey.inject.jersey-hk2"/>
       <plugin id="org.glassfish.jersey.media.jersey-media-json-jackson"/>
       <plugin id="org.hamcrest"/>
@@ -228,6 +229,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.osgi.service.component"/>
       <plugin id="org.osgi.service.device"/>
       <plugin id="org.osgi.service.event"/>
+      <plugin id="org.osgi.service.http.whiteboard"/>
       <plugin id="org.osgi.service.metatype"/>
       <plugin id="org.osgi.service.prefs"/>
       <plugin id="org.osgi.service.provisioning"/>
@@ -239,8 +241,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.osgi.util.position"/>
       <plugin id="org.osgi.util.promise"/>
       <plugin id="org.osgi.util.xml"/>
-      <plugin id="slf4j.api"/>
       <plugin id="org.yaml.snakeyaml"/>
+      <plugin id="slf4j.api"/>
    </plugins>
 
    <configurations>