This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch gx in repository https://gitbox.apache.org/repos/asf/camel.git
commit 44e02c2b4bee60b148cfba38a5eff065e4f29d2c Author: Claus Ibsen <[email protected]> AuthorDate: Fri Mar 6 09:09:41 2026 +0100 CAMEL-23001: Move camel-groovy-xml into camel-groovy --- bom/camel-bom/pom.xml | 5 -- catalog/camel-allcomponents/pom.xml | 5 -- .../camel/catalog/dataformats/groovyXml.json | 2 +- components/camel-groovy-xml/pom.xml | 84 ---------------------- .../src/test/resources/log4j2.properties | 30 -------- components/camel-groovy/pom.xml | 10 +++ .../groovy/xml/GroovyXmlDataFormatConfigurer.java | 0 .../org/apache/camel/groovy/xml/groovyXml.json | 2 +- .../apache/camel/configurer/groovyXml-dataformat | 0 .../org/apache/camel/dataformat.properties | 6 +- .../services/org/apache/camel/dataformat/groovyXml | 0 .../src/main/docs/groovyXml-dataformat.adoc | 8 +-- .../camel/groovy/xml/GroovyXmlDataFormat.java | 0 .../camel/groovy/xml/GroovyXmlDataFormatTest.java | 0 components/pom.xml | 1 - coverage/pom.xml | 7 +- .../dataformats/examples/json/groovyXml.json | 2 +- .../dataformats/pages/groovyXml-dataformat.adoc | 2 +- .../ROOT/pages/camel-4x-upgrade-guide-4_19.adoc | 4 ++ parent/pom.xml | 5 -- 20 files changed, 26 insertions(+), 147 deletions(-) diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index b16593ddf879..9c6625a63975 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -997,11 +997,6 @@ <artifactId>camel-groovy</artifactId> <version>4.19.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> - <version>4.19.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId> diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml index 04f1e538052d..2601ea4ec555 100644 --- a/catalog/camel-allcomponents/pom.xml +++ b/catalog/camel-allcomponents/pom.xml @@ -867,11 +867,6 @@ <artifactId>camel-groovy</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/groovyXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/groovyXml.json index 5567f8676542..66fb32ab5f0d 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/groovyXml.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/groovyXml.json @@ -10,7 +10,7 @@ "javaType": "org.apache.camel.groovy.xml.GroovyXmlDataFormat", "supportLevel": "Stable", "groupId": "org.apache.camel", - "artifactId": "camel-groovy-xml", + "artifactId": "camel-groovy", "version": "4.19.0-SNAPSHOT", "modelName": "groovyXml", "modelJavaType": "org.apache.camel.model.dataformat.GroovyXmlDataFormat" diff --git a/components/camel-groovy-xml/pom.xml b/components/camel-groovy-xml/pom.xml deleted file mode 100644 index 197238f1a399..000000000000 --- a/components/camel-groovy-xml/pom.xml +++ /dev/null @@ -1,84 +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</groupId> - <artifactId>components</artifactId> - <version>4.19.0-SNAPSHOT</version> - </parent> - - <artifactId>camel-groovy-xml</artifactId> - <packaging>jar</packaging> - - <name>Camel :: Groovy XML</name> - <description>Camel Groovy XML data format</description> - - <properties> - </properties> - - <dependencies> - - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.groovy</groupId> - <artifactId>groovy-xml</artifactId> - <version>${groovy-version}</version> - </dependency> - - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring-junit6</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jackson</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-main</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - <version>${hamcrest-version}</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/components/camel-groovy-xml/src/test/resources/log4j2.properties b/components/camel-groovy-xml/src/test/resources/log4j2.properties deleted file mode 100644 index 2679120e692d..000000000000 --- a/components/camel-groovy-xml/src/test/resources/log4j2.properties +++ /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. -## --------------------------------------------------------------------------- - -appender.file.type = File -appender.file.name = file -appender.file.fileName = target/camel-groovy-xml-test.log -appender.file.layout.type = PatternLayout -appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -appender.out.type = Console -appender.out.name = out -appender.out.layout.type = PatternLayout -appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n -logger.springframework.name = org.springframework -logger.springframework.level = WARN -rootLogger.level = INFO -rootLogger.appenderRef.file.ref = file diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml index 33c2c1491277..d4a49bfee4a6 100644 --- a/components/camel-groovy/pom.xml +++ b/components/camel-groovy/pom.xml @@ -50,6 +50,11 @@ <artifactId>groovy</artifactId> <version>${groovy-version}</version> </dependency> + <dependency> + <groupId>org.apache.groovy</groupId> + <artifactId>groovy-xml</artifactId> + <version>${groovy-version}</version> + </dependency> <!-- testing --> <dependency> @@ -68,6 +73,11 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jackson</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-main</artifactId> diff --git a/components/camel-groovy-xml/src/generated/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatConfigurer.java b/components/camel-groovy/src/generated/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatConfigurer.java similarity index 100% rename from components/camel-groovy-xml/src/generated/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatConfigurer.java rename to components/camel-groovy/src/generated/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatConfigurer.java diff --git a/components/camel-groovy-xml/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json b/components/camel-groovy/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json similarity index 97% rename from components/camel-groovy-xml/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json rename to components/camel-groovy/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json index 5567f8676542..66fb32ab5f0d 100644 --- a/components/camel-groovy-xml/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json +++ b/components/camel-groovy/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json @@ -10,7 +10,7 @@ "javaType": "org.apache.camel.groovy.xml.GroovyXmlDataFormat", "supportLevel": "Stable", "groupId": "org.apache.camel", - "artifactId": "camel-groovy-xml", + "artifactId": "camel-groovy", "version": "4.19.0-SNAPSHOT", "modelName": "groovyXml", "modelJavaType": "org.apache.camel.model.dataformat.GroovyXmlDataFormat" diff --git a/components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/configurer/groovyXml-dataformat b/components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/configurer/groovyXml-dataformat similarity index 100% rename from components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/configurer/groovyXml-dataformat rename to components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/configurer/groovyXml-dataformat diff --git a/components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties similarity index 54% rename from components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties rename to components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties index ac48bcdc0f62..768821ee4f0e 100644 --- a/components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties +++ b/components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties @@ -1,7 +1,7 @@ # Generated by camel build tools - do NOT edit this file! dataFormats=groovyXml groupId=org.apache.camel -artifactId=camel-groovy-xml +artifactId=camel-groovy version=4.19.0-SNAPSHOT -projectName=Camel :: Groovy XML -projectDescription=Camel Groovy XML data format +projectName=Camel :: Groovy +projectDescription=Camel Groovy support diff --git a/components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/dataformat/groovyXml b/components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/groovyXml similarity index 100% rename from components/camel-groovy-xml/src/generated/resources/META-INF/services/org/apache/camel/dataformat/groovyXml rename to components/camel-groovy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/groovyXml diff --git a/components/camel-groovy-xml/src/main/docs/groovyXml-dataformat.adoc b/components/camel-groovy/src/main/docs/groovyXml-dataformat.adoc similarity index 93% rename from components/camel-groovy-xml/src/main/docs/groovyXml-dataformat.adoc rename to components/camel-groovy/src/main/docs/groovyXml-dataformat.adoc index 5fd43f0cb180..0f324009ef7d 100644 --- a/components/camel-groovy-xml/src/main/docs/groovyXml-dataformat.adoc +++ b/components/camel-groovy/src/main/docs/groovyXml-dataformat.adoc @@ -1,13 +1,13 @@ = Groovy XML DataFormat :doctitle: Groovy XML :shortname: groovyXml -:artifactid: camel-groovy-xml +:artifactid: camel-groovy :description: Transform between XML and Groovy Node (Map structure) objects. :since: 4.15 :supportlevel: Stable :tabs-sync-option: //Manually maintained attributes -:camel-spring-boot-name: groovy-xml +:camel-spring-boot-name: groovy *Since Camel {since}* @@ -80,7 +80,7 @@ To convert back to XML you just use the opposite direction with _marshal_. == Dependencies To use the data format in your camel routes, you need to add -a dependency on *camel-groovy-xml* which implements this data format. +a dependency on *camel-groovy* which implements this data format. If you use maven, you could just add the following to your pom.xml, substituting the version number for the latest & greatest release (see @@ -90,7 +90,7 @@ the download page for the latest versions). ---------------------------------------- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> + <artifactId>camel-groovy</artifactId> <version>x.x.x</version> </dependency> ---------------------------------------- diff --git a/components/camel-groovy-xml/src/main/java/org/apache/camel/groovy/xml/GroovyXmlDataFormat.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/xml/GroovyXmlDataFormat.java similarity index 100% rename from components/camel-groovy-xml/src/main/java/org/apache/camel/groovy/xml/GroovyXmlDataFormat.java rename to components/camel-groovy/src/main/java/org/apache/camel/groovy/xml/GroovyXmlDataFormat.java diff --git a/components/camel-groovy-xml/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java b/components/camel-groovy/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java similarity index 100% rename from components/camel-groovy-xml/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java rename to components/camel-groovy/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java diff --git a/components/pom.xml b/components/pom.xml index 9f6119369ea4..e4e841bffe8d 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -151,7 +151,6 @@ <module>camel-grape</module> <module>camel-graphql</module> <module>camel-grok</module> - <module>camel-groovy-xml</module> <module>camel-grpc</module> <module>camel-gson</module> <module>camel-guava-eventbus</module> diff --git a/coverage/pom.xml b/coverage/pom.xml index a2ef9306a374..236c085e6bdf 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -1017,12 +1017,7 @@ <artifactId>camel-groovy</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId> <version>${project.version}</version> diff --git a/docs/components/modules/dataformats/examples/json/groovyXml.json b/docs/components/modules/dataformats/examples/json/groovyXml.json index a9be9ce2af62..cf9e7f90144d 120000 --- a/docs/components/modules/dataformats/examples/json/groovyXml.json +++ b/docs/components/modules/dataformats/examples/json/groovyXml.json @@ -1 +1 @@ -../../../../../../components/camel-groovy-xml/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json \ No newline at end of file +../../../../../../components/camel-groovy/src/generated/resources/META-INF/org/apache/camel/groovy/xml/groovyXml.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/pages/groovyXml-dataformat.adoc b/docs/components/modules/dataformats/pages/groovyXml-dataformat.adoc index 42c399c4f92c..5eedd367aedc 120000 --- a/docs/components/modules/dataformats/pages/groovyXml-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/groovyXml-dataformat.adoc @@ -1 +1 @@ -../../../../../components/camel-groovy-xml/src/main/docs/groovyXml-dataformat.adoc \ No newline at end of file +../../../../../components/camel-groovy/src/main/docs/groovyXml-dataformat.adoc \ No newline at end of file diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc index b09d70c7a458..51b448658839 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc @@ -231,6 +231,10 @@ The deprecated options `buildToool` and `gradleWrapper` has been removed. The `camel-tooling-maven` which is used for downloading JARs from Maven has been refactored to use the new https://github.com/maveniverse/mima[MIMA] project (jbang is using this also). +=== camel-groovy-xml + +The `camel-groovy-xml` has been moved into `camel-groovy` and this JAR is no longer shipped. +So if you use `camel-groovy-xml` then change the dependency to `camel-groovy`. === camel-kafka diff --git a/parent/pom.xml b/parent/pom.xml index 37cd47ca7806..c3ae79afd995 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1546,11 +1546,6 @@ <artifactId>camel-groovy</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-xml</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId>
