This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new d13da7ce834 Camel-20439: move camel-cloudevent api to camel-api 
(#14160)
d13da7ce834 is described below

commit d13da7ce83453c025d8081803b6fd34927bd5de8
Author: Jono Morris <j...@apache.org>
AuthorDate: Thu May 16 23:58:11 2024 +1200

    Camel-20439: move camel-cloudevent api to camel-api (#14160)
    
    * CAMEL-20439 move camel-cloudevents api to camel-api
    
    * CAMEL-20439 update imports on component classes
    
    * CAMEL-20439 generated change
    
    * CAMEL-20439 remove camel-cloudevents from component poms
    
    * CAMEL-20439 add note to upgrade guide
---
 components/camel-aws/camel-aws-cloudtrail/pom.xml  |  8 --
 .../CloudtrailCloudEventDataTypeTransformer.java   |  4 +-
 components/camel-aws/camel-aws2-ddb/pom.xml        |  8 --
 .../Ddb2StreamCloudEventDataTypeTransformer.java   |  4 +-
 components/camel-aws/camel-aws2-kinesis/pom.xml    |  8 --
 .../KinesisCloudEventDataTypeTransformer.java      |  4 +-
 components/camel-aws/camel-aws2-s3/pom.xml         |  8 --
 .../AWS2S3CloudEventDataTypeTransformer.java       |  4 +-
 .../AWS2S3CloudEventDataTypeTransformerTest.java   |  2 +-
 .../transform/AWS2S3TransformCloudEventsTest.java  | 85 +++++++++-------------
 components/camel-aws/camel-aws2-sqs/pom.xml        |  8 --
 .../AWS2SQSCloudEventDataTypeTransformer.java      |  4 +-
 .../AWS2SQSCloudEventDataTypeTransformerTest.java  |  2 +-
 .../camel-azure/camel-azure-cosmosdb/pom.xml       |  8 --
 .../CosmosDbCloudEventDataTypeTransformer.java     |  4 +-
 .../camel-azure/camel-azure-eventhubs/pom.xml      |  8 --
 .../EventHubsCloudEventDataTypeTransformer.java    |  4 +-
 components/camel-azure/camel-azure-files/pom.xml   | 10 ---
 .../AzureFilesCloudEventDataTypeTransformer.java   |  4 +-
 .../camel-azure/camel-azure-servicebus/pom.xml     |  8 --
 .../ServicebusCloudEventDataTypeTransformer.java   |  4 +-
 .../camel-azure/camel-azure-storage-blob/pom.xml   |  8 --
 ...reStorageBlobCloudEventDataTypeTransformer.java |  4 +-
 ...orageBlobCloudEventDataTypeTransformerTest.java |  2 +-
 .../camel-azure-storage-datalake/pom.xml           |  9 ---
 .../DataLakeCloudEventDataTypeTransformer.java     |  4 +-
 .../camel-azure/camel-azure-storage-queue/pom.xml  |  8 --
 ...eStorageQueueCloudEventDataTypeTransformer.java |  4 +-
 .../cloudevents/CloudEventTypeConverterLoader.java |  2 +-
 .../cloudevents/CloudEventTypeConverter.java       |  2 +
 .../CloudEventHttpDataTypeTransformer.java         |  4 +-
 .../CloudEventJsonDataTypeTransformer.java         |  4 +-
 .../CloudEventHttpDataTypeTransformerTest.java     |  4 +-
 .../CloudEventJsonDataTypeTransformerTest.java     |  4 +-
 .../camel-google/camel-google-calendar/pom.xml     |  8 --
 ...alendarStreamCloudEventDataTypeTransformer.java |  4 +-
 components/camel-google/camel-google-mail/pom.xml  |  8 --
 ...gleMailStreamCloudEventDataTypeTransformer.java |  4 +-
 .../camel-google/camel-google-pubsub/pom.xml       |  8 --
 .../GooglePubsubCloudEventDataTypeTransformer.java |  4 +-
 .../camel-google/camel-google-sheets/pom.xml       |  8 --
 ...eSheetsStreamCloudEventDataTypeTransformer.java |  4 +-
 .../camel-google/camel-google-storage/pom.xml      |  8 --
 ...GoogleStorageCloudEventDataTypeTransformer.java |  4 +-
 ...leStorageCloudEventDataTypeTransformerTest.java |  2 +-
 components/camel-knative/camel-knative-api/pom.xml |  5 --
 .../knative/spi/KnativeTransportConfiguration.java |  2 +-
 .../component/knative/KnativeConfiguration.java    |  2 +-
 .../camel/component/knative/KnativeEndpoint.java   |  4 +-
 .../knative/ce/AbstractCloudEventProcessor.java    |  2 +-
 .../component/knative/ce/CloudEventProcessor.java  |  2 +-
 .../component/knative/ce/CloudEventProcessors.java |  4 +-
 .../component/knative/http/KnativeHttpSupport.java |  2 +-
 .../component/knative/http/KnativeHttpTest.java    |  4 +-
 .../knative/http/KnativeHttpTestSupport.java       |  2 +-
 components/camel-slack/pom.xml                     |  8 --
 .../SlackCloudEventDataTypeTransformer.java        |  4 +-
 .../org/apache/camel}/cloudevents/CloudEvent.java  |  2 +-
 .../camel}/cloudevents/CloudEventAttributes.java   |  4 +-
 .../org/apache/camel}/cloudevents/CloudEvents.java |  2 +-
 .../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc     |  3 +
 61 files changed, 106 insertions(+), 266 deletions(-)

diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml 
b/components/camel-aws/camel-aws-cloudtrail/pom.xml
index 74c87abfb0a..fd094a74132 100644
--- a/components/camel-aws/camel-aws-cloudtrail/pom.xml
+++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml
@@ -55,14 +55,6 @@
             <artifactId>camel-health</artifactId>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/transform/CloudtrailCloudEventDataTypeTransformer.java
 
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/transform/CloudtrailCloudEventDataTypeTransformer.java
index abc86e22363..3092db62bed 100644
--- 
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/transform/CloudtrailCloudEventDataTypeTransformer.java
+++ 
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/transform/CloudtrailCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.aws.cloudtrail.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.aws.cloudtrail.CloudtrailConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml 
b/components/camel-aws/camel-aws2-ddb/pom.xml
index 3834a97d64e..4fdaf5c332a 100644
--- a/components/camel-aws/camel-aws2-ddb/pom.xml
+++ b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -63,14 +63,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/transform/Ddb2StreamCloudEventDataTypeTransformer.java
 
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/transform/Ddb2StreamCloudEventDataTypeTransformer.java
index 8960169079c..29bce290e93 100644
--- 
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/transform/Ddb2StreamCloudEventDataTypeTransformer.java
+++ 
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/transform/Ddb2StreamCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.aws2.ddbstream.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.aws2.ddbstream.Ddb2StreamConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-aws/camel-aws2-kinesis/pom.xml 
b/components/camel-aws/camel-aws2-kinesis/pom.xml
index d0455e66972..df98642d84e 100644
--- a/components/camel-aws/camel-aws2-kinesis/pom.xml
+++ b/components/camel-aws/camel-aws2-kinesis/pom.xml
@@ -62,14 +62,6 @@
             <artifactId>camel-health</artifactId>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/transform/KinesisCloudEventDataTypeTransformer.java
 
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/transform/KinesisCloudEventDataTypeTransformer.java
index d85b36cf119..9818f5b8e68 100644
--- 
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/transform/KinesisCloudEventDataTypeTransformer.java
+++ 
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/transform/KinesisCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.aws2.kinesis.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.aws2.kinesis.Kinesis2Constants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-aws/camel-aws2-s3/pom.xml 
b/components/camel-aws/camel-aws2-s3/pom.xml
index 52122c84705..f6bdadef854 100644
--- a/components/camel-aws/camel-aws2-s3/pom.xml
+++ b/components/camel-aws/camel-aws2-s3/pom.xml
@@ -55,14 +55,6 @@
             <artifactId>camel-health</artifactId>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformer.java
 
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformer.java
index 6d8d632df94..650c557861a 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformer.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.aws2.s3.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.aws2.s3.AWS2S3Constants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformerTest.java
 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformerTest.java
