You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/03/12 15:55:46 UTC
(camel-quarkus) branch main updated: Exclude CloudEvents transformer services unless camel-quarkus-cloudevents is on the classpath
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 bd592a114f Exclude CloudEvents transformer services unless camel-quarkus-cloudevents is on the classpath
bd592a114f is described below
commit bd592a114f4e6d708cd6c914e102410b06386cb1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Mar 12 09:47:52 2024 +0000
Exclude CloudEvents transformer services unless camel-quarkus-cloudevents is on the classpath
Fixes #5853
---
.../camel/quarkus/core/deployment/CamelProcessor.java | 14 ++++++++++++++
.../org/apache/camel/quarkus/core/CamelCapabilities.java | 1 +
extensions/aws2-s3/deployment/pom.xml | 4 ----
extensions/aws2-s3/runtime/pom.xml | 4 ----
extensions/aws2-sqs/deployment/pom.xml | 4 ----
extensions/aws2-sqs/runtime/pom.xml | 4 ----
extensions/azure-storage-blob/deployment/pom.xml | 4 ----
extensions/azure-storage-blob/runtime/pom.xml | 4 ----
extensions/azure-storage-queue/deployment/pom.xml | 4 ----
extensions/azure-storage-queue/runtime/pom.xml | 4 ----
extensions/cloudevents/runtime/pom.xml | 5 +++++
extensions/google-storage/deployment/pom.xml | 4 ----
extensions/google-storage/runtime/pom.xml | 4 ----
13 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index 97a0be5c89..cec76d1c94 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -84,6 +84,8 @@ import org.jboss.jandex.Type;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.quarkus.core.CamelCapabilities.CLOUD_EVENTS;
+
class CamelProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(CamelProcessor.class);
@@ -206,6 +208,18 @@ class CamelProcessor {
list)));
}
+ @BuildStep
+ CamelServicePatternBuildItem conditionalCloudEventsTransformerServiceExcludePattern(Capabilities capabilities) {
+ // Exclude cloudevents transformers unless optional camel-quarkus-cloudevents is present
+ if (capabilities.isMissing(CLOUD_EVENTS)) {
+ return new CamelServicePatternBuildItem(
+ CamelServiceDestination.DISCOVERY,
+ false,
+ "META-INF/services/org/apache/camel/transformer/*cloudevents*");
+ }
+ return null;
+ }
+
@BuildStep
void camelServices(
ApplicationArchivesBuildItem applicationArchives,
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
index 8a873e865c..aeb6e7389e 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelCapabilities.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.core;
public final class CamelCapabilities {
public static final String BEAN = "org.apache.camel.bean";
+ public static final String CLOUD_EVENTS = "org.apache.camel.cloudevents";
public static final String CORE = "org.apache.camel";
public static final String XML = "org.apache.camel.xml";
public static final String XML_IO_DSL = "org.apache.camel.xml.io.dsl";
diff --git a/extensions/aws2-s3/deployment/pom.xml b/extensions/aws2-s3/deployment/pom.xml
index 8a48305194..d92ed4ec74 100644
--- a/extensions/aws2-s3/deployment/pom.xml
+++ b/extensions/aws2-s3/deployment/pom.xml
@@ -46,10 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-aws2-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents-deployment</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws2-s3/runtime/pom.xml b/extensions/aws2-s3/runtime/pom.xml
index 2c8281d94c..edb44fea4a 100644
--- a/extensions/aws2-s3/runtime/pom.xml
+++ b/extensions/aws2-s3/runtime/pom.xml
@@ -50,10 +50,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-aws2</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents</artifactId>
- </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxp</artifactId>
diff --git a/extensions/aws2-sqs/deployment/pom.xml b/extensions/aws2-sqs/deployment/pom.xml
index 074d599ee2..0dbc096882 100644
--- a/extensions/aws2-sqs/deployment/pom.xml
+++ b/extensions/aws2-sqs/deployment/pom.xml
@@ -46,10 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-aws2-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents-deployment</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws2-sqs/runtime/pom.xml b/extensions/aws2-sqs/runtime/pom.xml
index eb53c4ed59..a359418c18 100644
--- a/extensions/aws2-sqs/runtime/pom.xml
+++ b/extensions/aws2-sqs/runtime/pom.xml
@@ -50,10 +50,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-aws2</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents</artifactId>
- </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxp</artifactId>
diff --git a/extensions/azure-storage-blob/deployment/pom.xml b/extensions/azure-storage-blob/deployment/pom.xml
index 954c309b20..b784ccb236 100644
--- a/extensions/azure-storage-blob/deployment/pom.xml
+++ b/extensions/azure-storage-blob/deployment/pom.xml
@@ -38,10 +38,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-azure-core-http-client-vertx-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents-deployment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-blob</artifactId>
diff --git a/extensions/azure-storage-blob/runtime/pom.xml b/extensions/azure-storage-blob/runtime/pom.xml
index cd710daf85..3a8c3b3cb6 100644
--- a/extensions/azure-storage-blob/runtime/pom.xml
+++ b/extensions/azure-storage-blob/runtime/pom.xml
@@ -44,10 +44,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-azure-core-http-client-vertx</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-blob</artifactId>
diff --git a/extensions/azure-storage-queue/deployment/pom.xml b/extensions/azure-storage-queue/deployment/pom.xml
index 138abe92ea..265c766296 100644
--- a/extensions/azure-storage-queue/deployment/pom.xml
+++ b/extensions/azure-storage-queue/deployment/pom.xml
@@ -38,10 +38,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-azure-core-http-client-vertx-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents-deployment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue</artifactId>
diff --git a/extensions/azure-storage-queue/runtime/pom.xml b/extensions/azure-storage-queue/runtime/pom.xml
index 13ed5c6abb..c28c4a7ae0 100644
--- a/extensions/azure-storage-queue/runtime/pom.xml
+++ b/extensions/azure-storage-queue/runtime/pom.xml
@@ -44,10 +44,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-azure-core-http-client-vertx</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-queue</artifactId>
diff --git a/extensions/cloudevents/runtime/pom.xml b/extensions/cloudevents/runtime/pom.xml
index 1bfc56446a..008cbca2c4 100644
--- a/extensions/cloudevents/runtime/pom.xml
+++ b/extensions/cloudevents/runtime/pom.xml
@@ -51,6 +51,11 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-maven-plugin</artifactId>
+ <configuration>
+ <capabilities>
+ <provides>org.apache.camel.cloudevents</provides>
+ </capabilities>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/extensions/google-storage/deployment/pom.xml b/extensions/google-storage/deployment/pom.xml
index dd2b24a7c6..7b626343d2 100644
--- a/extensions/google-storage/deployment/pom.xml
+++ b/extensions/google-storage/deployment/pom.xml
@@ -38,10 +38,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-google-cloud-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents-deployment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-google-storage</artifactId>
diff --git a/extensions/google-storage/runtime/pom.xml b/extensions/google-storage/runtime/pom.xml
index a094d0f28f..7881519b3d 100644
--- a/extensions/google-storage/runtime/pom.xml
+++ b/extensions/google-storage/runtime/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-storage</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-cloudevents</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j2-jboss-logmanager</artifactId>