From c96e72cd57f85cf2ad5e2cc1e65d1ad4fef668ce Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Wed, 17 Jul 2024 10:02:41 +0200 Subject: [PATCH] Use exclusively latest Orbit libraries - jakarta.el -> jakarta.el-api - jakarta.servlet -> jakarta.servlet-api - jakarta.servlet.jsp -> jakarta.servlet.jsp-api - javax.mail -> jakarta.mail-api - javax.xml.rpc -> javax.xml.rpc-api - javax.xml.soap -> jakarta.xml.soap-api - javax.wsdl 1.6.3 - javax.jws -> jakarta.jws-api - jakarta.xml.bind -> jakarta.xml.bind-api - javax.xml.stream delete - javax.xml.ws -> jakarta.xml.ws-api - org.junit4 -> org.junit https://github.com/eclipse-simrel/simrel.build/issues/438 --- .../feature.xml | 6 +++--- .../org.eclipse.wst.ws_core.feature/feature.xml | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jst.ws.cxf.feature/feature.xml | 17 +++++------------ .../feature.xml | 17 +++++------------ .../feature.xml | 4 ++-- .../META-INF/MANIFEST.MF | 6 +++--- 11 files changed, 28 insertions(+), 42 deletions(-) diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml index 46cf623f7..5fd3d6f4f 100644 --- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml +++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml @@ -40,15 +40,15 @@ diff --git a/core/features/org.eclipse.wst.ws_core.feature/feature.xml b/core/features/org.eclipse.wst.ws_core.feature/feature.xml index ce9c6b5b2..c4ef92a28 100644 --- a/core/features/org.eclipse.wst.ws_core.feature/feature.xml +++ b/core/features/org.eclipse.wst.ws_core.feature/feature.xml @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/core/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF b/core/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF index 629b2e076..9ad216936 100644 --- a/core/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF +++ b/core/tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.wst.ws.service.policy.test.ServicePolicytTestActiv Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, - org.junit4, + org.junit, org.eclipse.wst.ws.service.policy, org.eclipse.wst.ws.service.policy.ui, org.eclipse.core.resources, diff --git a/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF b/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF index 268a92fc5..595d81d0c 100644 --- a/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF +++ b/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF @@ -49,14 +49,14 @@ Require-Bundle: org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2 org.eclipse.jst.ws.annotations.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.ws.jaxws.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.command.env.core;bundle-version="[1.1.0,2.0.0)", - javax.jws;bundle-version="[2.0.0,2.1.0)", + javax.jws;bundle-version="[2.0.0,3.0.0)", org.eclipse.jst.ws.jaxws.ui;bundle-version="[1.0.0,2.0.0)", org.eclipse.wst.common.environment;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.command.env.ui;bundle-version="[1.0.0,2.0.0)" Automatic-Module-Name: org.eclipse.jst.ws.cxf.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Import-Package: javax.xml.ws;version="2.1.0", +Import-Package: javax.xml.ws, org.jdom;version="1.1.1", org.jdom.input;version="1.1.1", org.jdom.output;version="1.1.1" diff --git a/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF b/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF index ba22c9c8b..bb2807fbf 100644 --- a/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF +++ b/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF @@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.wst.command.env;bundle-version="[1.0.305,2.0.0)", org.eclipse.jst.jee;bundle-version="[1.0.100,2.0.0)", org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)", - javax.jws;bundle-version="[2.0.0,2.1.0)" + javax.jws;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jst.ws.cxf.creation.core Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.) diff --git a/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF b/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF index 3d8baf755..f18a576b8 100644 --- a/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF +++ b/jaxws/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF @@ -37,6 +37,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)", - javax.jws;bundle-version="[2.0.0,2.1.0)" + javax.jws;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/jaxws/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF b/jaxws/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF index 4e185bbe0..a03cd5555 100755 --- a/jaxws/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF +++ b/jaxws/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: javax.jws, javax.jws.soap, - javax.xml.ws;version="2.1.0", + javax.xml.ws, javax.xml.ws.http;version="2.1.0", javax.xml.ws.soap;version="2.1.0", org.jdom;version="1.1.1", diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml index 744a4fc75..5b40e2093 100644 --- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml +++ b/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml @@ -78,35 +78,28 @@ id="javax.wsdl" download-size="0" install-size="0" - version="1.6.2.qualifier" - unpack="false"/> - - diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.feature/feature.xml index b1369f79d..781c529b1 100644 --- a/jaxws/features/org.eclipse.jst.ws.jaxws.feature/feature.xml +++ b/jaxws/features/org.eclipse.jst.ws.jaxws.feature/feature.xml @@ -36,14 +36,14 @@ unpack="false"/> - -