Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make camel-quarkus-xml-io work again after we broke it with camel-qua… #2432

Merged
merged 1 commit into from
Apr 1, 2021
Merged

Make camel-quarkus-xml-io work again after we broke it with camel-qua… #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions extensions-core/xml-io-dsl/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</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>
Expand Down
8 changes: 8 additions & 0 deletions ...yment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -27,4 +29,10 @@ public class XmlIoDslProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}

@BuildStep
CapabilityBuildItem capability() {
return new CapabilityBuildItem(CamelCapabilities.XML);
}

}
4 changes: 2 additions & 2 deletions extensions-core/xml-io-dsl/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion extensions-core/xml-io/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions ...nt/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -29,8 +27,4 @@ FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}

@BuildStep
CapabilityBuildItem capability() {
return new CapabilityBuildItem(CamelCapabilities.XML);
}
}
8 changes: 3 additions & 5 deletions extensions-core/xml-io/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -48,13 +50,9 @@
</dependencyManagement>

<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>

Expand Down
2 changes: 2 additions & 0 deletions extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion integration-tests/csimple/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down