Merge remote-tracking branch 'upstream/main'

apache · Sep 26, 2023 · 179988f · 179988f
2 parents c58e1ba + 379cf59
commit 179988f
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,7 @@
 
 ## [Unreleased](https://github.com/apache/camel-kafka-connector/tree/HEAD)
 
-[Full Changelog](https://github.com/apache/camel-kafka-connector/compare/camel-kafka-connector-3.21.0...HEAD)
-
-**Closed issues:**
-
-- How to create an object in s3 bucket using camle-minio-sink plugin [\#1560](https://github.com/apache/camel-kafka-connector/issues/1560)
-- camel-minio-sink-connector giving library issue [\#1557](https://github.com/apache/camel-kafka-connector/issues/1557)
-- SNS Sink Connector failure - java.lang.NoClassDefFoundError: software/amazon/awssdk/utils/cache/CachedSupplier$StaleValueBehavior [\#1548](https://github.com/apache/camel-kafka-connector/issues/1548)
-- syslog connector failure [\#1528](https://github.com/apache/camel-kafka-connector/issues/1528)
+[Full Changelog](https://github.com/apache/camel-kafka-connector/compare/camel-kafka-connector-4.0.0...HEAD)
 
 **Merged pull requests:**
 
@@ -408,6 +401,17 @@
 - Minor changes to docs - correct the camel-log and camel-timer properties file names, verbiage change on untar/unzip section. [\#639](https://github.com/apache/camel-kafka-connector/pull/639) ([cunningt](https://github.com/cunningt))
 - Decouple the Elasticsearch client from the service to simplify moving the services to Camel core [\#638](https://github.com/apache/camel-kafka-connector/pull/638) ([orpiske](https://github.com/orpiske))
 
+## [camel-kafka-connector-4.0.0](https://github.com/apache/camel-kafka-connector/tree/camel-kafka-connector-4.0.0) (2023-09-21)
+
+[Full Changelog](https://github.com/apache/camel-kafka-connector/compare/camel-kafka-connector-3.21.0...camel-kafka-connector-4.0.0)
+
+**Closed issues:**
+
+- How to create an object in s3 bucket using camle-minio-sink plugin [\#1560](https://github.com/apache/camel-kafka-connector/issues/1560)
+- camel-minio-sink-connector giving library issue [\#1557](https://github.com/apache/camel-kafka-connector/issues/1557)
+- SNS Sink Connector failure - java.lang.NoClassDefFoundError: software/amazon/awssdk/utils/cache/CachedSupplier$StaleValueBehavior [\#1548](https://github.com/apache/camel-kafka-connector/issues/1548)
+- syslog connector failure [\#1528](https://github.com/apache/camel-kafka-connector/issues/1528)
+
 ## [camel-kafka-connector-3.21.0](https://github.com/apache/camel-kafka-connector/tree/camel-kafka-connector-3.21.0) (2023-08-25)
 
 [Full Changelog](https://github.com/apache/camel-kafka-connector/compare/camel-kafka-connector-3.20.6...camel-kafka-connector-3.21.0)

diff --git a/connectors/camel-mongodb-changes-stream-source-kafka-connector/pom.xml b/connectors/camel-mongodb-changes-stream-source-kafka-connector/pom.xml
@@ -41,15 +41,15 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-mongodb</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kamelets</groupId>
       <artifactId>camel-kamelets-utils</artifactId>
       <version>4.0.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mongodb</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>

diff --git a/connectors/camel-mongodb-source-kafka-connector/pom.xml b/connectors/camel-mongodb-source-kafka-connector/pom.xml
@@ -41,15 +41,15 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-mongodb</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kamelets</groupId>
       <artifactId>camel-kamelets-utils</artifactId>
       <version>4.0.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mongodb</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>

diff --git a/connectors/pom.xml b/connectors/pom.xml
@@ -185,7 +185,7 @@
                 <artifactId>camel-kafka-connector-docs-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <configuration>
-                    <lastReleasedVersion>3.18.2</lastReleasedVersion>
+                    <lastReleasedVersion>3.20.6</lastReleasedVersion>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/docs/antora.yml b/docs/antora.yml
@@ -30,9 +30,9 @@ asciidoc:
   attributes:
     requires: "'util=camel-website-util,ckc=xref:js/ckc.js'"
     prerelease: true
-    camel-version: 3.19.0-SNAPSHOT
+    camel-version: 4.0.0
     camel-docs-version: next
-    camel-kamelets-version: 0.9.1
-    camel-kamelets-docs-version: 0.9.x
+    camel-kamelets-version: 4.0.0
+    camel-kamelets-docs-version: 4.0.x
     kafka-version: 2.8.0
     kafka-docs-version: 28