Skip to content

Commit 3fd9644

Browse files
harrymiddelburgetallharrymiddelburgetall
authored
Merge pull request #1487 from OSGP/feature/downgrade-cxf-core-only
upgrade-cxf-core-only
2 parents b5fc05f + cefb5a0 commit 3fd9644

File tree

6 files changed

+137
-12
lines changed
  • integration-tests/cucumber-tests-platform-smartmetering
  • osgp/protocol-adapter-dlms
    • osgp-protocol-adapter-dlms
    • osgp-protocol-simulator-dlms
  • super

6 files changed

+137
-12
lines changed

‎integration-tests/cucumber-tests-platform-smartmetering/pom.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ SPDX-License-Identifier: Apache-2.0
1818
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1919
</parent>
2020

21-
<properties>
22-
<!-- override version in super pom -->
23-
<cxf.version>4.0.3</cxf.version>
24-
</properties>
25-
2621
<artifactId>cucumber-tests-platform-smartmetering</artifactId>
2722
<packaging>jar</packaging>
2823
<name>cucumber-tests-platform-smartmetering</name>
@@ -200,9 +195,18 @@ SPDX-License-Identifier: Apache-2.0
200195
<dependency>
201196
<groupId>org.apache.cxf</groupId>
202197
<artifactId>cxf-rt-rs-client</artifactId>
198+
<exclusions>
199+
<exclusion>
200+
<groupId>org.apache.cxf</groupId>
201+
<artifactId>cxf-core</artifactId>
202+
</exclusion>
203+
</exclusions>
203204
<version>${cxf.version}</version>
204205
</dependency>
205-
206+
<dependency>
207+
<groupId>org.apache.cxf</groupId>
208+
<artifactId>cxf-core</artifactId>
209+
</dependency>
206210
<dependency>
207211
<groupId>org.apache.httpcomponents</groupId>
208212
<artifactId>httpclient</artifactId>

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,68 @@ SPDX-License-Identifier: Apache-2.0
284284
<!-- Apache CXF RESTfull WS WebClient -->
285285
<dependency>
286286
<groupId>org.apache.cxf</groupId>
287-
<artifactId>cxf-core</artifactId>
287+
<artifactId>cxf-rt-rs-client</artifactId>
288+
<exclusions>
289+
<exclusion>
290+
<groupId>org.apache.cxf</groupId>
291+
<artifactId>cxf-core</artifactId>
292+
</exclusion>
293+
</exclusions>
288294
<version>${cxf.version}</version>
289295
</dependency>
290296
<dependency>
291297
<groupId>org.apache.cxf</groupId>
292298
<artifactId>cxf-rt-transports-http</artifactId>
299+
<exclusions>
300+
<exclusion>
301+
<groupId>org.apache.cxf</groupId>
302+
<artifactId>cxf-core</artifactId>
303+
</exclusion>
304+
</exclusions>
293305
<version>${cxf.version}</version>
294306
</dependency>
295307
<dependency>
296308
<groupId>org.apache.cxf</groupId>
297-
<artifactId>cxf-rt-rs-client</artifactId>
309+
<artifactId>cxf-rt-transports-http-hc</artifactId>
298310
<version>${cxf.version}</version>
311+
<exclusions>
312+
<exclusion>
313+
<groupId>org.apache.cxf</groupId>
314+
<artifactId>cxf-core</artifactId>
315+
</exclusion>
316+
<exclusion>
317+
<groupId>org.apache.httpcomponents</groupId>
318+
<artifactId>httpcore-nio</artifactId>
319+
</exclusion>
320+
</exclusions>
321+
</dependency>
322+
<dependency>
323+
<groupId>org.apache.cxf</groupId>
324+
<artifactId>cxf-rt-rs-extension-search</artifactId>
325+
<exclusions>
326+
<exclusion>
327+
<groupId>org.apache.cxf</groupId>
328+
<artifactId>cxf-core</artifactId>
329+
</exclusion>
330+
</exclusions>
331+
<version>${cxf.version}</version>
332+
<scope>provided</scope>
333+
</dependency>
334+
<dependency>
335+
<groupId>org.apache.cxf</groupId>
336+
<artifactId>cxf-rt-rs-extension-providers</artifactId>
337+
<exclusions>
338+
<exclusion>
339+
<groupId>org.apache.cxf</groupId>
340+
<artifactId>cxf-core</artifactId>
341+
</exclusion>
342+
</exclusions>
343+
<version>${cxf.version}</version>
344+
<scope>provided</scope>
345+
</dependency>
346+
<dependency>
347+
<groupId>org.apache.cxf</groupId>
348+
<artifactId>cxf-core</artifactId>
299349
</dependency>
300350

301351
<!-- Spring JMS -->

‎osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,32 @@ SPDX-License-Identifier: Apache-2.0
243243
<dependency>
244244
<groupId>org.apache.cxf</groupId>
245245
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
246+
<exclusions>
247+
<exclusion>
248+
<groupId>org.apache.cxf</groupId>
249+
<artifactId>cxf-core</artifactId>
250+
</exclusion>
251+
</exclusions>
246252
</dependency>
247253
<dependency>
248254
<groupId>org.apache.cxf</groupId>
249255
<artifactId>cxf-rt-rs-security-cors</artifactId>
256+
<exclusions>
257+
<exclusion>
258+
<groupId>org.apache.cxf</groupId>
259+
<artifactId>cxf-core</artifactId>
260+
</exclusion>
261+
</exclusions>
250262
</dependency>
251263
<dependency>
252264
<groupId>org.apache.cxf</groupId>
253265
<artifactId>cxf-rt-rs-service-description</artifactId>
266+
<exclusions>
267+
<exclusion>
268+
<groupId>org.apache.cxf</groupId>
269+
<artifactId>cxf-core</artifactId>
270+
</exclusion>
271+
</exclusions>
254272
</dependency>
255273
<dependency>
256274
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>

