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 2021/06/06 21:01:18 UTC
[camel-kafka-connector] 01/02: fix #1114 :
camel-salesforce-kafka-connector missing dependency library
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 c11375e27ed9769f83f488e6197a01bc72968292
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Thu Jun 3 11:16:39 2021 +0200
fix #1114 : camel-salesforce-kafka-connector missing dependency library
---
connectors/camel-salesforce-kafka-connector/pom.xml | 7 -------
tests/itests-salesforce/pom.xml | 7 -------
.../kafkaconnector/salesforce/clients/SalesforceCliContainer.java | 2 +-
.../kafkaconnector/salesforce/sink/CamelSinkSalesforceITCase.java | 2 ++
.../salesforce/source/CamelSourceSalesforceITCase.java | 3 +++
5 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/connectors/camel-salesforce-kafka-connector/pom.xml b/connectors/camel-salesforce-kafka-connector/pom.xml
index f97614f..35a3585 100644
--- a/connectors/camel-salesforce-kafka-connector/pom.xml
+++ b/connectors/camel-salesforce-kafka-connector/pom.xml
@@ -43,13 +43,6 @@
<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 81ef830..9517cda 100644
--- a/tests/itests-salesforce/pom.xml
+++ b/tests/itests-salesforce/pom.xml
@@ -49,13 +49,6 @@
<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>
diff --git a/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/clients/SalesforceCliContainer.java b/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/clients/SalesforceCliContainer.java
index 4b5a257..8508bee 100644
--- a/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/clients/SalesforceCliContainer.java
+++ b/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/clients/SalesforceCliContainer.java
@@ -30,7 +30,7 @@ public class SalesforceCliContainer extends GenericContainer<SalesforceCliContai
public SalesforceCliContainer() {
- super("salesforce/salesforcedx");
+ super("salesforce/salesforcedx:latest-full");
withFileSystemBind(HOST_PATH, "/root/.sfdx");
withPrivilegedMode(true);
diff --git a/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/sink/CamelSinkSalesforceITCase.java b/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/sink/CamelSinkSalesforceITCase.java
index 6f05bde..829bf90 100644
--- a/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/sink/CamelSinkSalesforceITCase.java
+++ b/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/sink/CamelSinkSalesforceITCase.java
@@ -109,6 +109,7 @@ public class CamelSinkSalesforceITCase extends AbstractKafkaTest {
@AfterEach
public void tearDown() throws IOException, InterruptedException {
SfdxCommand sfdxCommand = SfdxCommand.forceDataRecordDelete()
+ .withArgument("-u", userName)
.withArgument("--sobjecttype", "Account")
.withArgument("--where", String.format("Name=%s", accountName));
@@ -124,6 +125,7 @@ public class CamelSinkSalesforceITCase extends AbstractKafkaTest {
private boolean waitForRecordCreation() {
SfdxCommand sfdxCommand = SfdxCommand.forceDataRecordGet()
+ .withArgument("-u", userName)
.withArgument("--sobjecttype", "Account")
.withArgument("--where", String.format("Name=%s", accountName));
diff --git a/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/source/CamelSourceSalesforceITCase.java b/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/source/CamelSourceSalesforceITCase.java
index becb5ab..9d7a5b8 100644
--- a/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/source/CamelSourceSalesforceITCase.java
+++ b/tests/itests-salesforce/src/test/java/org/apache/camel/kafkaconnector/salesforce/source/CamelSourceSalesforceITCase.java
@@ -111,6 +111,7 @@ public class CamelSourceSalesforceITCase extends AbstractKafkaTest {
account = "TestAccount" + TestUtils.randomWithRange(1, 100);
SfdxCommand sfdxCommand = SfdxCommand.forceDataRecordCreate()
+ .withArgument("-u", userName)
.withArgument("--sobjecttype", "Account")
.withArgument("--values", String.format("Name=%s", account));
@@ -124,6 +125,7 @@ public class CamelSourceSalesforceITCase extends AbstractKafkaTest {
@AfterEach
public void tearDown() throws IOException, InterruptedException {
SfdxCommand sfdxCommand = SfdxCommand.forceDataRecordDelete()
+ .withArgument("-u", userName)
.withArgument("--sobjecttype", "Account")
.withArgument("--where", String.format("Name=%s", account));
@@ -165,6 +167,7 @@ public class CamelSourceSalesforceITCase extends AbstractKafkaTest {
try {
SfdxCommand sfdxCommand = SfdxCommand.forceDataRecordUpdate()
+ .withArgument("-u", userName)
.withArgument("--sobjecttype", "Account")
.withArgument("--where", String.format("Name=%s", account))
.withArgument("--values", String.format("Description=desc%d", count));