index 89011c482ab..603af2181bf 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformerTest.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3CloudEventDataTypeTransformerTest.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.aws2.s3.AWS2S3Constants;
-import org.apache.camel.component.cloudevents.CloudEvent;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.TransformerKey;
 import org.apache.camel.spi.DataType;
diff --git 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3TransformCloudEventsTest.java
 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3TransformCloudEventsTest.java
index 4069f885e4a..9797b04272c 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3TransformCloudEventsTest.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/transform/AWS2S3TransformCloudEventsTest.java
@@ -16,67 +16,54 @@
  */
 package org.apache.camel.component.aws2.s3.transform;
 
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.aws2.s3.AWS2S3Constants;
 import org.apache.camel.component.aws2.s3.AWS2S3Operations;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.engine.TransformerKey;
+import org.apache.camel.spi.DataType;
+import org.apache.camel.spi.Transformer;
+import org.apache.camel.support.DefaultExchange;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class AWS2S3TransformCloudEventsTest extends CamelTestSupport {
-    protected MockEndpoint resultEndpoint;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-    @Test
-    public void testCloudEventDataTypeTransformation() throws Exception {
-        resultEndpoint.expectedBodiesReceived("Hello World!");
+public class AWS2S3TransformCloudEventsTest {
 
-        Exchange exchange = template.request("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) {
-                exchange.getMessage().setHeader(AWS2S3Constants.BUCKET_NAME, 
"mycamel");
-                exchange.getMessage().setHeader(AWS2S3Constants.KEY, 
"camel.txt");
-                exchange.getMessage().setHeader(AWS2S3Constants.S3_OPERATION, 
AWS2S3Operations.getObject);
-                exchange.getMessage().setBody("Hello");
-            }
-        });
+    private final DefaultCamelContext camelContext = new DefaultCamelContext();
 
-        resultEndpoint.assertIsSatisfied();
-        CloudEvent cloudEvent = CloudEvents.v1_0;
-        Message received = exchange.getMessage();
-        Assertions.assertEquals("org.apache.camel.event.aws.s3.getObject",
-                
received.getHeader(cloudEvent.mandatoryAttribute(CloudEvent.CAMEL_CLOUD_EVENT_TYPE).http()));
-        Assertions.assertEquals("aws.s3.bucket.mycamel",
-                
received.getHeader(cloudEvent.mandatoryAttribute(CloudEvent.CAMEL_CLOUD_EVENT_SOURCE).http()));
-        Assertions.assertEquals(cloudEvent.version(),
-                
received.getHeader(cloudEvent.mandatoryAttribute(CloudEvent.CAMEL_CLOUD_EVENT_VERSION).http()));
-        Assertions.assertEquals("Hello World!", received.getBody());
-    }
+    private final AWS2S3CloudEventDataTypeTransformer transformer = new 
AWS2S3CloudEventDataTypeTransformer();
 
-    @Override
-    @BeforeEach
-    public void setUp() throws Exception {
-        super.setUp();
+    @Test
+    void shouldMapToCloudEvent() {
+        Exchange exchange = new DefaultExchange(camelContext);
 
-        resultEndpoint = getMockEndpoint("mock:result");
+        exchange.getMessage().setHeader(AWS2S3Constants.BUCKET_NAME, 
"mycamel");
+        exchange.getMessage().setHeader(AWS2S3Constants.KEY, "camel.txt");
+        exchange.getMessage().setHeader(AWS2S3Constants.S3_OPERATION, 
AWS2S3Operations.getObject);
+        exchange.getMessage().setBody("Hello");
+
+        exchange.getMessage().setBody(new 
ByteArrayInputStream("Test1".getBytes(StandardCharsets.UTF_8)));
+        transformer.transform(exchange.getMessage(), DataType.ANY, 
DataType.ANY);
+
+        Assertions.assertTrue(exchange.getMessage().hasHeaders());
+        
Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey(AWS2S3Constants.BUCKET_NAME));
+        assertEquals("org.apache.camel.event.aws.s3.getObject",
+                
exchange.getMessage().getHeader(CloudEvent.CAMEL_CLOUD_EVENT_TYPE));
+        assertEquals("camel.txt", 
exchange.getMessage().getHeader(CloudEvent.CAMEL_CLOUD_EVENT_SUBJECT));
+        assertEquals("aws.s3.bucket.mycamel", 
exchange.getMessage().getHeader(CloudEvent.CAMEL_CLOUD_EVENT_SOURCE));
     }
 
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:start")
-                        .inputType("aws2-s3:application-cloudevents")
-                        .setBody(body().append(" World!"))
-                        .outputType("http:application-cloudevents")
-                        .to("mock:result");
-            }
-        };
+    @Test
+    public void shouldLookupDataTypeTransformer() throws Exception {
+        Transformer transformer = camelContext.getTransformerRegistry()
+                .resolveTransformer(new 
TransformerKey("aws2-s3:application-cloudevents"));
+        Assertions.assertNotNull(transformer);
+        Assertions.assertEquals(AWS2S3CloudEventDataTypeTransformer.class, 
transformer.getClass());
     }
 }
diff --git a/components/camel-aws/camel-aws2-sqs/pom.xml 
b/components/camel-aws/camel-aws2-sqs/pom.xml
index e1029a4afe9..1ff2f0c10c6 100644
--- a/components/camel-aws/camel-aws2-sqs/pom.xml
+++ b/components/camel-aws/camel-aws2-sqs/pom.xml
@@ -60,14 +60,6 @@
             <artifactId>camel-health</artifactId>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- test infra -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformer.java
 
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformer.java
index 9c3a225ede0..d45e7e8e2d3 100644
--- 
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformer.java
+++ 
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.aws2.sqs.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.aws2.sqs.Sqs2Constants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformerTest.java
 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformerTest.java
index 690823489eb..b1fcc14fb66 100644
--- 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformerTest.java
+++ 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/transform/AWS2SQSCloudEventDataTypeTransformerTest.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.aws2.sqs.Sqs2Constants;
-import org.apache.camel.component.cloudevents.CloudEvent;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.TransformerKey;
 import org.apache.camel.spi.DataType;
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml 
b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index 331c49ab2ca..d498ec0c0b9 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -58,14 +58,6 @@
             <version>${commons-io-version}</version>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/transform/CosmosDbCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/transform/CosmosDbCloudEventDataTypeTransformer.java
index c521972000d..aad4e177fd1 100644
--- 
a/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/transform/CosmosDbCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/transform/CosmosDbCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package org.apache.camel.component.azure.cosmosdb.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml 
b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 77c7d7431ad..6574597b953 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -62,14 +62,6 @@
             <version>${commons-io-version}</version>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/transform/EventHubsCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/transform/EventHubsCloudEventDataTypeTransformer.java
index c4e2e81deb9..1cc9805bbaa 100644
--- 
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/transform/EventHubsCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/transform/EventHubsCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.azure.eventhubs.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.azure.eventhubs.EventHubsConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-azure/camel-azure-files/pom.xml 
b/components/camel-azure/camel-azure-files/pom.xml
index c8cbcaa4b42..bf5de5856db 100644
--- a/components/camel-azure/camel-azure-files/pom.xml
+++ b/components/camel-azure/camel-azure-files/pom.xml
@@ -48,16 +48,6 @@
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
         </dependency>
-
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-junit5</artifactId>
diff --git 
a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/transform/AzureFilesCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/transform/AzureFilesCloudEventDataTypeTransformer.java
index 7b802e4e97b..298828e0cf9 100644
--- 
a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/transform/AzureFilesCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/transform/AzureFilesCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package org.apache.camel.component.file.azure.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.file.azure.FilesHeaders;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml 
b/components/camel-azure/camel-azure-servicebus/pom.xml
index d06b0d5171b..6e72f4a8bd4 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -51,14 +51,6 @@
             <artifactId>azure-identity</artifactId>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- extras -->
         <dependency>
             <groupId>commons-io</groupId>
diff --git 
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/transform/ServicebusCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/transform/ServicebusCloudEventDataTypeTransformer.java
index bf6254a4782..b8a3e0e397b 100644
--- 
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/transform/ServicebusCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/transform/ServicebusCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.azure.servicebus.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.azure.servicebus.ServiceBusConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml 
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index d69fcd7db0a..795a7dbcbcc 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -82,14 +82,6 @@
             <version>${commons-io-version}</version>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformer.java
index 4a477e5dfed..3d6a2d4912c 100644
--- 
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package 
org.apache.camel.component.azure.storage.blob.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.azure.storage.blob.BlobConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformerTest.java
 
b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformerTest.java
index dab5d003261..fcd051eb879 100644
--- 
a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformerTest.java
+++ 
b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/transform/AzureStorageBlobCloudEventDataTypeTransformerTest.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.azure.storage.blob.BlobConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.TransformerKey;
 import org.apache.camel.spi.DataType;
diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml 
b/components/camel-azure/camel-azure-storage-datalake/pom.xml
index ab9338c433e..83ca23bd18b 100644
--- a/components/camel-azure/camel-azure-storage-datalake/pom.xml
+++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml
@@ -53,16 +53,7 @@
             <version>${commons-io-version}</version>
         </dependency>
         
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- test dependencies -->
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-junit5</artifactId>
diff --git 
a/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/transform/DataLakeCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/transform/DataLakeCloudEventDataTypeTransformer.java
index 24f703da244..2907a0f579d 100644
--- 
a/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/transform/DataLakeCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/transform/DataLakeCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package 
org.apache.camel.component.azure.storage.datalake.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.azure.storage.datalake.DataLakeConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml 
b/components/camel-azure/camel-azure-storage-queue/pom.xml
index e112b27576f..99e7da8a93d 100644
--- a/components/camel-azure/camel-azure-storage-queue/pom.xml
+++ b/components/camel-azure/camel-azure-storage-queue/pom.xml
@@ -78,14 +78,6 @@
             <version>${commons-io-version}</version>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/transform/AzureStorageQueueCloudEventDataTypeTransformer.java
 
b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/transform/AzureStorageQueueCloudEventDataTypeTransformer.java
index ecaa380ef56..4881a7735a5 100644
--- 
a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/transform/AzureStorageQueueCloudEventDataTypeTransformer.java
+++ 
b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/transform/AzureStorageQueueCloudEventDataTypeTransformer.java
@@ -20,9 +20,9 @@ package 
org.apache.camel.component.azure.storage.queue.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.azure.storage.queue.QueueConstants;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-cloudevents/src/generated/java/org/apache/camel/component/cloudevents/CloudEventTypeConverterLoader.java
 
b/components/camel-cloudevents/src/generated/java/org/apache/camel/component/cloudevents/CloudEventTypeConverterLoader.java
index 1e73b9718e0..125c7e413b3 100644
--- 
a/components/camel-cloudevents/src/generated/java/org/apache/camel/component/cloudevents/CloudEventTypeConverterLoader.java
+++ 
b/components/camel-cloudevents/src/generated/java/org/apache/camel/component/cloudevents/CloudEventTypeConverterLoader.java
@@ -44,7 +44,7 @@ public final class CloudEventTypeConverterLoader implements 
TypeConverterLoader,
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, 
org.apache.camel.component.cloudevents.CloudEvent.class, 
java.lang.String.class, false,
+        addTypeConverter(registry, 
org.apache.camel.cloudevents.CloudEvent.class, java.lang.String.class, false,
             (type, exchange, value) -> 
org.apache.camel.component.cloudevents.CloudEventTypeConverter.fromSpecVersion((java.lang.String)
 value));
     }
 
