You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zb...@apache.org on 2023/03/21 14:49:57 UTC

[camel-quarkus] branch main updated: Revert "Temporary workaround for #4603 IllegalAnnotationsException Two classes"

This is an automated email from the ASF dual-hosted git repository.

zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new c28e43ea38 Revert "Temporary workaround for #4603 IllegalAnnotationsException Two classes"
c28e43ea38 is described below

commit c28e43ea3820d975a0fc0289000863aac4e419ac
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Mar 21 10:14:28 2023 +0100

    Revert "Temporary workaround for #4603 IllegalAnnotationsException Two classes"
    
    This reverts commit 7c1d7e857b49977bfa287a427cb66a21ac4dce3b.
---
 .../cxf-soap-client/src/main/resources/application.properties       | 5 -----
 .../cxf-soap-mtom-awt/src/main/resources/application.properties     | 4 ----
 .../cxf-soap-mtom/src/main/resources/application.properties         | 4 ----
 .../cxf-soap-server/src/main/resources/application.properties       | 4 ----
 .../src/main/resources/application.properties                       | 6 +-----
 .../src/main/resources/application.properties                       | 4 ----
 .../cxf-soap-ws-trust/src/main/resources/application.properties     | 4 ----
 7 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/application.properties
index d267577e7c..6657c53d3c 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/application.properties
@@ -17,11 +17,6 @@
 
 quarkus.cxf.path=/soapservice
 quarkus.native.resources.includes = wsdl/*.wsdl
-
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false
-
 # disable the root config
 quarkus.cxf.codegen.wsdl2java.includes = none.wsdl
 # ... and do everything with named parameter sets so that it works in the grouped module
diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/main/resources/application.properties
index ce22e4c22b..574727024a 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/main/resources/application.properties
@@ -17,7 +17,3 @@
 
 quarkus.cxf.path=/soapservice
 quarkus.native.resources.includes = wsdl/*.wsdl
-
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false
diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/resources/application.properties
index ce22e4c22b..574727024a 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/resources/application.properties
@@ -17,7 +17,3 @@
 
 quarkus.cxf.path=/soapservice
 quarkus.native.resources.includes = wsdl/*.wsdl
-
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false
diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties
index 509a400a3c..4a1cfd60e5 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties
@@ -18,10 +18,6 @@
 quarkus.cxf.path=/soapservice
 quarkus.native.resources.includes = wsdl/*.wsdl
 
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false
-
 # disable the root config
 quarkus.cxf.codegen.wsdl2java.includes = none.wsdl
 # ... and do everything with named parameter sets so that it works in the grouped module
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
index 1fbba33448..839a0bd602 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
@@ -18,12 +18,8 @@
 quarkus.cxf.path=/soapservice
 quarkus.native.resources.includes = wsdl/*.wsdl
 
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false
-
 # disable the root config
 quarkus.cxf.codegen.wsdl2java.includes = none.wsdl
 # ... and do everything with named parameter sets so that it works in the grouped module
 quarkus.cxf.codegen.wsdl2java.security-client.includes = wsdl/WssCalculatorService.wsdl
-quarkus.cxf.codegen.wsdl2java.security-client.additional-params = -wsdlLocation,classpath:wsdl/WssCalculatorService.wsdl
\ No newline at end of file
+quarkus.cxf.codegen.wsdl2java.security-client.additional-params = -wsdlLocation,classpath:wsdl/WssCalculatorService.wsdl
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/main/resources/application.properties
index a790cdaefd..b562d19234 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/main/resources/application.properties
@@ -20,7 +20,3 @@ quarkus.cxf.path=/soapservice
 quarkus.cxf.endpoint."/security-policy-hello-cxf-way".implementor=org.apache.camel.quarkus.component.cxf.soap.securitypolicy.server.cxf.way.it.WssSecurityPolicyHelloServiceCxfWayImpl
 
 quarkus.native.resources.includes=bob.properties,alice.properties,alice.jks,bob.jks,encrypt-sign-policy.xml
-
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/main/resources/application.properties
index 9ab2353934..98c1825180 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/main/resources/application.properties
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/main/resources/application.properties
@@ -22,7 +22,3 @@ quarkus.cxf.endpoint."/jaxws-samples-wsse-policy-trust-sts".features=org.apache.
 quarkus.cxf.endpoint."/jaxws-samples-wsse-policy-trust-cxf-way".implementor=org.apache.camel.quarkus.component.cxf.soap.it.ws.trust.server.cxf.way.TrustHelloServiceCxfWayImpl
 
 quarkus.native.resources.includes=*.properties,*.jks,*.wsdl,*.xml,*.xsd
-
-# Workaround for https://github.com/apache/camel-quarkus/issues/4603
-# Should not be needed with the Quarkus release coming after 3.0.0.Alpha5
-quarkus.jaxb.validate-jaxb-context = false