diff --git a/connectors/pom.xml b/connectors/pom.xml index 0ab1a1436a..216db1b6c0 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -109,10 +109,7 @@ true - ms-exchange-online-imap-oauth-source - azure-storage-datalake-sink - azure-storage-datalake-source bonita @@ -240,6 +237,8 @@ camel-azure-storage-blob-changefeed-source-kafka-connector camel-azure-storage-blob-sink-kafka-connector camel-azure-storage-blob-source-kafka-connector + camel-azure-storage-datalake-sink-kafka-connector + camel-azure-storage-datalake-source-kafka-connector camel-azure-storage-queue-sink-kafka-connector camel-azure-storage-queue-source-kafka-connector camel-beer-source-kafka-connector @@ -335,6 +334,8 @@ camel-nats-source-kafka-connector camel-netty-http-kafka-connector camel-netty-kafka-connector + camel-opensearch-index-sink-kafka-connector + camel-opensearch-search-source-kafka-connector camel-oracle-database-sink-kafka-connector camel-oracle-database-source-kafka-connector camel-postgresql-sink-kafka-connector @@ -344,6 +345,7 @@ camel-redis-sink-kafka-connector camel-redis-source-kafka-connector camel-rest-openapi-sink-kafka-connector + camel-salesforce-composite-upsert-sink-kafka-connector camel-salesforce-create-sink-kafka-connector camel-salesforce-delete-sink-kafka-connector camel-salesforce-source-kafka-connector 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 24fa1258d3..0000000000 --- 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 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 getAttachments() { - return attachments; - } - - public void setAttachments(List 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 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 getFields() { - return fields; - } - - public void setFields(List 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 6c0438fd58..41eae595ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -29,7 +29,7 @@ 3.4.1 4.0.0 - 4.0.0-RC1 + 4.0.0 1.3.2.Final 4.5.6.Final 17 diff --git a/tests/itests-mongodb/pom.xml b/tests/itests-mongodb/pom.xml index 502606e633..674aa9d91b 100644 --- a/tests/itests-mongodb/pom.xml +++ b/tests/itests-mongodb/pom.xml @@ -59,7 +59,6 @@ camel-mongodb - org.apache.camel.kamelets camel-kamelets-utils 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 7a719f1c6c..18da9d7e62 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 @@ 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/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 2cea91c1fc..1527bc66b4 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 @@ true - ms-exchange-online-imap-oauth-source - azure-storage-datalake-sink - azure-storage-datalake-source bonita