diff --git 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventTypeConverter.java
 
b/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventTypeConverter.java
index 18987445078..e897d7b6b7e 100644
--- 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventTypeConverter.java
+++ 
b/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventTypeConverter.java
@@ -17,6 +17,8 @@
 package org.apache.camel.component.cloudevents;
 
 import org.apache.camel.Converter;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 
 @Converter(generateLoader = true)
 public final class CloudEventTypeConverter {
diff --git 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformer.java
 
b/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformer.java
index 8ff75f6567b..b7117768010 100644
--- 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformer.java
+++ 
b/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformer.java
@@ -21,8 +21,8 @@ import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformer.java
 
b/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformer.java
index 2e7cc8a07a7..d18ee6782ef 100644
--- 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformer.java
+++ 
b/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformer.java
@@ -22,8 +22,8 @@ import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformerTest.java
 
b/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformerTest.java
index d4a864a7f6a..433c419b0ff 100644
--- 
a/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformerTest.java
+++ 
b/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventHttpDataTypeTransformerTest.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.TransformerKey;
 import org.apache.camel.spi.DataType;
diff --git 
a/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java
 
b/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java
index 02b223e10a1..f9a333a51eb 100644
--- 
a/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java
+++ 
b/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.TransformerKey;
 import org.apache.camel.spi.DataType;
diff --git a/components/camel-google/camel-google-calendar/pom.xml 
b/components/camel-google/camel-google-calendar/pom.xml
index d3f342efaa0..6aa79a5c675 100644
--- a/components/camel-google/camel-google-calendar/pom.xml
+++ b/components/camel-google/camel-google-calendar/pom.xml
@@ -130,14 +130,6 @@
             <version>${google-oauth-client-version}</version>
         </dependency>
         
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/transform/GoogleCalendarStreamCloudEventDataTypeTransformer.java
 
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/transform/GoogleCalendarStreamCloudEventDataTypeTransformer.java
index b797ed6156f..e6a65c5db56 100644
--- 
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/transform/GoogleCalendarStreamCloudEventDataTypeTransformer.java
+++ 
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/transform/GoogleCalendarStreamCloudEventDataTypeTransformer.java
@@ -21,8 +21,8 @@ import java.util.Map;
 
 import com.google.api.services.calendar.model.Event;
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import 
org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConstants;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
diff --git a/components/camel-google/camel-google-mail/pom.xml 
b/components/camel-google/camel-google-mail/pom.xml
index 4596a534d30..5ca2bff63b1 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -139,14 +139,6 @@
             <version>${angus-mail-version}</version>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/transform/GoogleMailStreamCloudEventDataTypeTransformer.java
 
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/transform/GoogleMailStreamCloudEventDataTypeTransformer.java
index fd4025b7c5c..750aba620c3 100644
--- 
a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/transform/GoogleMailStreamCloudEventDataTypeTransformer.java
+++ 
b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/transform/GoogleMailStreamCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package 
org.apache.camel.component.google.mail.stream.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
diff --git a/components/camel-google/camel-google-pubsub/pom.xml 
b/components/camel-google/camel-google-pubsub/pom.xml
index a871ce69c7a..319d1cf2460 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -74,14 +74,6 @@
             </exclusions>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-junit5</artifactId>
diff --git 
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/transform/GooglePubsubCloudEventDataTypeTransformer.java
 
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/transform/GooglePubsubCloudEventDataTypeTransformer.java
index 2c455f5c76e..ec10a545745 100644
--- 
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/transform/GooglePubsubCloudEventDataTypeTransformer.java
+++ 
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/transform/GooglePubsubCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package org.apache.camel.component.google.pubsub.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.google.pubsub.GooglePubsubConstants;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
diff --git a/components/camel-google/camel-google-sheets/pom.xml 
b/components/camel-google/camel-google-sheets/pom.xml
index 6c013e971df..63e0bc515ad 100644
--- a/components/camel-google/camel-google-sheets/pom.xml
+++ b/components/camel-google/camel-google-sheets/pom.xml
@@ -137,14 +137,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsStreamCloudEventDataTypeTransformer.java
 
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsStreamCloudEventDataTypeTransformer.java
index d94798eda6e..cb4f28eebb1 100644
--- 
a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsStreamCloudEventDataTypeTransformer.java
+++ 
b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/transform/GoogleSheetsStreamCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package org.apache.camel.component.google.sheets.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import 
org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
diff --git a/components/camel-google/camel-google-storage/pom.xml 
b/components/camel-google/camel-google-storage/pom.xml
index 43601c5b493..aa12bebad41 100644
--- a/components/camel-google/camel-google-storage/pom.xml
+++ b/components/camel-google/camel-google-storage/pom.xml
@@ -67,14 +67,6 @@
             </exclusions>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformer.java
 
b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformer.java
index 869cac0b768..04703d8c098 100644
--- 
a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformer.java
+++ 
b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package org.apache.camel.component.google.storage.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.google.storage.GoogleCloudStorageConstants;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
diff --git 
a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformerTest.java
 
b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformerTest.java
index edea923f798..37f7b0a1cc9 100644
--- 
a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformerTest.java
+++ 
b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/transform/GoogleStorageCloudEventDataTypeTransformerTest.java
@@ -21,7 +21,7 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.google.storage.GoogleCloudStorageConstants;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.TransformerKey;
diff --git a/components/camel-knative/camel-knative-api/pom.xml 
b/components/camel-knative/camel-knative-api/pom.xml
index c2d9c90685e..a7b2c9c0a87 100644
--- a/components/camel-knative/camel-knative-api/pom.xml
+++ b/components/camel-knative/camel-knative-api/pom.xml
@@ -44,11 +44,6 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-support</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git 
a/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java
 
b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java
index 0c9368d35b3..58b2257786e 100644
--- 
a/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java
+++ 
b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.knative.spi;
 
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
 
 public final class KnativeTransportConfiguration {
 
diff --git 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
index f9a86aea21f..5558b987110 100644
--- 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
+++ 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.knative.spi.KnativeEnvironment;
 import org.apache.camel.component.knative.spi.KnativeSinkBinding;
 import org.apache.camel.spi.UriParam;
diff --git 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
index cf845f09cfe..70f58aa359b 100644
--- 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
+++ 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
@@ -29,8 +29,8 @@ import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.knative.ce.CloudEventProcessor;
 import org.apache.camel.component.knative.ce.CloudEventProcessors;
 import org.apache.camel.component.knative.spi.Knative;
diff --git 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
index 2c9fee8985a..da0defc29af 100644
--- 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
+++ 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
@@ -25,7 +25,7 @@ import java.util.function.Supplier;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.knative.KnativeEndpoint;
 import org.apache.camel.component.knative.spi.Knative;
 import org.apache.camel.component.knative.spi.KnativeResource;
diff --git 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java
 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java
index 8a960852bf4..8963cc0db22 100644
--- 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java
+++ 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.knative.ce;
 
 import org.apache.camel.Processor;
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.knative.KnativeEndpoint;
 import org.apache.camel.component.knative.spi.KnativeResource;
 
diff --git 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java
 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java
index b909da37ef0..7ee1e20859f 100644
--- 
a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java
+++ 
b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java
@@ -23,8 +23,8 @@ import java.util.Objects;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.knative.KnativeEndpoint;
 import org.apache.camel.component.knative.spi.KnativeResource;
 
diff --git 
a/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java
 
b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java
index 3d0af7c4411..c72c8c52591 100644
--- 
a/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java
+++ 
b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java
@@ -28,7 +28,7 @@ import io.vertx.core.http.HttpServerRequest;
 import io.vertx.ext.web.Router;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.knative.spi.KnativeResource;
 import org.apache.camel.support.CamelContextHelper;
 
diff --git 
a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
 
b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
index e5e5b20bbed..328197bd8ad 100644
--- 
a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
+++ 
b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
@@ -33,8 +33,8 @@ import org.apache.camel.FailedToStartRouteException;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.component.knative.KnativeComponent;
 import org.apache.camel.component.knative.KnativeEndpoint;
 import org.apache.camel.component.knative.spi.Knative;
diff --git 
a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java
 
b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java
index c5c8a33c1a0..b37f3ca9d75 100644
--- 
a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java
+++ 
b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
 import org.apache.camel.component.knative.KnativeComponent;
 import org.apache.camel.component.knative.spi.KnativeEnvironment;
 import org.apache.camel.component.knative.spi.KnativeResource;
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 0146f7f3250..c69ec93686b 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -60,14 +60,6 @@
             <version>${squareup-okhttp-version}</version>
         </dependency>
 
-        <!-- optional CloudEvent support -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-cloudevents</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/transform/SlackCloudEventDataTypeTransformer.java
 
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/transform/SlackCloudEventDataTypeTransformer.java
index 49e07c5802b..56ee4b73703 100644
--- 
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/transform/SlackCloudEventDataTypeTransformer.java
+++ 
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/transform/SlackCloudEventDataTypeTransformer.java
@@ -20,8 +20,8 @@ package org.apache.camel.component.slack.transform;
 import java.util.Map;
 
 import org.apache.camel.Message;
-import org.apache.camel.component.cloudevents.CloudEvent;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvents;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.DataTypeTransformer;
 import org.apache.camel.spi.Transformer;
diff --git 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEvent.java
 b/core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEvent.java
similarity index 98%
rename from 
components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEvent.java
rename to 
core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEvent.java
index 5509a50ccfc..f89dc43fd54 100644
--- 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEvent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEvent.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cloudevents;
+package org.apache.camel.cloudevents;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
diff --git 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventAttributes.java
 
b/core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEventAttributes.java
similarity index 95%
rename from 
components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventAttributes.java
rename to 
core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEventAttributes.java
index bb05e07c13c..dbf40091267 100644
--- 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEventAttributes.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEventAttributes.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cloudevents;
+package org.apache.camel.cloudevents;
 
 import java.util.Arrays;
 import java.util.Collection;
 
 /**
- * Attributes for cloud even specs
+ * Attributes for cloud event specs.
  */
 final class CloudEventAttributes {
 
diff --git 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEvents.java
 b/core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEvents.java
similarity index 98%
rename from 
components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEvents.java
rename to 
core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEvents.java
index 9968b8ca879..6bf8aa46a50 100644
--- 
a/components/camel-cloudevents/src/main/java/org/apache/camel/component/cloudevents/CloudEvents.java
+++ b/core/camel-api/src/main/java/org/apache/camel/cloudevents/CloudEvents.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cloudevents;
+package org.apache.camel.cloudevents;
 
 import java.util.Collection;
 import java.util.Objects;
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
index 8d6c3bc79db..995b4c0b44f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
@@ -110,6 +110,9 @@ See the 
https://docs.spring.io/spring-security/reference/5.8/migration/servlet/a
 The `camel-as2` component has been updated so that the client can compress a 
MIME body before signing or compress a MIME body before signing and encrypting 
as described in
 sections https://datatracker.ietf.org/doc/html/rfc5402/#section-3.2[3.2] and 
https://datatracker.ietf.org/doc/html/rfc5402/#section-3.5[3.5] of 
https://datatracker.ietf.org/doc/html/rfc5402/[rfc 5402].
 
+=== camel-cloudevents
+
+Moved the `camel-cloudevents` api into `camel-api` and removed the 
`camel-cloudevents` dependency from all components that provide CloudEvent 
transformers.
 
 === Camel Spring Boot
 

Reply via email to