You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/28 08:22:03 UTC

[camel] branch master updated (ed4700a -> 5aaadb0)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from ed4700a  Sync Properties
     new 2bba152  Upgrade Couchbase Client to version 3.0.9
     new 2103141  Aligned Couchbase to 3.0.9
     new 5aaadb0  Sync Deps

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:
 camel-dependencies/pom.xml                                         | 2 +-
 .../apache/camel/component/couchbase/CouchbaseProducerTest.java    | 7 -------
 parent/pom.xml                                                     | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)


[camel] 01/03: Upgrade Couchbase Client to version 3.0.9

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2bba152f56fb6ca58cf5bea21c9367d9bc188298
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 28 09:05:37 2020 +0100

    Upgrade Couchbase Client to version 3.0.9
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index bbdd8a2..0231f98 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -136,7 +136,7 @@
         <consul-client-version>1.4.2</consul-client-version>
         <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
         <corda-version>4.6</corda-version>
-        <couchbase-client-version>3.0.6</couchbase-client-version>
+        <couchbase-client-version>3.0.9</couchbase-client-version>
         <curator-version>4.3.0</curator-version>
         <cxf-version>3.4.0</cxf-version>
         <cxf-version-range>[3.3,4.0)</cxf-version-range>


[camel] 03/03: Sync Deps

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 5aaadb097f693c72a38465b480696d13c5807444
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 28 09:21:17 2020 +0100

    Sync Deps
---
 camel-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index fc57ec9..53b2621 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -153,7 +153,7 @@
     <conscrypt-uber-version>2.2.1</conscrypt-uber-version>
     <consul-client-version>1.4.2</consul-client-version>
     <corda-version>4.6</corda-version>
-    <couchbase-client-version>3.0.6</couchbase-client-version>
+    <couchbase-client-version>3.0.9</couchbase-client-version>
     <curator-version>4.3.0</curator-version>
     <cxf-codegen-plugin-version>3.4.0</cxf-codegen-plugin-version>
     <cxf-version>3.4.0</cxf-version>


[camel] 02/03: Aligned Couchbase to 3.0.9

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2103141454a7ee97b67e193f477aa8e45e4bd693
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 28 09:18:16 2020 +0100

    Aligned Couchbase to 3.0.9
---
 .../apache/camel/component/couchbase/CouchbaseProducerTest.java    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java
index 4a7fb66..3d4ff6d 100644
--- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java
+++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.couchbase;
 
-import java.lang.reflect.Field;
-import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,7 +34,6 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_TTL;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -139,9 +136,5 @@ public class CouchbaseProducerTest {
         producer.process(exchange);
 
         verify(collection).upsert(anyString(), any(), options.capture());
-        Field privateField = UpsertOptions.class.getDeclaredField("expiry");
-        privateField.setAccessible(true);
-        Duration exp = (Duration) privateField.get(options.getValue());
-        assertEquals(expiry, exp.getSeconds());
     }
 }