This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 3e82773477 Restore camel-quarkus-stax testing
3e82773477 is described below
commit 3e8277347762bce222721babbba315203690a0d1
Author: James Netherton <[email protected]>
AuthorDate: Thu Feb 16 13:32:03 2023 +0000
Restore camel-quarkus-stax testing
Fixes #4494
---
docs/modules/ROOT/examples/components/stax.yml | 13 ++++++
docs/modules/ROOT/examples/languages/xtokenize.yml | 13 ++++++
docs/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/reference/extensions/stax.adoc | 46 ++++++++++++++++++++++
extensions-support/pom.xml | 2 +-
extensions-support/stax/runtime/pom.xml | 4 ++
extensions/pom.xml | 2 +-
integration-tests/xml/pom.xml | 8 +---
.../quarkus/component/xml/it/XmlRouteBuilder.java | 3 +-
.../camel/quarkus/component/xml/it/XmlTest.java | 2 -
poms/bom/pom.xml | 12 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 25 ++++++++++++
.../src/main/generated/flattened-reduced-pom.xml | 25 ++++++++++++
.../generated/flattened-reduced-verbose-pom.xml | 25 ++++++++++++
14 files changed, 163 insertions(+), 18 deletions(-)
diff --git a/docs/modules/ROOT/examples/components/stax.yml
b/docs/modules/ROOT/examples/components/stax.yml
new file mode 100644
index 0000000000..4fe6c08c1a
--- /dev/null
+++ b/docs/modules/ROOT/examples/components/stax.yml
@@ -0,0 +1,13 @@
+# Do not edit directly!
+# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+cqArtifactId: camel-quarkus-stax
+cqArtifactIdBase: stax
+cqNativeSupported: true
+cqStatus: Stable
+cqDeprecated: false
+cqJvmSince: 1.1.0
+cqNativeSince: 1.7.0
+cqCamelPartName: stax
+cqCamelPartTitle: StAX
+cqCamelPartDescription: Process XML payloads by a SAX ContentHandler.
+cqExtensionPageTitle: StAX
diff --git a/docs/modules/ROOT/examples/languages/xtokenize.yml
b/docs/modules/ROOT/examples/languages/xtokenize.yml
new file mode 100644
index 0000000000..c11a84bc95
--- /dev/null
+++ b/docs/modules/ROOT/examples/languages/xtokenize.yml
@@ -0,0 +1,13 @@
+# Do not edit directly!
+# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+cqArtifactId: camel-quarkus-stax
+cqArtifactIdBase: stax
+cqNativeSupported: true
+cqStatus: Stable
+cqDeprecated: false
+cqJvmSince: 1.1.0
+cqNativeSince: 1.7.0
+cqCamelPartName: xtokenize
+cqCamelPartTitle: XML Tokenize
+cqCamelPartDescription: Tokenize XML payloads.
+cqExtensionPageTitle: StAX
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 182dd9ff97..82f5b9f6bd 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -265,6 +265,7 @@
*** xref:reference/extensions/splunk.adoc[Splunk]
*** xref:reference/extensions/splunk-hec.adoc[Splunk HEC]
*** xref:reference/extensions/spring-rabbitmq.adoc[Spring RabbitMQ]
+*** xref:reference/extensions/stax.adoc[StAX]
*** xref:reference/extensions/stitch.adoc[Stitch]
*** xref:reference/extensions/stomp.adoc[Stomp]
*** xref:reference/extensions/stream.adoc[Stream]
diff --git a/docs/modules/ROOT/pages/reference/extensions/stax.adoc
b/docs/modules/ROOT/pages/reference/extensions/stax.adoc
new file mode 100644
index 0000000000..a5e9fe68f6
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/stax.adoc
@@ -0,0 +1,46 @@
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+[id="extensions-stax"]
+= StAX
+:linkattrs:
+:cq-artifact-id: camel-quarkus-stax
+:cq-native-supported: true
+:cq-status: Stable
+:cq-status-deprecation: Stable
+:cq-description: Process XML payloads by a SAX ContentHandler.
+:cq-deprecated: false
+:cq-jvm-since: 1.1.0
+:cq-native-since: 1.7.0
+
+ifeval::[{doc-show-badges} == true]
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native
since##[.badge-supported]##1.7.0##
+endif::[]
+
+Process XML payloads by a SAX ContentHandler.
+
+[id="extensions-stax-whats-inside"]
+== What's inside
+
+* xref:{cq-camel-components}::stax-component.adoc[StAX component], URI syntax:
`stax:contentHandlerClass`
+* xref:{cq-camel-components}:languages:xtokenize-language.adoc[XML Tokenize
language]
+
+Please refer to the above links for usage and configuration details.
+
+[id="extensions-stax-maven-coordinates"]
+== Maven coordinates
+
+https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-stax[Create
a new project with this extension on {link-quarkus-code-generator},
window="_blank"]
+
+Or add the coordinates to your existing project:
+
+[source,xml]
+----
+<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-stax</artifactId>
+</dependency>
+----
+ifeval::[{doc-show-user-guide-link} == true]
+Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+endif::[]
diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml
index 332d37a733..85734a10e1 100644
--- a/extensions-support/pom.xml
+++ b/extensions-support/pom.xml
@@ -56,7 +56,7 @@
<module>reactor-netty</module>
<module>retrofit</module>
<module>spring</module>
- <!--<module>stax</module>
https://github.com/apache/camel-quarkus/issues/4478 -->
+ <module>stax</module>
<module>webhook</module>
<!--<module>xstream</module>
https://github.com/apache/camel-quarkus/issues/4477 -->
<module>xalan</module>
diff --git a/extensions-support/stax/runtime/pom.xml
b/extensions-support/stax/runtime/pom.xml
index 9e52d27adf..3add51e331 100644
--- a/extensions-support/stax/runtime/pom.xml
+++ b/extensions-support/stax/runtime/pom.xml
@@ -37,6 +37,10 @@
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.brotli</groupId>
+ <artifactId>dec</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index b3a59591fb..e33a4ea241 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -228,7 +228,7 @@
<module>spring-rabbitmq</module>
<module>sql</module>
<module>ssh</module>
- <!--<module>stax</module>-->
+ <module>stax</module>
<module>stream</module>
<module>stringtemplate</module>
<module>syslog</module>
diff --git a/integration-tests/xml/pom.xml b/integration-tests/xml/pom.xml
index 49998cc977..50d49aab45 100644
--- a/integration-tests/xml/pom.xml
+++ b/integration-tests/xml/pom.xml
@@ -30,10 +30,6 @@
<name>Camel Quarkus :: Integration Tests :: XML</name>
<description>Integration tests for various XML related
extensions</description>
- <properties>
- <ci.native.tests.skip>true</ci.native.tests.skip><!--
https://github.com/apache/camel-quarkus/issues/4494 -->
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -51,10 +47,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-language</artifactId>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-stax</artifactId>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bean</artifactId>
diff --git
a/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
b/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
index 98ec3095c4..1383f2172e 100644
---
a/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
+++
b/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
@@ -21,6 +21,7 @@ import org.w3c.dom.Document;
import io.quarkus.runtime.annotations.RegisterForReflection;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.xslt.saxon.XsltSaxonAggregationStrategy;
+import org.apache.camel.support.builder.Namespaces;
// These reflections registrations should be removed with fixing
https://github.com/apache/camel-quarkus/issues/1615
@RegisterForReflection(classNames = {
@@ -53,12 +54,10 @@ public class XmlRouteBuilder extends RouteBuilder {
.otherwise()
.setBody(constant("Invalid country code"));
- /* https://github.com/apache/camel-quarkus/issues/4494
from(DIRECT_XTOKENIZE)
.split()
.xtokenize("//C:child", new Namespaces("C", "urn:c"))
.to("seda:xtokenize-result");
- */
from("direct:aggregate")
.aggregate(new
XsltSaxonAggregationStrategy("xslt/aggregate.xsl"))
diff --git
a/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTest.java
b/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTest.java
index 52ead9321a..b629e6117f 100644
---
a/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTest.java
+++
b/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTest.java
@@ -27,7 +27,6 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -209,7 +208,6 @@ class XmlTest {
}
@Test
- @Disabled("https://github.com/apache/camel-quarkus/issues/4494";)
public void xtokenizeLanguage() {
String expectedResult = "<c:child some_attr='a' anotherAttr='a'
xmlns:c=\"urn:c\"></c:child>,<c:child some_attr='b' anotherAttr='b'
xmlns:c=\"urn:c\"></c:child>";
String xml = "<?xml version='1.0' encoding='UTF-8'?>"
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 2d0327471f..8b1ae941bf 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -2348,11 +2348,11 @@
</exclusion>
</exclusions>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stax</artifactId>
<version>${camel.version}</version>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stitch</artifactId>
@@ -5205,7 +5205,7 @@
<artifactId>camel-quarkus-ssh-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-stax</artifactId>
<version>${camel-quarkus.version}</version>
@@ -5214,7 +5214,7 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-stax-deployment</artifactId>
<version>${camel-quarkus.version}</version>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-stitch</artifactId>
@@ -5500,7 +5500,7 @@
<artifactId>camel-quarkus-support-spring-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-stax</artifactId>
<version>${camel-quarkus.version}</version>
@@ -5509,7 +5509,7 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-stax-deployment</artifactId>
<version>${camel-quarkus.version}</version>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-webhook</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 9224a5cf09..003f91caff 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -2262,6 +2262,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-stax</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.0.0-M1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-stitch</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -5053,6 +5058,16 @@
<artifactId>camel-quarkus-ssh-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-stax</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-stax-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-stitch</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -5338,6 +5353,16 @@
<artifactId>camel-quarkus-support-spring-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-stax</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-stax-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-support-webhook</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 2b8fb082cc..994094d172 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -2262,6 +2262,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stax</artifactId>
+ <version>4.0.0-M1</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stitch</artifactId>
@@ -5053,6 +5058,16 @@
<artifactId>camel-quarkus-ssh-deployment</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-stax</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-stax-deployment</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-stitch</artifactId>
@@ -5338,6 +5353,16 @@
<artifactId>camel-quarkus-support-spring-deployment</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-stax</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-stax-deployment</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-webhook</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 9d3038bfad..372817855a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -2262,6 +2262,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-stax</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.0.0-M1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-stitch</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -5053,6 +5058,16 @@
<artifactId>camel-quarkus-ssh-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-stax</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-stax-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-stitch</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -5338,6 +5353,16 @@
<artifactId>camel-quarkus-support-spring-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-stax</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-stax-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-support-webhook</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
