This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch cxf4 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a4695e50d2d204fdb1728929b5bd386a5cab2b27 Author: Richard Zowalla <[email protected]> AuthorDate: Fri Aug 18 08:43:27 2023 +0200 TOMEE-4139 - Rework included cxf libs --- arquillian/arquillian-tomee-embedded/pom.xml | 7 ---- arquillian/arquillian-tomee-tests/pom.xml | 7 ---- examples/async-servlet/pom.xml | 6 ---- examples/bval-evaluation-redeployment/pom.xml | 6 ---- .../bval-evaluation-redeployment/runner/pom.xml | 4 --- .../connector-sample-functional-tests/pom.xml | 5 --- .../connector-ear/connector-sample-war/pom.xml | 7 +--- examples/connector-ear/pom.xml | 6 ---- examples/connector-war/pom.xml | 6 ---- examples/jaxrs-json-provider-jettison/pom.xml | 6 ---- examples/jsonb-configuration/pom.xml | 6 ---- examples/jsonb-custom-serializer/pom.xml | 6 ---- examples/mp-config-example/pom.xml | 6 ---- examples/mp-custom-healthcheck/pom.xml | 6 ---- examples/mp-faulttolerance-fallback/pom.xml | 6 ---- examples/mp-faulttolerance-timeout/pom.xml | 6 ---- .../mp-jwt-bean-validation-strongly-typed/pom.xml | 6 ---- examples/mp-jwt-bean-validation/pom.xml | 6 ---- examples/mp-metrics-counted/pom.xml | 6 ---- examples/mp-metrics-gauge/pom.xml | 6 ---- examples/mp-metrics-histogram/pom.xml | 6 ---- examples/mp-metrics-timed/pom.xml | 6 ---- examples/mp-rest-jwt-public-key/pom.xml | 7 +--- examples/rest-cdi/pom.xml | 6 ---- examples/rest-example/pom.xml | 6 ---- examples/rest-on-ejb/pom.xml | 6 ---- examples/rest-xml-json/pom.xml | 6 ---- examples/serverless-builder/pom.xml | 6 ---- examples/serverless-tomee-microprofile/pom.xml | 6 ---- examples/serverless-tomee-plume/pom.xml | 6 ---- examples/serverless-tomee-plus/pom.xml | 6 ---- examples/serverless-tomee-webprofile/pom.xml | 6 ---- examples/simple-jms-context/pom.xml | 7 +--- examples/simple-jms/pom.xml | 6 ---- examples/simple-rest/pom.xml | 6 ---- itests/microprofile-jwt-itests/pom.xml | 6 ---- itests/tomee-microprofile-itests/pom.xml | 6 ---- itests/tomee-security-itests/pom.xml | 6 ---- pom.xml | 41 ++++++++++++++++++++++ server/openejb-cxf-rs/pom.xml | 30 +++++++--------- tomee/tomee-microprofile/mp-common/pom.xml | 35 ++++++++++++++++++ tomee/tomee-security/pom.xml | 6 ---- 42 files changed, 91 insertions(+), 251 deletions(-) diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml index 9f44bcdd51..702de28366 100644 --- a/arquillian/arquillian-tomee-embedded/pom.xml +++ b/arquillian/arquillian-tomee-embedded/pom.xml @@ -92,13 +92,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml index edd4a3644c..31e9d7446e 100644 --- a/arquillian/arquillian-tomee-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/pom.xml @@ -70,13 +70,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> diff --git a/examples/async-servlet/pom.xml b/examples/async-servlet/pom.xml index 44c4006171..9e5d15baf4 100644 --- a/examples/async-servlet/pom.xml +++ b/examples/async-servlet/pom.xml @@ -56,12 +56,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>ziplock</artifactId> diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml index 091e53332e..dc8dcbd10a 100644 --- a/examples/bval-evaluation-redeployment/pom.xml +++ b/examples/bval-evaluation-redeployment/pom.xml @@ -92,12 +92,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> diff --git a/examples/bval-evaluation-redeployment/runner/pom.xml b/examples/bval-evaluation-redeployment/runner/pom.xml index 777ef0ebe5..4b53c88efd 100644 --- a/examples/bval-evaluation-redeployment/runner/pom.xml +++ b/examples/bval-evaluation-redeployment/runner/pom.xml @@ -31,10 +31,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>arquillian-tomee-remote</artifactId> diff --git a/examples/connector-ear/connector-sample-functional-tests/pom.xml b/examples/connector-ear/connector-sample-functional-tests/pom.xml index dac92996cf..3ef49115dc 100644 --- a/examples/connector-ear/connector-sample-functional-tests/pom.xml +++ b/examples/connector-ear/connector-sample-functional-tests/pom.xml @@ -90,11 +90,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> diff --git a/examples/connector-ear/connector-sample-war/pom.xml b/examples/connector-ear/connector-sample-war/pom.xml index be1dfa0c7d..bcb4be535f 100644 --- a/examples/connector-ear/connector-sample-war/pom.xml +++ b/examples/connector-ear/connector-sample-war/pom.xml @@ -37,12 +37,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <dependency> diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml index 961603e05a..c2dd1cb51b 100644 --- a/examples/connector-ear/pom.xml +++ b/examples/connector-ear/pom.xml @@ -39,12 +39,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>jakartaee-api</artifactId> diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml index 08521bb965..a7350ef8d6 100644 --- a/examples/connector-war/pom.xml +++ b/examples/connector-war/pom.xml @@ -110,12 +110,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> diff --git a/examples/jaxrs-json-provider-jettison/pom.xml b/examples/jaxrs-json-provider-jettison/pom.xml index 0166893a55..7f610edca6 100755 --- a/examples/jaxrs-json-provider-jettison/pom.xml +++ b/examples/jaxrs-json-provider-jettison/pom.xml @@ -48,12 +48,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/jsonb-configuration/pom.xml b/examples/jsonb-configuration/pom.xml index 0ffe16b28d..653bc9700d 100644 --- a/examples/jsonb-configuration/pom.xml +++ b/examples/jsonb-configuration/pom.xml @@ -39,12 +39,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/jsonb-custom-serializer/pom.xml b/examples/jsonb-custom-serializer/pom.xml index f801567f8f..ba1791c074 100644 --- a/examples/jsonb-custom-serializer/pom.xml +++ b/examples/jsonb-custom-serializer/pom.xml @@ -39,12 +39,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml index 2b25d26774..bee38be7ec 100644 --- a/examples/mp-config-example/pom.xml +++ b/examples/mp-config-example/pom.xml @@ -73,12 +73,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml index 335284d9ce..58cba59c52 100644 --- a/examples/mp-custom-healthcheck/pom.xml +++ b/examples/mp-custom-healthcheck/pom.xml @@ -58,12 +58,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml index 8dcbc09b7b..7c3f029d4d 100644 --- a/examples/mp-faulttolerance-fallback/pom.xml +++ b/examples/mp-faulttolerance-fallback/pom.xml @@ -50,12 +50,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml index 4dc4131ae0..2a7af6e968 100644 --- a/examples/mp-faulttolerance-timeout/pom.xml +++ b/examples/mp-faulttolerance-timeout/pom.xml @@ -52,12 +52,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml index 634839d8b9..0e559db82c 100644 --- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml +++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml @@ -118,12 +118,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/mp-jwt-bean-validation/pom.xml b/examples/mp-jwt-bean-validation/pom.xml index 670f864b47..14dec608f7 100644 --- a/examples/mp-jwt-bean-validation/pom.xml +++ b/examples/mp-jwt-bean-validation/pom.xml @@ -118,12 +118,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml index 3d39f6e8c8..aa82168152 100644 --- a/examples/mp-metrics-counted/pom.xml +++ b/examples/mp-metrics-counted/pom.xml @@ -51,12 +51,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml index 3db6ab5e19..0ee6eb2675 100644 --- a/examples/mp-metrics-gauge/pom.xml +++ b/examples/mp-metrics-gauge/pom.xml @@ -54,12 +54,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml index 79954325fe..518f672602 100644 --- a/examples/mp-metrics-histogram/pom.xml +++ b/examples/mp-metrics-histogram/pom.xml @@ -49,12 +49,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml index 61a51afa28..4771c573ec 100644 --- a/examples/mp-metrics-timed/pom.xml +++ b/examples/mp-metrics-timed/pom.xml @@ -48,12 +48,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>openejb-cxf-rs</artifactId> diff --git a/examples/mp-rest-jwt-public-key/pom.xml b/examples/mp-rest-jwt-public-key/pom.xml index d098c641ac..538e8c7d0d 100644 --- a/examples/mp-rest-jwt-public-key/pom.xml +++ b/examples/mp-rest-jwt-public-key/pom.xml @@ -120,12 +120,7 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> + <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml index d292878d47..b596037415 100644 --- a/examples/rest-cdi/pom.xml +++ b/examples/rest-cdi/pom.xml @@ -60,12 +60,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml index 81b3e22cde..6d79df70cc 100644 --- a/examples/rest-example/pom.xml +++ b/examples/rest-example/pom.xml @@ -129,12 +129,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tomee</groupId> <artifactId>tomee-embedded</artifactId> diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml index 52d0a2c250..2e47127be9 100644 --- a/examples/rest-on-ejb/pom.xml +++ b/examples/rest-on-ejb/pom.xml @@ -71,12 +71,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml index 6ff95ef200..55a247be9d 100644 --- a/examples/rest-xml-json/pom.xml +++ b/examples/rest-xml-json/pom.xml @@ -64,12 +64,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/serverless-builder/pom.xml b/examples/serverless-builder/pom.xml index 091ffcf8af..16a017d4c0 100644 --- a/examples/serverless-builder/pom.xml +++ b/examples/serverless-builder/pom.xml @@ -40,12 +40,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/examples/serverless-tomee-microprofile/pom.xml b/examples/serverless-tomee-microprofile/pom.xml index 36b4c38444..d776c87335 100644 --- a/examples/serverless-tomee-microprofile/pom.xml +++ b/examples/serverless-tomee-microprofile/pom.xml @@ -40,12 +40,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/examples/serverless-tomee-plume/pom.xml b/examples/serverless-tomee-plume/pom.xml index d88173172b..d2a3b4a91d 100644 --- a/examples/serverless-tomee-plume/pom.xml +++ b/examples/serverless-tomee-plume/pom.xml @@ -40,12 +40,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/examples/serverless-tomee-plus/pom.xml b/examples/serverless-tomee-plus/pom.xml index 6a8ed56d7d..8fc4066e20 100644 --- a/examples/serverless-tomee-plus/pom.xml +++ b/examples/serverless-tomee-plus/pom.xml @@ -40,12 +40,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/examples/serverless-tomee-webprofile/pom.xml b/examples/serverless-tomee-webprofile/pom.xml index 1fe78e4d72..3d3e1b6b51 100644 --- a/examples/serverless-tomee-webprofile/pom.xml +++ b/examples/serverless-tomee-webprofile/pom.xml @@ -39,12 +39,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/examples/simple-jms-context/pom.xml b/examples/simple-jms-context/pom.xml index 8974910feb..453ed9a2ed 100644 --- a/examples/simple-jms-context/pom.xml +++ b/examples/simple-jms-context/pom.xml @@ -107,12 +107,7 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> + <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/simple-jms/pom.xml b/examples/simple-jms/pom.xml index 51a09444f5..9e98cd4a2a 100644 --- a/examples/simple-jms/pom.xml +++ b/examples/simple-jms/pom.xml @@ -105,12 +105,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml index 085baaa993..407e19f3e3 100644 --- a/examples/simple-rest/pom.xml +++ b/examples/simple-rest/pom.xml @@ -60,12 +60,6 @@ <version>4.13.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>4.0.2</version> - <scope>test</scope> - </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. diff --git a/itests/microprofile-jwt-itests/pom.xml b/itests/microprofile-jwt-itests/pom.xml index 80f2c932d4..365c3f04c3 100644 --- a/itests/microprofile-jwt-itests/pom.xml +++ b/itests/microprofile-jwt-itests/pom.xml @@ -111,12 +111,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/itests/tomee-microprofile-itests/pom.xml b/itests/tomee-microprofile-itests/pom.xml index aeab7378de..e2ca81f230 100644 --- a/itests/tomee-microprofile-itests/pom.xml +++ b/itests/tomee-microprofile-itests/pom.xml @@ -118,12 +118,6 @@ <version>2.33</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/itests/tomee-security-itests/pom.xml b/itests/tomee-security-itests/pom.xml index 01bc5e1fb0..6127e382ec 100644 --- a/itests/tomee-security-itests/pom.xml +++ b/itests/tomee-security-itests/pom.xml @@ -106,12 +106,6 @@ <version>2.33</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index 3c8052a274..e27a404894 100644 --- a/pom.xml +++ b/pom.xml @@ -1215,6 +1215,29 @@ <artifactId>cxf-rt-transports-http</artifactId> <version>${version.cxf}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <version>${version.cxf}</version> + <exclusions> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> @@ -1267,6 +1290,14 @@ <groupId>jakarta.xml.ws</groupId> <artifactId>jakarta.xml.ws-api</artifactId> </exclusion> + <exclusion> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1290,6 +1321,16 @@ <artifactId>cxf-rt-management</artifactId> <version>${version.cxf}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-service-description</artifactId> + <version>${version.cxf}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${version.cxf}</version> + </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml index bd2e16d32d..512850cfc5 100644 --- a/server/openejb-cxf-rs/pom.xml +++ b/server/openejb-cxf-rs/pom.xml @@ -46,6 +46,10 @@ <artifactId>openejb-cxf-transport</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> @@ -54,6 +58,14 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-sse</artifactId> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-service-description</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-spi</artifactId> @@ -90,24 +102,6 @@ <artifactId>johnzon-mapper</artifactId> <classifier>jakarta</classifier> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-service-description</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml index 1085d2dea4..415d5fe39c 100644 --- a/tomee/tomee-microprofile/mp-common/pom.xml +++ b/tomee/tomee-microprofile/mp-common/pom.xml @@ -304,6 +304,41 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-mp-client</artifactId> <version>${version.cxf}</version> + <exclusions> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + <exclusion> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.json.bind</groupId> + <artifactId>jakarta.json.bind-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + </exclusion> + </exclusions> </dependency> + </dependencies> </project> diff --git a/tomee/tomee-security/pom.xml b/tomee/tomee-security/pom.xml index b9aa75603b..8e5d8dc8f1 100644 --- a/tomee/tomee-security/pom.xml +++ b/tomee/tomee-security/pom.xml @@ -113,12 +113,6 @@ <version>2.33</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${version.cxf}</version> - <scope>test</scope> - </dependency> </dependencies> </project>
