diff --git a/integration-tests/cucumber-tests-platform-smartmetering/pom.xml b/integration-tests/cucumber-tests-platform-smartmetering/pom.xml index 4f150d1f141..f61ee2b74fe 100644 --- a/integration-tests/cucumber-tests-platform-smartmetering/pom.xml +++ b/integration-tests/cucumber-tests-platform-smartmetering/pom.xml @@ -18,11 +18,6 @@ SPDX-License-Identifier: Apache-2.0 ../parent-integration-tests/pom.xml - - - 4.0.3 - - cucumber-tests-platform-smartmetering jar cucumber-tests-platform-smartmetering @@ -200,9 +195,18 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf cxf-rt-rs-client + + + org.apache.cxf + cxf-core + + ${cxf.version} - + + org.apache.cxf + cxf-core + org.apache.httpcomponents httpclient diff --git a/osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml b/osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml index 074f2ae5285..a0cd976c6b5 100644 --- a/osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml +++ b/osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml @@ -284,18 +284,68 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf - cxf-core + cxf-rt-rs-client + + + org.apache.cxf + cxf-core + + ${cxf.version} org.apache.cxf cxf-rt-transports-http + + + org.apache.cxf + cxf-core + + ${cxf.version} org.apache.cxf - cxf-rt-rs-client + cxf-rt-transports-http-hc ${cxf.version} + + + org.apache.cxf + cxf-core + + + org.apache.httpcomponents + httpcore-nio + + + + + org.apache.cxf + cxf-rt-rs-extension-search + + + org.apache.cxf + cxf-core + + + ${cxf.version} + provided + + + org.apache.cxf + cxf-rt-rs-extension-providers + + + org.apache.cxf + cxf-core + + + ${cxf.version} + provided + + + org.apache.cxf + cxf-core diff --git a/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml b/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml index 704171410d7..0d80ec68dc3 100644 --- a/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml +++ b/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml @@ -243,14 +243,32 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf cxf-rt-frontend-jaxrs + + + org.apache.cxf + cxf-core + + org.apache.cxf cxf-rt-rs-security-cors + + + org.apache.cxf + cxf-core + + org.apache.cxf cxf-rt-rs-service-description + + + org.apache.cxf + cxf-core + + com.fasterxml.jackson.jakarta.rs diff --git a/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml b/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml index e4396448812..c8b8ab455b1 100644 --- a/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml +++ b/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml @@ -24,9 +24,6 @@ SPDX-License-Identifier: Apache-2.0 ${project.version}-${BUILD_TAG} 4.4 3.3.5 - - 4.0.3 - true @@ -37,16 +34,34 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf cxf-rt-frontend-jaxrs + + + org.apache.cxf + cxf-core + + ${cxf.version} org.apache.cxf cxf-rt-rs-security-cors + + + org.apache.cxf + cxf-core + + ${cxf.version} org.apache.cxf cxf-rt-rs-service-description + + + org.apache.cxf + cxf-core + + ${cxf.version} diff --git a/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/pom.xml b/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/pom.xml index b09ced76106..a0145444be5 100644 --- a/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/pom.xml +++ b/osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/pom.xml @@ -102,6 +102,10 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf cxf-rt-transports-http-hc + + org.apache.cxf + cxf-core + org.openmuc diff --git a/super/pom.xml b/super/pom.xml index 293fa670990..ea205a5b5c1 100644 --- a/super/pom.xml +++ b/super/pom.xml @@ -120,7 +120,8 @@ SPDX-License-Identifier: Apache-2.0 3.0.0 3.0 2.15.3 - 4.0.5 + 4.0.3 + 4.0.5 2.3.2 3.4.5 1.13.1 @@ -631,11 +632,23 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf cxf-rt-rs-client + + + org.apache.cxf + cxf-core + + ${cxf.version} org.apache.cxf cxf-rt-transports-http + + + org.apache.cxf + cxf-core + + ${cxf.version} @@ -643,6 +656,10 @@ SPDX-License-Identifier: Apache-2.0 cxf-rt-transports-http-hc ${cxf.version} + + org.apache.cxf + cxf-core + org.apache.httpcomponents httpcore-nio @@ -652,15 +669,32 @@ SPDX-License-Identifier: Apache-2.0 org.apache.cxf cxf-rt-rs-extension-search + + + org.apache.cxf + cxf-core + + ${cxf.version} provided org.apache.cxf cxf-rt-rs-extension-providers + + + org.apache.cxf + cxf-core + + ${cxf.version} provided + + org.apache.cxf + cxf-core + ${cxf.core.version} +