From 9a2cddb21decc9055ba9d9f6b8e99c34b63df683 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Mon, 25 Sep 2023 16:22:40 +0200 Subject: [PATCH] Upgrade to Quarkus CXF 2.4.1 --- .../quarkus-camel/bom/pom.xml | 102 +++++------ .../quarkus-cxf/bom/pom.xml | 102 +++++------ .../quarkus-cxf/integration-tests/pom.xml | 1 + .../pom.xml | 160 ++++++++++++++++++ .../src/main/resources/seed | 1 + .../pom.xml | 6 +- .../quarkus-universe/bom/pom.xml | 102 +++++------ pom.xml | 2 +- 8 files changed, 319 insertions(+), 157 deletions(-) create mode 100644 generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/pom.xml create mode 100644 generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/src/main/resources/seed diff --git a/generated-platform-project/quarkus-camel/bom/pom.xml b/generated-platform-project/quarkus-camel/bom/pom.xml index c7f6882ddf..db576aaed9 100644 --- a/generated-platform-project/quarkus-camel/bom/pom.xml +++ b/generated-platform-project/quarkus-camel/bom/pom.xml @@ -653,107 +653,107 @@ io.quarkiverse.cxf quarkus-cxf-axiom-api-stub - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-logging-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-logging - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-metrics-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-metrics - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-transports-http-hc5-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-transports-http-hc5 - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-rm-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-rm - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-security-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-security - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-saaj-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-saaj - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-services-sts-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-services-sts - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-woodstox-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-woodstox - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-xjc-plugins-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-xjc-plugins - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf - 2.4.0 + 2.4.1 io.quarkiverse.freemarker @@ -6797,7 +6797,7 @@ org.apache.cxf.services.sts cxf-services-sts-core - 4.0.2 + 4.0.3 org.apache.cxf.xjc-utils @@ -6837,42 +6837,42 @@ org.apache.cxf cxf-core - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-bindings-soap - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-bindings-xml - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-databinding-aegis - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-databinding-jaxb - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-features-logging - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-features-metrics - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-frontend-jaxws - 4.0.2 + 4.0.3 org.ow2.asm @@ -6883,42 +6883,42 @@ org.apache.cxf cxf-rt-frontend-simple - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-javascript - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-management - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-rs-json-basic - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-rs-security-jose - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-security-saml - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-security - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-transports-http-hc5 - 4.0.2 + 4.0.3 org.slf4j @@ -6929,37 +6929,37 @@ org.apache.cxf cxf-rt-transports-http - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-addr - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-mex - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-policy - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-rm - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-security - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-wsdl - 4.0.2 + 4.0.3 org.ow2.asm @@ -6970,32 +6970,32 @@ org.apache.cxf cxf-tools-common - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-java2ws - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-validator - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-core - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-databinding-jaxb - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-frontend-jaxws - 4.0.2 + 4.0.3 org.apache.groovy diff --git a/generated-platform-project/quarkus-cxf/bom/pom.xml b/generated-platform-project/quarkus-cxf/bom/pom.xml index 3b89403816..dca6c9841d 100644 --- a/generated-platform-project/quarkus-cxf/bom/pom.xml +++ b/generated-platform-project/quarkus-cxf/bom/pom.xml @@ -77,107 +77,107 @@ io.quarkiverse.cxf quarkus-cxf-axiom-api-stub - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-logging-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-logging - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-metrics-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-metrics - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-transports-http-hc5-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-transports-http-hc5 - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-rm-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-rm - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-security-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-security - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-saaj-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-saaj - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-services-sts-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-services-sts - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-woodstox-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-woodstox - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-xjc-plugins-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-xjc-plugins - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf - 2.4.0 + 2.4.1 io.quarkiverse.xmlsec @@ -224,7 +224,7 @@ org.apache.cxf.services.sts cxf-services-sts-core - 4.0.2 + 4.0.3 org.apache.cxf.xjc-utils @@ -264,42 +264,42 @@ org.apache.cxf cxf-core - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-bindings-soap - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-bindings-xml - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-databinding-aegis - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-databinding-jaxb - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-features-logging - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-features-metrics - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-frontend-jaxws - 4.0.2 + 4.0.3 org.ow2.asm @@ -310,42 +310,42 @@ org.apache.cxf cxf-rt-frontend-simple - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-javascript - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-management - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-rs-json-basic - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-rs-security-jose - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-security-saml - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-security - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-transports-http-hc5 - 4.0.2 + 4.0.3 org.slf4j @@ -356,37 +356,37 @@ org.apache.cxf cxf-rt-transports-http - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-addr - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-mex - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-policy - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-rm - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-security - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-wsdl - 4.0.2 + 4.0.3 org.ow2.asm @@ -397,32 +397,32 @@ org.apache.cxf cxf-tools-common - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-java2ws - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-validator - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-core - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-databinding-jaxb - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-frontend-jaxws - 4.0.2 + 4.0.3 org.apache.neethi diff --git a/generated-platform-project/quarkus-cxf/integration-tests/pom.xml b/generated-platform-project/quarkus-cxf/integration-tests/pom.xml index 5d5f107459..8528f424ef 100644 --- a/generated-platform-project/quarkus-cxf/integration-tests/pom.xml +++ b/generated-platform-project/quarkus-cxf/integration-tests/pom.xml @@ -22,6 +22,7 @@ quarkus-cxf-integration-test-ws-addressing quarkus-cxf-integration-test-ws-rm quarkus-cxf-integration-test-ws-security-client + quarkus-cxf-integration-test-ws-security-policy quarkus-cxf-integration-test-ws-security-server quarkus-cxf-integration-test-ws-trust diff --git a/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/pom.xml b/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/pom.xml new file mode 100644 index 0000000000..ac740897c5 --- /dev/null +++ b/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/pom.xml @@ -0,0 +1,160 @@ + + + 4.0.0 + + io.quarkus.platform + quarkus-cxf-integration-tests-parent + 999-SNAPSHOT + .. + + quarkus-cxf-integration-test-ws-security-policy + Quarkus Platform - CXF - Integration Tests - quarkus-cxf-integration-test-ws-security-policy + + + io.quarkiverse.cxf + quarkus-cxf-integration-test-ws-security-policy + ${quarkus-cxf.version} + + + io.quarkiverse.cxf + quarkus-cxf-integration-test-ws-security-policy + ${quarkus-cxf.version} + test-jar + tests + test + + + io.rest-assured + rest-assured + test + + + javax.activation + activation + + + javax.activation + javax.activation-api + + + jakarta.activation + jakarta.activation-api + + + com.sun.xml.bind + jaxb-osgi + + + commons-logging + commons-logging + + + + + io.quarkiverse.cxf + quarkus-cxf-test-util + ${quarkus-cxf.version} + test + + + io.quarkus + quarkus-junit5 + test + + + org.assertj + assertj-core + 3.24.2 + test + + + + + + + maven-jar-plugin + + + default-jar + none + + + + + maven-source-plugin + + + attach-sources + none + + + + + + + + maven-surefire-plugin + + + io.quarkiverse.cxf:quarkus-cxf-integration-test-ws-security-policy + + + + + + + + native-image + + + native + + + + + + maven-failsafe-plugin + + + + integration-test + verify + + + + ${project.build.directory}/${project.build.finalName}-runner + + + + + + + io.quarkiverse.cxf:quarkus-cxf-integration-test-ws-security-policy + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + + + native-image + + build + + + io.quarkiverse.cxf:quarkus-cxf-integration-test-ws-security-policy:${quarkus-cxf.version} + + + + + + + + native + + + + diff --git a/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/src/main/resources/seed b/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/src/main/resources/seed new file mode 100644 index 0000000000..e06b1e20b0 --- /dev/null +++ b/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-ws-security-policy/src/main/resources/seed @@ -0,0 +1 @@ +seed \ No newline at end of file diff --git a/generated-platform-project/quarkus-qpid-jms/integration-tests/quarkus-qpid-jms-integration-tests/pom.xml b/generated-platform-project/quarkus-qpid-jms/integration-tests/quarkus-qpid-jms-integration-tests/pom.xml index 3c7d128ba9..ed9e7fa3d8 100644 --- a/generated-platform-project/quarkus-qpid-jms/integration-tests/quarkus-qpid-jms-integration-tests/pom.xml +++ b/generated-platform-project/quarkus-qpid-jms/integration-tests/quarkus-qpid-jms-integration-tests/pom.xml @@ -14,12 +14,12 @@ org.amqphub.quarkus quarkus-qpid-jms-integration-tests - ${quarkus-cxf.version} + ${quarkus-qpid-jms.version} org.amqphub.quarkus quarkus-qpid-jms-integration-tests - ${quarkus-cxf.version} + ${quarkus-qpid-jms.version} test-jar tests test @@ -150,7 +150,7 @@ build - org.amqphub.quarkus:quarkus-qpid-jms-integration-tests:${quarkus-cxf.version} + org.amqphub.quarkus:quarkus-qpid-jms-integration-tests:${quarkus-qpid-jms.version} diff --git a/generated-platform-project/quarkus-universe/bom/pom.xml b/generated-platform-project/quarkus-universe/bom/pom.xml index 630b82db3d..ea94291c59 100644 --- a/generated-platform-project/quarkus-universe/bom/pom.xml +++ b/generated-platform-project/quarkus-universe/bom/pom.xml @@ -7566,107 +7566,107 @@ io.quarkiverse.cxf quarkus-cxf-axiom-api-stub - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-logging-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-logging - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-metrics-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-features-metrics - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-transports-http-hc5-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-transports-http-hc5 - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-rm-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-rm - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-security-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-rt-ws-security - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-saaj-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-saaj - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-services-sts-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-services-sts - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-woodstox-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-woodstox - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-xjc-plugins-deployment - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf-xjc-plugins - 2.4.0 + 2.4.1 io.quarkiverse.cxf quarkus-cxf - 2.4.0 + 2.4.1 io.quarkiverse.freemarker @@ -18928,7 +18928,7 @@ org.apache.cxf.services.sts cxf-services-sts-core - 4.0.2 + 4.0.3 org.apache.cxf.xjc-utils @@ -18968,42 +18968,42 @@ org.apache.cxf cxf-core - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-bindings-soap - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-bindings-xml - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-databinding-aegis - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-databinding-jaxb - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-features-logging - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-features-metrics - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-frontend-jaxws - 4.0.2 + 4.0.3 org.ow2.asm @@ -19014,42 +19014,42 @@ org.apache.cxf cxf-rt-frontend-simple - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-javascript - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-management - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-rs-json-basic - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-rs-security-jose - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-security-saml - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-security - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-transports-http-hc5 - 4.0.2 + 4.0.3 org.slf4j @@ -19060,37 +19060,37 @@ org.apache.cxf cxf-rt-transports-http - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-addr - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-mex - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-policy - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-rm - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-ws-security - 4.0.2 + 4.0.3 org.apache.cxf cxf-rt-wsdl - 4.0.2 + 4.0.3 org.ow2.asm @@ -19101,32 +19101,32 @@ org.apache.cxf cxf-tools-common - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-java2ws - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-validator - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-core - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-databinding-jaxb - 4.0.2 + 4.0.3 org.apache.cxf cxf-tools-wsdlto-frontend-jaxws - 4.0.2 + 4.0.3 org.apache.derby diff --git a/pom.xml b/pom.xml index 4dcbe3d152..67b8286c32 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ and also at src/main/resources/xslt/amazon-services/test-pom.xsl as they might require adjustments. --> 2.5.0 - 2.4.0 + 2.4.1 2.0.1 2.4.0 ${quarkus-qpid-jms.version}