‎osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/pom.xml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ SPDX-License-Identifier: Apache-2.0
2424
<display.version>${project.version}-${BUILD_TAG}</display.version>
2525
<commons.collections.version>4.4</commons.collections.version>
2626
<spring.boot.version>3.3.5</spring.boot.version>
27-
<!-- override version in super pom -->
28-
<cxf.version>4.0.3</cxf.version>
29-
3027
<skipITs>true</skipITs>
3128
</properties>
3229

@@ -37,16 +34,34 @@ SPDX-License-Identifier: Apache-2.0
3734
<dependency>
3835
<groupId>org.apache.cxf</groupId>
3936
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
37+
<exclusions>
38+
<exclusion>
39+
<groupId>org.apache.cxf</groupId>
40+
<artifactId>cxf-core</artifactId>
41+
</exclusion>
42+
</exclusions>
4043
<version>${cxf.version}</version>
4144
</dependency>
4245
<dependency>
4346
<groupId>org.apache.cxf</groupId>
4447
<artifactId>cxf-rt-rs-security-cors</artifactId>
48+
<exclusions>
49+
<exclusion>
50+
<groupId>org.apache.cxf</groupId>
51+
<artifactId>cxf-core</artifactId>
52+
</exclusion>
53+
</exclusions>
4554
<version>${cxf.version}</version>
4655
</dependency>
4756
<dependency>
4857
<groupId>org.apache.cxf</groupId>
4958
<artifactId>cxf-rt-rs-service-description</artifactId>
59+
<exclusions>
60+
<exclusion>
61+
<groupId>org.apache.cxf</groupId>
62+
<artifactId>cxf-core</artifactId>
63+
</exclusion>
64+
</exclusions>
5065
<version>${cxf.version}</version>
5166
</dependency>
5267
<dependency>

‎osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ SPDX-License-Identifier: Apache-2.0
102102
<groupId>org.apache.cxf</groupId>
103103
<artifactId>cxf-rt-transports-http-hc</artifactId>
104104
</dependency>
105+
<dependency>
106+
<groupId>org.apache.cxf</groupId>
107+
<artifactId>cxf-core</artifactId>
108+
</dependency>
105109

106110
<dependency>
107111
<groupId>org.openmuc</groupId>

‎super/pom.xml

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ SPDX-License-Identifier: Apache-2.0
120120
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
121121
<license.maven.plugin>3.0</license.maven.plugin>
122122
<jackson.version>2.15.3</jackson.version>
123-
<cxf.version>4.0.5</cxf.version>
123+
<cxf.version>4.0.3</cxf.version>
124+
<cxf.core.version>4.0.5</cxf.core.version>
124125
<quartz.version>2.3.2</quartz.version>
125126
<hikaricp.version>3.4.5</hikaricp.version>
126127
<micrometer.version>1.13.1</micrometer.version>
@@ -631,18 +632,34 @@ SPDX-License-Identifier: Apache-2.0
631632
<dependency>
632633
<groupId>org.apache.cxf</groupId>
633634
<artifactId>cxf-rt-rs-client</artifactId>
635+
<exclusions>
636+
<exclusion>
637+
<groupId>org.apache.cxf</groupId>
638+
<artifactId>cxf-core</artifactId>
639+
</exclusion>
640+
</exclusions>
634641
<version>${cxf.version}</version>
635642
</dependency>
636643
<dependency>
637644
<groupId>org.apache.cxf</groupId>
638645
<artifactId>cxf-rt-transports-http</artifactId>
646+
<exclusions>
647+
<exclusion>
648+
<groupId>org.apache.cxf</groupId>
649+
<artifactId>cxf-core</artifactId>
650+
</exclusion>
651+
</exclusions>
639652
<version>${cxf.version}</version>
640653
</dependency>
641654
<dependency>
642655
<groupId>org.apache.cxf</groupId>
643656
<artifactId>cxf-rt-transports-http-hc</artifactId>
644657
<version>${cxf.version}</version>
645658
<exclusions>
659+
<exclusion>
660+
<groupId>org.apache.cxf</groupId>
661+
<artifactId>cxf-core</artifactId>
662+
</exclusion>
646663
<exclusion>
647664
<groupId>org.apache.httpcomponents</groupId>
648665
<artifactId>httpcore-nio</artifactId>
@@ -652,15 +669,32 @@ SPDX-License-Identifier: Apache-2.0
652669
<dependency>
653670
<groupId>org.apache.cxf</groupId>
654671
<artifactId>cxf-rt-rs-extension-search</artifactId>
672+
<exclusions>
673+
<exclusion>
674+
<groupId>org.apache.cxf</groupId>
675+
<artifactId>cxf-core</artifactId>
676+
</exclusion>
677+
</exclusions>
655678
<version>${cxf.version}</version>
656679
<scope>provided</scope>
657680
</dependency>
658681
<dependency>
659682
<groupId>org.apache.cxf</groupId>
660683
<artifactId>cxf-rt-rs-extension-providers</artifactId>
684+
<exclusions>
685+
<exclusion>
686+
<groupId>org.apache.cxf</groupId>
687+
<artifactId>cxf-core</artifactId>
688+
</exclusion>
689+
</exclusions>
661690
<version>${cxf.version}</version>
662691
<scope>provided</scope>
663692
</dependency>
693+
<dependency>
694+
<groupId>org.apache.cxf</groupId>
695+
<artifactId>cxf-core</artifactId>
696+
<version>${cxf.core.version}</version>
697+
</dependency>
664698

665699
<!-- Jackson -->
666700
<dependency>

0 commit comments

Comments
 (0)