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 2024/05/28 12:34:00 UTC
(camel-kafka-connector) branch main updated (855f11faae -> 8bd9252a38)
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
from 855f11faae [create-pull-request] automated change
new 3351f20f87 Upgrade to Kafka 3.6.1 used by Camel 4.4.x
new 289bdd08ef Dependencies fix after Upgrade to Kafka 3.6.1 used by Camel 4.4.x
new 8bd9252a38 Allign maven plugin test to actual connectors/pom.xml
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/pom.xml | 11 +++++++++++
parent/pom.xml | 4 ++--
.../common/services/kafka/EmbeddedKafkaService.java | 3 +++
.../GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml | 6 ++++++
4 files changed, 22 insertions(+), 2 deletions(-)
(camel-kafka-connector) 01/03: Upgrade to Kafka 3.6.1 used by Camel 4.4.x
Posted by va...@apache.org.
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 3351f20f871d92bf3c87abc9635adbcd64e29daa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed May 8 23:05:41 2024 +0200
Upgrade to Kafka 3.6.1 used by Camel 4.4.x
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 13e29f194a..df7f1a3ae7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <kafka.version>3.5.1</kafka.version>
+ <kafka.version>3.6.1</kafka.version>
<camel.version>4.4.2</camel.version>
<camel.kamelet.catalog.version>4.4.2</camel.kamelet.catalog.version>
<apicurio.registry.version>1.3.2.Final</apicurio.registry.version>
(camel-kafka-connector) 02/03: Dependencies fix after Upgrade to Kafka 3.6.1 used by Camel 4.4.x
Posted by va...@apache.org.
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 289bdd08efe9b5c1f282c95bca577a00324ae8f9
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue May 28 13:56:24 2024 +0200
Dependencies fix after Upgrade to Kafka 3.6.1 used by Camel 4.4.x
---
core/pom.xml | 11 +++++++++++
parent/pom.xml | 2 +-
.../common/services/kafka/EmbeddedKafkaService.java | 3 +++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index a48e81574a..6b76f3d8b8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -101,6 +101,17 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-avro</artifactId>
<version>${jackson2-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.11.3</version>
</dependency>
<!-- Test -->
diff --git a/parent/pom.xml b/parent/pom.xml
index df7f1a3ae7..9394e6472b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
<kafka.version>3.6.1</kafka.version>
<camel.version>4.4.2</camel.version>
<camel.kamelet.catalog.version>4.4.2</camel.kamelet.catalog.version>
- <apicurio.registry.version>1.3.2.Final</apicurio.registry.version>
+ <apicurio.registry.version>2.5.11.Final</apicurio.registry.version>
<resteasy.version>4.5.6.Final</resteasy.version>
<version.java>17</version.java>
<version.guava>20.0</version.guava>
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
index 63b6892fed..7ab09c0cbf 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
@@ -26,6 +26,7 @@ import org.apache.camel.kafkaconnector.common.PluginPathHelper;
import org.apache.camel.kafkaconnector.common.utils.NetworkUtils;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.kafka.connect.runtime.WorkerConfig;
+import org.apache.kafka.connect.runtime.isolation.PluginDiscoveryMode;
import org.apache.kafka.connect.runtime.rest.RestServerConfig;
import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -56,6 +57,8 @@ public class EmbeddedKafkaService implements KafkaService {
String address = "http://localhost:" + NetworkUtils.getFreePort();
LOG.info("Using the following address for the listener configuration: {}", address);
workerProps.put(RestServerConfig.LISTENERS_CONFIG, address);
+ LOG.info("Setting {} to: {}", WorkerConfig.PLUGIN_DISCOVERY_CONFIG, PluginDiscoveryMode.HYBRID_WARN);
+ workerProps.put(WorkerConfig.PLUGIN_DISCOVERY_CONFIG, String.valueOf(PluginDiscoveryMode.HYBRID_WARN));
String pluginPaths = PluginPathHelper.getInstance().pluginPaths();
(camel-kafka-connector) 03/03: Allign maven plugin test to actual connectors/pom.xml
Posted by va...@apache.org.
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 8bd9252a3897d25220999643aa0ec05656c72f80
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue May 28 14:16:47 2024 +0200
Allign maven plugin test to actual connectors/pom.xml
---
.../maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
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 b045f77bf4..20c37e68c3 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
@@ -124,6 +124,12 @@
<removeMissingComponents>true</removeMissingComponents>
<excludedKamelets>
<param>ms-exchange-online-imap-oauth-source</param>
+ <param>jira-add-comment-sink</param>
+ <param>jira-transition-issue-sink</param>
+ <param>jira-add-issue-sink</param>
+ <param>jira-oauth-source</param>
+ <param>jira-update-issue-sink</param>
+ <param>jira-source</param>
</excludedKamelets>
<excludedComponents>
<param>bonita</param>