You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/12/17 13:39:19 UTC
[camel-kafka-connector] branch master updated (8218420 -> 053becf)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from 8218420 Removed repeated idempotency.enabled option in source connector basic configuration
new 02cfc11 Removes invalid salesforce dependency
new ea1e3ee Fix Jetty dependency conflicts in Salesforce connector (issue #407)
new 053becf Fixed running salesforce CLI container in newer docker versions on Fedora
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:
connectors/camel-salesforce-kafka-connector/pom.xml | 7 +++++++
tests/itests-hdfs/pom.xml | 15 ---------------
tests/itests-salesforce/pom.xml | 7 +++++++
.../salesforce/clients/SalesforceCliContainer.java | 3 ++-
.../salesforce/source/CamelSourceSalesforceITCase.java | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
[camel-kafka-connector] 01/03: Removes invalid salesforce dependency
Posted by or...@apache.org.
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 02cfc11533bf317f03f1b170363ef949e2396b65
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Dec 17 14:04:53 2020 +0100
Removes invalid salesforce dependency
---
tests/itests-hdfs/pom.xml | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/tests/itests-hdfs/pom.xml b/tests/itests-hdfs/pom.xml
index 4b17a07..b91f752 100644
--- a/tests/itests-hdfs/pom.xml
+++ b/tests/itests-hdfs/pom.xml
@@ -68,20 +68,5 @@
</exclusion>
</exclusions>
</dependency>
-
- <!--
- Why it is declared here: we declare it here because, apparently, it conflicts with the one used in
- cometd and ends up causing the build to fail during the salesforce component build.
- -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
-
-
-
</project>
\ No newline at end of file
[camel-kafka-connector] 02/03: Fix Jetty dependency conflicts in
Salesforce connector (issue #407)
Posted by or...@apache.org.
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 <op...@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>
[camel-kafka-connector] 03/03: Fixed running salesforce CLI
container in newer docker versions on Fedora
Posted by or...@apache.org.
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 053becfe2f158d483a4847e1abb952a59b69ec02
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Dec 17 14:08:21 2020 +0100
Fixed running salesforce CLI container in newer docker versions on Fedora
---
.../kafkaconnector/salesforce/clients/SalesforceCliContainer.java | 3 ++-
.../kafkaconnector/salesforce/source/CamelSourceSalesforceITCase.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
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 efba564..4b5a257 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
@@ -33,8 +33,9 @@ public class SalesforceCliContainer extends GenericContainer<SalesforceCliContai
super("salesforce/salesforcedx");
withFileSystemBind(HOST_PATH, "/root/.sfdx");
+ withPrivilegedMode(true);
- withCommand("/bin/bash", "-c", "echo running ; while true ; do sleep 1 ; echo running ; done");
+ withCommand("/bin/bash", "-c", "chmod 600 /root/.sfdx/key.json ; echo running ; while true ; do sleep 1 ; echo running ; done");
waitingFor(Wait.forLogMessage(".*running.*", 1));
}
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 d0e542a..becb5ab 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
@@ -62,7 +62,7 @@ The it.test.salesforce.sfdx.path property should point to the directory containi
CLI client configuration. This can be generated using the following steps:
1. Run the Salesforce CLI container:
-docker run --rm --name salesforce-cli -it -v /path/to/sfdx:/root/.sfdx salesforce/salesforcedx
+docker run --rm --privileged --name salesforce-cli -it -v /path/to/sfdx:/root/.sfdx salesforce/salesforcedx
2. Within the container, use the following command to login:
sfdx force:auth:device:login -s -d -i <client ID>