Skip to content

Commit

Permalink
downgrade-cxf-core-only
Browse files Browse the repository at this point in the history 
Signed-off-by: Harry Middelburg <[email protected]>
  • Loading branch information
@harrymiddelburgetall
harrymiddelburgetall committed Dec 17, 2024
1 parent b5fc05f commit cefb5a0
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 12 deletions.
16 changes: 10 additions & 6 deletions integration-tests/cucumber-tests-platform-smartmetering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ SPDX-License-Identifier: Apache-2.0
<relativePath>../parent-integration-tests/pom.xml</relativePath>
</parent>

<properties>
<!-- override version in super pom -->
<cxf.version>4.0.3</cxf.version>
</properties>

<artifactId>cucumber-tests-platform-smartmetering</artifactId>
<packaging>jar</packaging>
<name>cucumber-tests-platform-smartmetering</name>
Expand Down Expand Up @@ -200,9 +195,18 @@ SPDX-License-Identifier: Apache-2.0
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
54 changes: 52 additions & 2 deletions osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,18 +284,68 @@ SPDX-License-Identifier: Apache-2.0
<!-- Apache CXF RESTfull WS WebClient -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<artifactId>cxf-rt-rs-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<artifactId>cxf-rt-transports-http-hc</artifactId>
<version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</dependency>

<!-- Spring JMS -->
Expand Down
18 changes: 18 additions & 0 deletions .../protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,32 @@ SPDX-License-Identifier: Apache-2.0
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
Expand Down
21 changes: 18 additions & 3 deletions osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ SPDX-License-Identifier: Apache-2.0
<display.version>${project.version}-${BUILD_TAG}</display.version>
<commons.collections.version>4.4</commons.collections.version>
<spring.boot.version>3.3.5</spring.boot.version>
<!-- override version in super pom -->
<cxf.version>4.0.3</cxf.version>

<skipITs>true</skipITs>
</properties>

Expand All @@ -37,16 +34,34 @@ SPDX-License-Identifier: Apache-2.0
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions ...rotocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ SPDX-License-Identifier: Apache-2.0
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-hc</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</dependency>

<dependency>
<groupId>org.openmuc</groupId>
Expand Down
36 changes: 35 additions & 1 deletion super/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ SPDX-License-Identifier: Apache-2.0
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<license.maven.plugin>3.0</license.maven.plugin>
<jackson.version>2.15.3</jackson.version>
<cxf.version>4.0.5</cxf.version>
<cxf.version>4.0.3</cxf.version>
<cxf.core.version>4.0.5</cxf.core.version>
<quartz.version>2.3.2</quartz.version>
<hikaricp.version>3.4.5</hikaricp.version>
<micrometer.version>1.13.1</micrometer.version>
Expand Down Expand Up @@ -631,18 +632,34 @@ SPDX-License-Identifier: Apache-2.0
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-hc</artifactId>
<version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
Expand All @@ -652,15 +669,32 @@ SPDX-License-Identifier: Apache-2.0
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
</exclusion>
</exclusions>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf.core.version}</version>
</dependency>

<!-- Jackson -->
<dependency>
Expand Down

0 comments on commit cefb5a0

Please sign in to comment.