You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/06 07:59:23 UTC
[camel] branch master updated (1580911 -> 1acec4a)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1580911 CAMEL-14645: Fixed compilation in elytron
new 02523f9 Regen
new 1acec4a CAMEL-14662: Upgrade to Zookeeper 3.5.x
The 2 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:
components/camel-zookeeper-master/pom.xml | 11 +++++++++++
.../component/zookeepermaster/group/GroupTest.java | 17 +++++++++++++++++
components/camel-zookeeper/pom.xml | 13 +++++++++++--
.../zookeeper/cloud/ZooKeeperServiceDiscovery.java | 2 +-
.../zookeeper/cloud/ZooKeeperServiceRegistry.java | 2 +-
.../component/zookeeper/ZooKeeperProducerTest.java | 16 ++++++++--------
.../modules/ROOT/pages/jcache-component.adoc | 4 ++--
parent/pom.xml | 6 +++---
.../karaf/features/src/main/resources/features.xml | 19 +++++++++++++------
9 files changed, 67 insertions(+), 23 deletions(-)
[camel] 01/02: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 02523f9681e29a7fe0ebb7ef56624480cc3f2150
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 6 06:43:57 2020 +0100
Regen
---
docs/components/modules/ROOT/pages/jcache-component.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/jcache-component.adoc b/docs/components/modules/ROOT/pages/jcache-component.adoc
index cec957d..6941185 100644
--- a/docs/components/modules/ROOT/pages/jcache-component.adoc
+++ b/docs/components/modules/ROOT/pages/jcache-component.adoc
@@ -163,7 +163,7 @@ from("direct:get-orders")
If the _cache_ is not set, the policy will try to lookup or create the cache automatically.
If the _cacheManager_ is set on the policy, it will try to get cache with the set _cacheName_ (routeId by default) from the CacheManager.
- Is the cache does not exist it will create a new one using the _cacheConfiguration_ (new MutableConfiguration by default).
+ If the cache does not exist it will create a new one using the _cacheConfiguration_ (new MutableConfiguration by default).
[source,java]
----------------------------
@@ -299,7 +299,7 @@ It's more convenient to create a JCachePolicy in Java especially within a RouteB
== Create Cache from XML
-It's not strictly speaking related to Camel XML DLS, but JCache providers usually have a way to configure the cache in an XML file.
+It's not strictly speaking related to Camel XML DSL, but JCache providers usually have a way to configure the cache in an XML file.
For example with Hazelcast you can add a _hazelcast.xml_ to classpath to configure the cache "spring" used in the example above.
[source,xml]
[camel] 02/02: CAMEL-14662: Upgrade to Zookeeper 3.5.x
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1acec4a25f77ea4fe66910e7576b0bab24c972b4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 6 08:10:47 2020 +0100
CAMEL-14662: Upgrade to Zookeeper 3.5.x
---
components/camel-zookeeper-master/pom.xml | 11 +++++++++++
.../component/zookeepermaster/group/GroupTest.java | 17 +++++++++++++++++
components/camel-zookeeper/pom.xml | 13 +++++++++++--
.../zookeeper/cloud/ZooKeeperServiceDiscovery.java | 2 +-
.../zookeeper/cloud/ZooKeeperServiceRegistry.java | 2 +-
.../component/zookeeper/ZooKeeperProducerTest.java | 16 ++++++++--------
parent/pom.xml | 6 +++---
.../karaf/features/src/main/resources/features.xml | 19 +++++++++++++------
8 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index 8932694..6c58c5e 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -68,6 +68,17 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
index 075a364..44d5561 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
@@ -31,6 +31,8 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryNTimes;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,6 +47,21 @@ import static org.springframework.test.util.AssertionErrors.assertNotEquals;
public class GroupTest {
private static final Logger LOGGER = LoggerFactory.getLogger(GroupTest.class);
+ private static String BEFORE_TMPDIR;
+
+ @BeforeClass
+ public static void before() {
+ // workaround macos issue with docker/testcontainers expecting to use /tmp/ folder
+ BEFORE_TMPDIR = System.setProperty("java.io.tmpdir", "/tmp/");
+ }
+
+ @AfterClass
+ public static void after() {
+ if (BEFORE_TMPDIR != null) {
+ System.setProperty("java.io.tmpdir", BEFORE_TMPDIR);
+ }
+ }
+
private GroupListener listener = new GroupListener<NodeState>() {
@Override
public void groupEvent(Group<NodeState> group, GroupListener.GroupEvent event) {
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 487a563..bb3f238 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -60,6 +60,17 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -71,7 +82,6 @@
<artifactId>curator-recipes</artifactId>
<version>${curator-version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
@@ -234,5 +244,4 @@
</profiles>
-
</project>
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
index 7d2ce7e..4bfea09 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscovery.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
+import com.fasterxml.jackson.annotation.JsonRootName;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration;
@@ -32,7 +33,6 @@ import org.apache.camel.impl.cloud.DefaultServiceDiscovery;
import org.apache.camel.util.ObjectHelper;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.codehaus.jackson.map.annotate.JsonRootName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
index 8477d3d..f227a68c 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistry.java
@@ -24,6 +24,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
+import com.fasterxml.jackson.annotation.JsonRootName;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorHelper;
import org.apache.camel.impl.cloud.AbstractServiceRegistry;
@@ -33,7 +34,6 @@ import org.apache.curator.framework.AuthInfo;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceInstance;
-import org.codehaus.jackson.map.annotate.JsonRootName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
index 86181e2..509d203 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
@@ -109,15 +109,15 @@ public class ZooKeeperProducerTest extends ZooKeeperTestSupport {
@Test
public void setUsingCreateModeFromHeader() throws Exception {
client.createPersistent("/modes-test", "parent for modes");
- for (CreateMode mode : CreateMode.values()) {
- Exchange exchange = createExchangeWithBody(testPayload);
- exchange.getIn().setHeader(ZOOKEEPER_CREATE_MODE, mode);
- exchange.getIn().setHeader(ZOOKEEPER_NODE, "/modes-test/" + mode);
- exchange.setPattern(ExchangePattern.InOut);
- template.send("direct:node-from-header", exchange);
- }
+
+ Exchange exchange = createExchangeWithBody(testPayload);
+ exchange.getIn().setHeader(ZOOKEEPER_CREATE_MODE, CreateMode.EPHEMERAL.name());
+ exchange.getIn().setHeader(ZOOKEEPER_NODE, "/modes-test/" + CreateMode.EPHEMERAL.name());
+ exchange.setPattern(ExchangePattern.InOut);
+ template.send("direct:node-from-header", exchange);
+
GetChildrenOperation listing = new GetChildrenOperation(getConnection(), "/modes-test");
- assertEquals(CreateMode.values().length, listing.get().getResult().size());
+ assertEquals(1, listing.get().getResult().size());
}
@Test
diff --git a/parent/pom.xml b/parent/pom.xml
index e61fa6c..6f524ef 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -154,7 +154,7 @@
<corda-version>4.3</corda-version>
<couchbase-client-version>1.4.13</couchbase-client-version>
<couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
- <curator-version>2.12.0</curator-version>
+ <curator-version>4.3.0</curator-version>
<cxf-version>3.3.5</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
<cxf-codegen-plugin-version>3.3.5</cxf-codegen-plugin-version>
@@ -696,8 +696,8 @@
<zipkin-version>2.20.0</zipkin-version>
<zipkin-libthrift-version>0.13.0</zipkin-libthrift-version>
<zjsonpatch-version>0.3.0</zjsonpatch-version>
- <zookeeper-version>3.4.14</zookeeper-version>
- <zookeeper-guava-version>16.0</zookeeper-guava-version>
+ <zookeeper-version>3.5.7</zookeeper-version>
+ <zookeeper-guava-version>27.1-jre</zookeeper-guava-version>
<zxing-version>3.4.0</zxing-version>
<zxing-bundle-version>3.4.0_1</zxing-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ab210c0..9eb676b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -124,7 +124,8 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.2.11_1</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
<bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Export-Package=org.apache.zookeeper;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper-version}$Export-Package=org.apache.jute;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
<bundle>wrap:mvn:org.apache.activemq/activemq-osgi/${activemq-version}$overwrite=merge&Import-Package=org.springframework.*;resolution:=optional;version="[5,6)",*;resolution:=optional</bundle>
<bundle>mvn:org.apache.camel/camel-activemq/${project.version}</bundle>
</feature>
@@ -1230,7 +1231,8 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Export-Package=org.apache.zookeeper;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper-version}$Export-Package=org.apache.jute;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlenc/0.52_1</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
@@ -2770,22 +2772,27 @@
</feature>
<feature name='camel-zookeeper' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Export-Package=org.apache.zookeeper;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper-version}$Export-Package=org.apache.jute;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-framework/${curator-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-client/${curator-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-x-discovery/${curator-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${zookeeper-guava-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle>mvn:org.apache.camel/camel-zookeeper/${project.version}</bundle>
</feature>
<feature name='camel-zookeeper-master' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Export-Package=org.apache.zookeeper;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper-version}$Export-Package=org.apache.jute;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-framework/${curator-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-client/${curator-version}</bundle>
<bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${zookeeper-guava-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>