This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 22a3ee12ad8abd2ac7f5abb09f5458a563019423 Author: Jiri Ondrusek <[email protected]> AuthorDate: Mon Mar 9 09:56:18 2026 +0100 fixes #8398: moves groovy-xml into groovy --- catalog/pom.xml | 13 -- docs/modules/ROOT/nav.adoc | 1 - docs/modules/ROOT/pages/migration-guide/3.3.0.adoc | 9 ++ .../pages/reference/extensions/groovy-xml.adoc | 45 ------- .../ROOT/pages/reference/extensions/groovy.adoc | 5 + extensions/groovy-xml/deployment/pom.xml | 65 ---------- .../groovy/xml/deployment/GroovyXmlProcessor.java | 30 ----- extensions/groovy-xml/pom.xml | 37 ------ extensions/groovy-xml/runtime/pom.xml | 103 ---------------- .../main/resources/META-INF/quarkus-extension.yaml | 33 ------ .../groovy/runtime/src/main/doc/limitations.adoc | 5 + extensions/pom.xml | 1 - integration-tests/groovy-xml/pom.xml | 131 --------------------- integration-tests/groovy/pom.xml | 4 + .../component/groovy}/it/GroovyXmlResource.java | 2 +- .../component/groovy}/it/GroovyXmlRoutes.java | 2 +- .../src/main/resources/application.properties | 3 + .../quarkus/component/groovy}/it/GroovyXmlIT.java | 2 +- .../component/groovy}/it/GroovyXmlTest.java | 2 +- integration-tests/pom.xml | 1 - poms/bom/pom.xml | 15 --- tooling/scripts/test-categories.yaml | 1 - 22 files changed, 30 insertions(+), 480 deletions(-) diff --git a/catalog/pom.xml b/catalog/pom.xml index c722534bb8..c8ae78834b 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -1696,19 +1696,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-grpc</artifactId> diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index b18d5720ce..792fa3bff7 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -151,7 +151,6 @@ *** xref:reference/extensions/graphql.adoc[GraphQL] *** xref:reference/extensions/grok.adoc[Grok] *** xref:reference/extensions/groovy.adoc[Groovy] -*** xref:reference/extensions/groovy-xml.adoc[Groovy XML] *** xref:reference/extensions/gson.adoc[Gson] *** xref:reference/extensions/guava-eventbus.adoc[Guava EventBus] *** xref:reference/extensions/hl7.adoc[HL7] diff --git a/docs/modules/ROOT/pages/migration-guide/3.3.0.adoc b/docs/modules/ROOT/pages/migration-guide/3.3.0.adoc new file mode 100644 index 0000000000..41a7bb5396 --- /dev/null +++ b/docs/modules/ROOT/pages/migration-guide/3.3.0.adoc @@ -0,0 +1,9 @@ += Camel Quarkus 3.33.0 Migration Guide + +The following guide outlines how to adapt your code to changes that were made in Camel Quarkus 3.33.0. + + +=== camel-qoarkus-groovy-xml + +The `camel-quarkus-groovy-xml` has been moved into `camel-quarkus-groovy` and this JAR is no longer shipped. +So if you use `camel-quarkus-groovy-xml` then change the dependency to `camel-quarkus-groovy`. Change is triggered by https://issues.apache.org/jira/browse/CAMEL-23001[CAMEL-2300]. diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy-xml.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy-xml.adoc deleted file mode 100644 index e25038653a..0000000000 --- a/docs/modules/ROOT/pages/reference/extensions/groovy-xml.adoc +++ /dev/null @@ -1,45 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-groovy-xml"] -= Groovy XML -:linkattrs: -:cq-artifact-id: camel-quarkus-groovy-xml -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable -:cq-description: Transform between XML and Groovy Node (Map structure) objects. -:cq-deprecated: false -:cq-jvm-since: 3.29.0 -:cq-native-since: 3.29.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##3.29.0## [.badge-key]##Native since##[.badge-supported]##3.29.0## -endif::[] - -Transform between XML and Groovy Node (Map structure) objects. - -[id="extensions-groovy-xml-whats-inside"] -== What's inside - -* xref:{cq-camel-components}:dataformats:groovyXml-dataformat.adoc[Groovy XML data format] - -Please refer to the above link for usage and configuration details. - -[id="extensions-groovy-xml-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-groovy-xml[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-groovy-xml</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/docs/modules/ROOT/pages/reference/extensions/groovy.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc index a6bd6fb1a8..1d25f2c39e 100644 --- a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc @@ -51,6 +51,11 @@ endif::[] [id="extensions-groovy-limitations-native-mode-limitations"] === Native mode limitations +[IMPORTANT] +==== +Due to an issue in GraalVM / Mandrel 23.1.x, you *must* build your native application with the https://quarkus.io/guides/all-config#quarkus-core_quarkus-native-report-errors-at-runtime[`--report-unsupported-elements-at-runtime`] option. You can do this by adding the following configuration to `application.properties`. +==== + Compilation of Groovy expressions is made with static compilation enabled. Which means that the types used in your expressions must be known at compile time. Please refer to the https://docs.groovy-lang.org/latest/html/documentation/core-semantics.html#static-type-checking[Groovy documentation for more details]. diff --git a/extensions/groovy-xml/deployment/pom.xml b/extensions/groovy-xml/deployment/pom.xml deleted file mode 100644 index 208872e5c5..0000000000 --- a/extensions/groovy-xml/deployment/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml-parent</artifactId> - <version>3.33.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-groovy-xml-deployment</artifactId> - <name>Camel Quarkus :: Groovy XML :: Deployment</name> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml</artifactId> - </dependency> - <dependency> - <groupId>io.quarkiverse.groovy</groupId> - <artifactId>quarkus-groovy-deployment</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions/groovy-xml/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/xml/deployment/GroovyXmlProcessor.java b/extensions/groovy-xml/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/xml/deployment/GroovyXmlProcessor.java deleted file mode 100644 index 8673a123e9..0000000000 --- a/extensions/groovy-xml/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/xml/deployment/GroovyXmlProcessor.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.groovy.xml.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -class GroovyXmlProcessor { - - private static final String FEATURE = "camel-groovy-xml"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/extensions/groovy-xml/pom.xml b/extensions/groovy-xml/pom.xml deleted file mode 100644 index 34a216a545..0000000000 --- a/extensions/groovy-xml/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-extensions</artifactId> - <version>3.33.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-groovy-xml-parent</artifactId> - <name>Camel Quarkus :: Groovy XML</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions/groovy-xml/runtime/pom.xml b/extensions/groovy-xml/runtime/pom.xml deleted file mode 100644 index 478e378f27..0000000000 --- a/extensions/groovy-xml/runtime/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml-parent</artifactId> - <version>3.33.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-groovy-xml</artifactId> - <name>Camel Quarkus :: Groovy XML :: Runtime</name> - <description>Transform between XML and Groovy Node (Map structure) objects.</description> - - <properties> - <camel.quarkus.jvmSince>3.29.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>3.29.0</camel.quarkus.nativeSince> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> - </dependency> - <dependency> - <groupId>io.quarkiverse.groovy</groupId> - <artifactId>quarkus-groovy</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - - - <profiles> - <profile> - <id>full</id> - <activation> - <property> - <name>!quickly</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-maven-plugin</artifactId> - <executions> - <execution> - <id>update-extension-doc-page</id> - <goals> - <goal>update-extension-doc-page</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/extensions/groovy-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/groovy-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index a4c6f9dba5..0000000000 --- a/extensions/groovy-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Groovy XML" -description: "Transform between XML and Groovy Node (Map structure) objects" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"; - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/groovy-xml.html"; - categories: - - "integration" - status: - - "stable" diff --git a/extensions/groovy/runtime/src/main/doc/limitations.adoc b/extensions/groovy/runtime/src/main/doc/limitations.adoc index 352818b41c..e5d0cf3302 100644 --- a/extensions/groovy/runtime/src/main/doc/limitations.adoc +++ b/extensions/groovy/runtime/src/main/doc/limitations.adoc @@ -1,5 +1,10 @@ === Native mode limitations +[IMPORTANT] +==== +Due to an issue in GraalVM / Mandrel 23.1.x, you *must* build your native application with the https://quarkus.io/guides/all-config#quarkus-core_quarkus-native-report-errors-at-runtime[`--report-unsupported-elements-at-runtime`] option. You can do this by adding the following configuration to `application.properties`. +==== + Compilation of Groovy expressions is made with static compilation enabled. Which means that the types used in your expressions must be known at compile time. Please refer to the https://docs.groovy-lang.org/latest/html/documentation/core-semantics.html#static-type-checking[Groovy documentation for more details]. diff --git a/extensions/pom.xml b/extensions/pom.xml index f3cbaa1c50..450dde7f33 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -131,7 +131,6 @@ <module>graphql</module> <module>grok</module> <module>groovy</module> - <module>groovy-xml</module> <module>grpc</module> <module>gson</module> <module>hashicorp-vault</module> diff --git a/integration-tests/groovy-xml/pom.xml b/integration-tests/groovy-xml/pom.xml deleted file mode 100644 index 57d327d0d3..0000000000 --- a/integration-tests/groovy-xml/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-build-parent-it</artifactId> - <version>3.33.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent-it/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-integration-test-groovy-xml</artifactId> - <name>Camel Quarkus :: Integration Tests :: Groovy XML</name> - <description>Integration tests for Camel Quarkus Groovy XML extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy-jackson</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.native.enabled>true</quarkus.native.enabled> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>virtualDependencies</id> - <activation> - <property> - <name>!noVirtualDependencies</name> - </property> - </activation> - <dependencies> - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - </profiles> - -</project> diff --git a/integration-tests/groovy/pom.xml b/integration-tests/groovy/pom.xml index b88810527a..df871d3a30 100644 --- a/integration-tests/groovy/pom.xml +++ b/integration-tests/groovy/pom.xml @@ -51,6 +51,10 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy-jackson</artifactId> + </dependency> <!-- test dependencies --> <dependency> diff --git a/integration-tests/groovy-xml/src/main/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlResource.java b/integration-tests/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlResource.java similarity index 97% rename from integration-tests/groovy-xml/src/main/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlResource.java rename to integration-tests/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlResource.java index e7d12bbedc..ed221b569c 100644 --- a/integration-tests/groovy-xml/src/main/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlResource.java +++ b/integration-tests/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.groovy.xml.it; +package org.apache.camel.quarkus.component.groovy.it; import java.util.List; diff --git a/integration-tests/groovy-xml/src/main/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlRoutes.java b/integration-tests/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlRoutes.java similarity index 95% rename from integration-tests/groovy-xml/src/main/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlRoutes.java rename to integration-tests/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlRoutes.java index 6e5b075385..1f5a1f14c8 100644 --- a/integration-tests/groovy-xml/src/main/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlRoutes.java +++ b/integration-tests/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlRoutes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.groovy.xml.it; +package org.apache.camel.quarkus.component.groovy.it; import org.apache.camel.builder.RouteBuilder; diff --git a/integration-tests/groovy/src/main/resources/application.properties b/integration-tests/groovy/src/main/resources/application.properties index 14d5d5f7bf..57e4c33f38 100644 --- a/integration-tests/groovy/src/main/resources/application.properties +++ b/integration-tests/groovy/src/main/resources/application.properties @@ -15,3 +15,6 @@ ## limitations under the License. ## --------------------------------------------------------------------------- quarkus.native.resources.includes=*.groovy + +# TODO: Remove this: https://github.com/apache/camel-quarkus/issues/7361 +quarkus.native.report-errors-at-runtime=true diff --git a/integration-tests/groovy-xml/src/test/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlIT.java b/integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlIT.java similarity index 94% rename from integration-tests/groovy-xml/src/test/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlIT.java rename to integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlIT.java index 10413e8493..01ca320560 100644 --- a/integration-tests/groovy-xml/src/test/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlIT.java +++ b/integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.groovy.xml.it; +package org.apache.camel.quarkus.component.groovy.it; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/integration-tests/groovy-xml/src/test/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlTest.java b/integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlTest.java similarity index 97% rename from integration-tests/groovy-xml/src/test/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlTest.java rename to integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlTest.java index bddb0353ce..baa4434d32 100644 --- a/integration-tests/groovy-xml/src/test/java/org/apache/camel/quarkus/component/groovy/xml/it/GroovyXmlTest.java +++ b/integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.groovy.xml.it; +package org.apache.camel.quarkus.component.groovy.it; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index c4d86c0d13..c3bab21765 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -105,7 +105,6 @@ <module>graphql</module> <module>grok</module> <module>groovy</module> - <module>groovy-xml</module> <module>grpc</module> <module>hashicorp-vault</module> <module>hazelcast</module> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a26afc017e..fddc839ba1 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1537,11 +1537,6 @@ <artifactId>camel-groovy</artifactId> <version>${camel.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> - <version>${camel.version}</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId> @@ -4656,16 +4651,6 @@ <artifactId>camel-quarkus-groovy-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-xml-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-grpc</artifactId> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 64dd9fb7e6..58311d802f 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -40,7 +40,6 @@ group-02: - beanio - cyberark-vault - google-pubsub - - groovy-xml - grpc - iso8583 - jackson-avro
![https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"](https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"){kind=link}