You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2021/04/01 15:31:17 UTC
[camel-quarkus] branch master updated: Make camel-quarkus-xml-io
work again after we broke it with camel-quarkus-xml-io-dsl in 1.8.0 #2431
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new abebf5b Make camel-quarkus-xml-io work again after we broke it with camel-quarkus-xml-io-dsl in 1.8.0 #2431
abebf5b is described below
commit abebf5b8ebb298e7eb3d318cf2bb0296b543c98c
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Apr 1 13:35:43 2021 +0200
Make camel-quarkus-xml-io work again after we broke it with camel-quarkus-xml-io-dsl in 1.8.0 #2431
---
extensions-core/xml-io-dsl/deployment/pom.xml | 4 ----
.../camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java | 8 ++++++++
extensions-core/xml-io-dsl/runtime/pom.xml | 4 ++--
extensions-core/xml-io/deployment/pom.xml | 2 +-
.../camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java | 6 ------
extensions-core/xml-io/runtime/pom.xml | 8 +++-----
.../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 ++
integration-tests/csimple/pom.xml | 2 +-
8 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/extensions-core/xml-io-dsl/deployment/pom.xml b/extensions-core/xml-io-dsl/deployment/pom.xml
index ce3c946..cc3c5bc 100644
--- a/extensions-core/xml-io-dsl/deployment/pom.xml
+++ b/extensions-core/xml-io-dsl/deployment/pom.xml
@@ -36,10 +36,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-io-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-xml-io-dsl</artifactId>
</dependency>
</dependencies>
diff --git a/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java b/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
index 1ef7a72..cbe00a6 100644
--- a/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
+++ b/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
@@ -18,7 +18,9 @@
package org.apache.camel.quarkus.dsl.xml.io.deployment;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import org.apache.camel.quarkus.support.common.CamelCapabilities;
public class XmlIoDslProcessor {
private static final String FEATURE = "camel-xml-io-dsl";
@@ -27,4 +29,10 @@ public class XmlIoDslProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ @BuildStep
+ CapabilityBuildItem capability() {
+ return new CapabilityBuildItem(CamelCapabilities.XML);
+ }
+
}
diff --git a/extensions-core/xml-io-dsl/runtime/pom.xml b/extensions-core/xml-io-dsl/runtime/pom.xml
index 1c155d3..1359efd 100644
--- a/extensions-core/xml-io-dsl/runtime/pom.xml
+++ b/extensions-core/xml-io-dsl/runtime/pom.xml
@@ -53,8 +53,8 @@
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-io</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions-core/xml-io/deployment/pom.xml b/extensions-core/xml-io/deployment/pom.xml
index ac9e090..bf37d7a 100644
--- a/extensions-core/xml-io/deployment/pom.xml
+++ b/extensions-core/xml-io/deployment/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-deployment</artifactId>
+ <artifactId>camel-quarkus-xml-io-dsl-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
index 2c22dbe..7da290d 100644
--- a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
+++ b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.component.xml.io.deployment;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlIoProcessor {
private static final String FEATURE = "camel-xml-io";
@@ -29,8 +27,4 @@ class XmlIoProcessor {
return new FeatureBuildItem(FEATURE);
}
- @BuildStep
- CapabilityBuildItem capability() {
- return new CapabilityBuildItem(CamelCapabilities.XML);
- }
}
diff --git a/extensions-core/xml-io/runtime/pom.xml b/extensions-core/xml-io/runtime/pom.xml
index fb6b301..57ad886 100644
--- a/extensions-core/xml-io/runtime/pom.xml
+++ b/extensions-core/xml-io/runtime/pom.xml
@@ -33,6 +33,8 @@
<properties>
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
<camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince>
+ <quarkus.metadata.deprecated>true</quarkus.metadata.deprecated>
+ <quarkus.metadata.unlisted>true</quarkus.metadata.unlisted>
</properties>
<dependencyManagement>
@@ -49,12 +51,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xml-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
+ <artifactId>camel-quarkus-xml-io-dsl</artifactId>
</dependency>
</dependencies>
diff --git a/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 5d8c04f..d9b3f97 100644
--- a/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,8 +24,10 @@
name: "Camel XML IO"
description: "An XML stack for parsing XML route definitions. A fast an light weight alternative to camel-quarkus-xml-jaxp"
metadata:
+ unlisted: true
guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/xml-io.html"
categories:
- "integration"
status:
- "stable"
+ - "deprecated"
\ No newline at end of file
diff --git a/integration-tests/csimple/pom.xml b/integration-tests/csimple/pom.xml
index c6cccee..7dd1781 100644
--- a/integration-tests/csimple/pom.xml
+++ b/integration-tests/csimple/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-io-dsl</artifactId>
+ <artifactId>camel-quarkus-xml-io</artifactId><!-- test that camel-quarkus-xml-io still works -->
</dependency>
<!-- test dependencies -->