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..d3416c5bd 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 @@ - + @@ -9,7 +9,7 @@ - + @@ -36,10 +36,12 @@ - + + + @@ -56,30 +58,30 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + @@ -100,17 +102,17 @@ - + - + - + diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/META-INF/MANIFEST.MF b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/META-INF/MANIFEST.MF index 8303c5eca..1a85aab0e 100644 --- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/META-INF/MANIFEST.MF +++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/META-INF/MANIFEST.MF @@ -33,6 +33,7 @@ Import-Package: com.fasterxml.jackson.annotation, com.fasterxml.jackson.jaxrs.json, com.google.common.base, com.google.common.collect, + jakarta.ws.rs.core, javax.ws.rs, javax.ws.rs.client, javax.ws.rs.core, 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..9f7ce41ae 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, + jakarta.ws.rs.core, javax.annotation, javax.validation;version="2.0.2", javax.validation.bootstrap;version="2.0.2",