Updated kamelet catalog

apache · Sep 12, 2023 · 8120aa5 · 8120aa5
1 parent b20f83a
commit 8120aa5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 268 deletions.
diff --git a/connectors/pom.xml b/connectors/pom.xml
@@ -109,10 +109,7 @@
                     <!-- WARNING: connectors not in catalog will be removed -->
                     <removeMissingComponents>true</removeMissingComponents>
                     <excludedKamelets>
-                        <!-- XXX: remove datalake exclusions after https://github.com/apache/camel-kamelets/issues/1597  is released -->
                         <param>ms-exchange-online-imap-oauth-source</param>
-                        <param>azure-storage-datalake-sink</param>
-                        <param>azure-storage-datalake-source</param>
                     </excludedKamelets>
                     <excludedComponents>
                         <param>bonita</param>
@@ -240,6 +237,8 @@
         <module>camel-azure-storage-blob-changefeed-source-kafka-connector</module>
         <module>camel-azure-storage-blob-sink-kafka-connector</module>
         <module>camel-azure-storage-blob-source-kafka-connector</module>
+        <module>camel-azure-storage-datalake-sink-kafka-connector</module>
+        <module>camel-azure-storage-datalake-source-kafka-connector</module>
         <module>camel-azure-storage-queue-sink-kafka-connector</module>
         <module>camel-azure-storage-queue-source-kafka-connector</module>
         <module>camel-beer-source-kafka-connector</module>
@@ -335,6 +334,8 @@
         <module>camel-nats-source-kafka-connector</module>
         <module>camel-netty-http-kafka-connector</module>
         <module>camel-netty-kafka-connector</module>
+        <module>camel-opensearch-index-sink-kafka-connector</module>
+        <module>camel-opensearch-search-source-kafka-connector</module>
         <module>camel-oracle-database-sink-kafka-connector</module>
         <module>camel-oracle-database-source-kafka-connector</module>
         <module>camel-postgresql-sink-kafka-connector</module>
@@ -344,6 +345,7 @@
         <module>camel-redis-sink-kafka-connector</module>
         <module>camel-redis-source-kafka-connector</module>
         <module>camel-rest-openapi-sink-kafka-connector</module>
+        <module>camel-salesforce-composite-upsert-sink-kafka-connector</module>
         <module>camel-salesforce-create-sink-kafka-connector</module>
         <module>camel-salesforce-delete-sink-kafka-connector</module>
         <module>camel-salesforce-source-kafka-connector</module>

diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -29,7 +29,7 @@
 
         <kafka.version>3.4.1</kafka.version>
         <camel.version>4.0.0</camel.version>
-        <camel.kamelet.catalog.version>4.0.0-RC1</camel.kamelet.catalog.version>
+        <camel.kamelet.catalog.version>4.0.0</camel.kamelet.catalog.version>
         <apicurio.registry.version>1.3.2.Final</apicurio.registry.version>
         <resteasy.version>4.5.6.Final</resteasy.version>
         <version.java>17</version.java>

diff --git a/tests/itests-mongodb/pom.xml b/tests/itests-mongodb/pom.xml
@@ -59,7 +59,6 @@
             <artifactId>camel-mongodb</artifactId>
         </dependency>
 
-        <!-- XXX: remove when https://github.com/apache/camel-kamelets/issues/1602 is released -->
         <dependency>
             <groupId>org.apache.camel.kamelets</groupId>
             <artifactId>camel-kamelets-utils</artifactId>

diff --git a/...main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java b/...main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
@@ -565,7 +565,7 @@ private void addConnectorOptions(String sanitizedName, ConnectorType ct, JavaCla
         String replacement = "$1_";
 
         String propertyPrefix = "CAMEL_" + ct + "_" + sanitizedName.replace("-", "").toUpperCase() + "_" + propertyQualifier.toUpperCase() + "_"
-                                + StringUtils.capitalize(propertyName).replaceAll(regex, replacement).toUpperCase();
+                                + StringUtils.capitalize(propertyName.replace("-", "")).replaceAll(regex, replacement).toUpperCase();
         String propertyValue = "camel.kamelet." + name + "." + propertyName;
 
         String confFieldName = propertyPrefix + "CONF";

diff --git a/...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml b/...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
@@ -171,10 +171,7 @@
                     </exampleSinkPropertiesFileTemplate>
                     <removeMissingComponents>true</removeMissingComponents>
                     <excludedKamelets>
-                        <!-- XXX: remove datalake exclusions after https://github.com/apache/camel-kamelets/issues/1597  is released -->
                         <param>ms-exchange-online-imap-oauth-source</param>
-                        <param>azure-storage-datalake-sink</param>
-                        <param>azure-storage-datalake-source</param>
                     </excludedKamelets>
                     <excludedComponents>
                         <param>bonita</param>