You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2023/09/12 14:11:23 UTC
[camel-kafka-connector] 01/02: Updated kamelet catalog
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 8120aa5497a1e6d4d7ed27f5ec5a60561ee7eda9
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Sep 12 13:58:26 2023 +0200
Updated kamelet catalog
---
connectors/pom.xml | 8 +-
.../kafkaconnector/transforms/SlackMessage.java | 259 ---------------------
parent/pom.xml | 2 +-
tests/itests-mongodb/pom.xml | 1 -
.../CamelKafkaConnectorKameletUpdateMojo.java | 2 +-
.../maven_project/pom.xml | 3 -
6 files changed, 7 insertions(+), 268 deletions(-)
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 0ab1a1436..216db1b6c 100644
--- 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
deleted file mode 100644
index 24fa1258d..000000000
--- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.transforms;
-
-import java.util.List;
-
-//XXX: this class can be removed and tests updated accordingly after Camel updated to 3.7.0
-public class SlackMessage {
-
- private String text;
- private String channel;
- private String username;
- private String user;
- private String iconUrl;
- private String iconEmoji;
- private List<Attachment> attachments;
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public String getChannel() {
- return channel;
- }
-
- public void setChannel(String channel) {
- this.channel = channel;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getUser() {
- return user;
- }
-
- public void setUser(String user) {
- this.user = user;
- }
-
- public String getIconUrl() {
- return iconUrl;
- }
-
- public void setIconUrl(String iconUrl) {
- this.iconUrl = iconUrl;
- }
-
- public String getIconEmoji() {
- return iconEmoji;
- }
-
- public void setIconEmoji(String iconEmoji) {
- this.iconEmoji = iconEmoji;
- }
-
- public List<Attachment> getAttachments() {
- return attachments;
- }
-
- public void setAttachments(List<Attachment> attachments) {
- this.attachments = attachments;
- }
-
- public static class Attachment {
-
- private String fallback;
- private String color;
- private String pretext;
- private String authorName;
- private String authorLink;
- private String authorIcon;
- private String title;
- private String titleLink;
- private String text;
- private String imageUrl;
- private String thumbUrl;
- private String footer;
- private String footerIcon;
- private Long ts;
- private List<Attachment.Field> fields;
-
- public String getFallback() {
- return fallback;
- }
-
- public void setFallback(String fallback) {
- this.fallback = fallback;
- }
-
- public String getColor() {
- return color;
- }
-
- public void setColor(String color) {
- this.color = color;
- }
-
- public String getPretext() {
- return pretext;
- }
-
- public void setPretext(String pretext) {
- this.pretext = pretext;
- }
-
- public String getAuthorName() {
- return authorName;
- }
-
- public void setAuthorName(String authorName) {
- this.authorName = authorName;
- }
-
- public String getAuthorLink() {
- return authorLink;
- }
-
- public void setAuthorLink(String authorLink) {
- this.authorLink = authorLink;
- }
-
- public String getAuthorIcon() {
- return authorIcon;
- }
-
- public void setAuthorIcon(String authorIcon) {
- this.authorIcon = authorIcon;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getTitleLink() {
- return titleLink;
- }
-
- public void setTitleLink(String titleLink) {
- this.titleLink = titleLink;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public String getImageUrl() {
- return imageUrl;
- }
-
- public void setImageUrl(String imageUrl) {
- this.imageUrl = imageUrl;
- }
-
- public String getThumbUrl() {
- return thumbUrl;
- }
-
- public void setThumbUrl(String thumbUrl) {
- this.thumbUrl = thumbUrl;
- }
-
- public String getFooter() {
- return footer;
- }
-
- public void setFooter(String footer) {
- this.footer = footer;
- }
-
- public String getFooterIcon() {
- return footerIcon;
- }
-
- public void setFooterIcon(String footerIcon) {
- this.footerIcon = footerIcon;
- }
-
- public Long getTs() {
- return ts;
- }
-
- public void setTs(Long ts) {
- this.ts = ts;
- }
-
- public List<Attachment.Field> getFields() {
- return fields;
- }
-
- public void setFields(List<Attachment.Field> fields) {
- this.fields = fields;
- }
-
- public static class Field {
-
- private String title;
- private String value;
- private Boolean shortValue;
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public Boolean isShortValue() {
- return shortValue;
- }
-
- public void setShortValue(Boolean shortValue) {
- this.shortValue = shortValue;
- }
- }
- }
-
-}
-
diff --git a/parent/pom.xml b/parent/pom.xml
index 6c0438fd5..41eae595a 100644
--- 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
index 502606e63..674aa9d91 100644
--- 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/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
index 7a719f1c6..18da9d7e6 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
@@ -565,7 +565,7 @@ public class CamelKafkaConnectorKameletUpdateMojo extends AbstractCamelKameletKa
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/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
index 2cea91c1f..1527bc66b 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/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>