This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit ea1e3eefb2898d154dbe31c9675d406e3e77b962 Author: Otavio Rodolfo Piske <opi...@redhat.com> AuthorDate: Thu Dec 17 14:06:36 2020 +0100 Fix Jetty dependency conflicts in Salesforce connector (issue #407) --- connectors/camel-salesforce-kafka-connector/pom.xml | 7 +++++++ tests/itests-salesforce/pom.xml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/connectors/camel-salesforce-kafka-connector/pom.xml b/connectors/camel-salesforce-kafka-connector/pom.xml index f4e18c4..a56e426 100644 --- a/connectors/camel-salesforce-kafka-connector/pom.xml +++ b/connectors/camel-salesforce-kafka-connector/pom.xml @@ -43,6 +43,13 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-salesforce</artifactId> + <exclusions> + <!-- This avoids a conflict with the Jetty used in Kafka Connect. See GH issue #407 --> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </exclusion> + </exclusions> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/tests/itests-salesforce/pom.xml b/tests/itests-salesforce/pom.xml index 56ae987..091f888 100644 --- a/tests/itests-salesforce/pom.xml +++ b/tests/itests-salesforce/pom.xml @@ -49,6 +49,13 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-salesforce</artifactId> + <exclusions> + <!-- This avoids a conflict with the Jetty used in Kafka Connect. See GH issue #407 --> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies>