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 2017/02/07 13:07:25 UTC
[01/24] camel git commit: Upgrade Async http client to version 2.0.28
Repository: camel
Updated Branches:
refs/heads/mention bf18127b6 -> 9be660e61
Upgrade Async http client to version 2.0.28
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8307841d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8307841d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8307841d
Branch: refs/heads/mention
Commit: 8307841d25e8a00764b8c0644e37ad186a206ba0
Parents: 6649c85
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Feb 6 10:29:46 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 6 10:29:46 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8307841d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4f4e7e9..53baa2c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.14.3</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
- <ahc-version>2.0.27</ahc-version>
+ <ahc-version>2.0.28</ahc-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
<antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
[09/24] camel git commit: CAMEL-10693: spring-boot: deprecate
camel-spring-boot commands
Posted by da...@apache.org.
CAMEL-10693: spring-boot: deprecate camel-spring-boot commands
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89f21d75
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89f21d75
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89f21d75
Branch: refs/heads/mention
Commit: 89f21d7503e81d2f02e537801982af16c98a3c8d
Parents: 40e177b
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Feb 6 18:30:51 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Feb 6 18:30:51 2017 +0100
----------------------------------------------------------------------
platforms/commands/commands-spring-boot/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/89f21d75/platforms/commands/commands-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-spring-boot/pom.xml b/platforms/commands/commands-spring-boot/pom.xml
index ca15c4f..804781d 100755
--- a/platforms/commands/commands-spring-boot/pom.xml
+++ b/platforms/commands/commands-spring-boot/pom.xml
@@ -26,7 +26,7 @@
<artifactId>camel-commands-spring-boot</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Platforms :: Commands :: Spring Boot</name>
+ <name>Camel :: Platforms :: Commands :: Spring Boot (deprecated)</name>
<description>Camel Commands using Spring Boot Shell</description>
<modelVersion>4.0.0</modelVersion>
[20/24] camel git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01c94eb5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01c94eb5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01c94eb5
Branch: refs/heads/mention
Commit: 01c94eb52803b16f1d07f243a5c8afb785ddedaf
Parents: d994bcd
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:32:57 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:32:57 2017 +0100
----------------------------------------------------------------------
.../chronicle/engine/ChronicleEngineConfiguration.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/01c94eb5/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
index ab56b95..25506fa 100644
--- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
+++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
@@ -162,14 +162,14 @@ public class ChronicleEngineConfiguration {
this.persistent = persistent;
}
- public String getClusterName() {
- return clusterName;
- }
+ public String getClusterName() {
+ return clusterName;
+ }
/**
* Cluster name for queue
*/
- public void setClusterName(String clusterName) {
- this.clusterName = clusterName;
- }
+ public void setClusterName(String clusterName) {
+ this.clusterName = clusterName;
+ }
}
[03/24] camel git commit: CAMEL-10612: added reactive-streams to BOM
Posted by da...@apache.org.
CAMEL-10612: added reactive-streams to BOM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91926c2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91926c2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91926c2b
Branch: refs/heads/mention
Commit: 91926c2bd4ad212f0e30cd430d2006a5fd9ea560
Parents: 44766f5
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Feb 6 09:48:48 2017 +0100
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Feb 6 10:49:28 2017 +0100
----------------------------------------------------------------------
apache-camel/src/main/descriptors/common-bin.xml | 2 ++
.../src/main/docs/reactive-streams-component.adoc | 2 +-
examples/camel-example-reactive-streams/pom.xml | 1 -
parent/pom.xml | 10 ++++++++++
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++++++++++
5 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 2691281..9e0857b 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -191,6 +191,7 @@
<include>org.apache.camel:camel-quartz2</include>
<include>org.apache.camel:camel-quickfix</include>
<include>org.apache.camel:camel-rabbitmq</include>
+ <include>org.apache.camel:camel-reactive-streams</include>
<include>org.apache.camel:camel-restlet</include>
<include>org.apache.camel:camel-ribbon</include>
<include>org.apache.camel:camel-rmi</include>
@@ -457,6 +458,7 @@
<include>org.apache.camel:camel-quartz2-starter</include>
<include>org.apache.camel:camel-quickfix-starter</include>
<include>org.apache.camel:camel-rabbitmq-starter</include>
+ <include>org.apache.camel:camel-reactive-streams-starter</include>
<include>org.apache.camel:camel-restlet-starter</include>
<include>org.apache.camel:camel-ribbon-starter</include>
<include>org.apache.camel:camel-rmi-starter</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
index b351017..6a034f2 100644
--- a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
+++ b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
@@ -15,7 +15,7 @@ outgoing streams within Camel routes, and a direct client API that allows using
Camel uses an internal implementation of the reactive streams
_Publisher_ and _Subscriber_, so it's not tied to any specific framework.
-The following reactive frameworks have been used in the integration tests: https://github.com/ReactiveX/RxJava[RxJava2], https://github.com/reactor/reactor-core[reactor-core].
+The following reactive frameworks have been used in the integration tests: https://github.com/reactor/reactor-core[Reactor Core 3], https://github.com/ReactiveX/RxJava[RxJava 2].
Maven users will need to add the following dependency to their `pom.xml`
for this component:
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/examples/camel-example-reactive-streams/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reactive-streams/pom.xml b/examples/camel-example-reactive-streams/pom.xml
index 10c1a23..de9e4a7 100644
--- a/examples/camel-example-reactive-streams/pom.xml
+++ b/examples/camel-example-reactive-streams/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-reactive-streams-starter</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 53baa2c..c21abeb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1614,6 +1614,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2866,6 +2871,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index d065f9a..be64097 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1934,6 +1934,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
<version>${project.version}</version>
</dependency>
[10/24] camel git commit: Upgrade Kubernetes-model to version 1.0.66
Posted by da...@apache.org.
Upgrade Kubernetes-model to version 1.0.66
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b906396
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b906396
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b906396
Branch: refs/heads/mention
Commit: 9b906396b9a1e35bf713c90a146b5adae04afc91
Parents: 89f21d7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 09:54:28 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 09:54:28 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9b906396/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fc3692f..d35ab2c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -389,7 +389,7 @@
<kie-version>6.5.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>1.4.34</kubernetes-client-version>
- <kubernetes-model-version>1.0.65</kubernetes-model-version>
+ <kubernetes-model-version>1.0.66</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<libphonenumber-version>8.0.1</libphonenumber-version>
[24/24] camel git commit: Merge branch 'master' into mention
Posted by da...@apache.org.
Merge branch 'master' into mention
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9be660e6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9be660e6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9be660e6
Branch: refs/heads/mention
Commit: 9be660e61f0442d1e6857e660f067db5df630235
Parents: bf18127 4bb7dcb
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 7 14:07:08 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 7 14:07:08 2017 +0100
----------------------------------------------------------------------
.../src/main/descriptors/common-bin.xml | 2 +
.../blueprint/CamelContextFactoryBean.java | 27 +++++++++--
.../camel/cdi/xml/CamelContextFactoryBean.java | 29 ++++++++++--
.../main/docs/chronicle-engine-component.adoc | 5 +-
.../engine/ChronicleEngineConfiguration.java | 13 +++++
.../engine/ChronicleEngineProducer.java | 2 +-
.../xml/AbstractCamelContextFactoryBean.java | 15 +++---
components/camel-reactive-streams/pom.xml | 5 +-
.../main/docs/reactive-streams-component.adoc | 20 +++++++-
.../camel/spring/CamelContextFactoryBean.java | 33 +++++++++++--
.../spring/handler/CamelNamespaceHandler.java | 2 +
examples/camel-example-reactive-streams/pom.xml | 1 -
parent/pom.xml | 37 ++++++++++-----
platforms/commands/commands-spring-boot/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 6 ++-
.../camel-spring-boot-dependencies/pom.xml | 10 ++++
.../itest/karaf/CamelReactiveStreamsTest.java | 34 +++++++++++++
.../springboot/CamelReactiveStreamsTest.java | 50 ++++++++++++++++++++
.../itest/springboot/util/LocationUtils.java | 2 +-
19 files changed, 256 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
[08/24] camel git commit: CAMEL-10682:
AbstractCamelContextFactorybean : add specific methods for
servicecall/hystrix configuration
Posted by da...@apache.org.
CAMEL-10682: AbstractCamelContextFactorybean : add specific methods for servicecall/hystrix configuration
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40e177b5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40e177b5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40e177b5
Branch: refs/heads/mention
Commit: 40e177b504f7bf7c289d2dabfc7d4178ca68c674
Parents: da3e2ea
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Feb 6 18:15:36 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Feb 6 18:15:36 2017 +0100
----------------------------------------------------------------------
.../blueprint/CamelContextFactoryBean.java | 27 ++++++++++++++--
.../camel/cdi/xml/CamelContextFactoryBean.java | 29 +++++++++++++++--
.../xml/AbstractCamelContextFactoryBean.java | 15 ++++-----
.../camel/spring/CamelContextFactoryBean.java | 33 ++++++++++++++++++--
.../spring/handler/CamelNamespaceHandler.java | 2 ++
5 files changed, 90 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/40e177b5/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index cf8a9e1..717665a 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -155,10 +155,12 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
@XmlElement(name = "errorHandler", type = CamelErrorHandlerFactoryBean.class)})
private List<AbstractCamelFactoryBean<?>> beansFactory;
@XmlElements({
- @XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
- @XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class),
- @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)})
+ @XmlElement(name = "export", type = CamelServiceExporterDefinition.class) })
private List<?> beans;
+ @XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class)
+ private List<ServiceCallConfigurationDefinition> serviceCallConfigurations;
+ @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)
+ private List<HystrixConfigurationDefinition> hystrixConfigurations;
@XmlElement(name = "routeBuilder")
private List<RouteBuilderDefinition> builderRefs = new ArrayList<RouteBuilderDefinition>();
@XmlElement(name = "routeContextRef")
@@ -626,6 +628,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
this.camelStreamCachingStrategy = camelStreamCachingStrategy;
}
+ @Override
public List<AbstractCamelFactoryBean<?>> getBeansFactory() {
return beansFactory;
}
@@ -643,6 +646,24 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
this.beans = beans;
}
+ @Override
+ public List<ServiceCallConfigurationDefinition> getServiceCallConfigurations() {
+ return serviceCallConfigurations;
+ }
+
+ public void setServiceCallConfigurations(List<ServiceCallConfigurationDefinition> serviceCallConfigurations) {
+ this.serviceCallConfigurations = serviceCallConfigurations;
+ }
+
+ @Override
+ public List<HystrixConfigurationDefinition> getHystrixConfigurations() {
+ return hystrixConfigurations;
+ }
+
+ public void setHystrixConfigurations(List<HystrixConfigurationDefinition> hystrixConfigurations) {
+ this.hystrixConfigurations = hystrixConfigurations;
+ }
+
public List<RouteBuilderDefinition> getBuilderRefs() {
return builderRefs;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/40e177b5/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index 455f091..d5336ed 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -169,11 +169,15 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
})
private List<AbstractCamelFactoryBean<?>> beansFactory;
- @XmlElements({
- @XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class),
- @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)})
+ @XmlTransient
private List<?> beans;
+ @XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class)
+ private List<ServiceCallConfigurationDefinition> serviceCallConfigurations;
+
+ @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)
+ private List<HystrixConfigurationDefinition> hystrixConfigurations;
+
@XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class)
private List<ErrorHandlerDefinition> errorHandlers;
@@ -314,6 +318,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
return context;
}
+ @Override
public List<AbstractCamelFactoryBean<?>> getBeansFactory() {
return beansFactory;
}
@@ -331,6 +336,24 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
this.beans = beans;
}
+ @Override
+ public List<ServiceCallConfigurationDefinition> getServiceCallConfigurations() {
+ return serviceCallConfigurations;
+ }
+
+ public void setServiceCallConfigurations(List<ServiceCallConfigurationDefinition> serviceCallConfigurations) {
+ this.serviceCallConfigurations = serviceCallConfigurations;
+ }
+
+ @Override
+ public List<HystrixConfigurationDefinition> getHystrixConfigurations() {
+ return hystrixConfigurations;
+ }
+
+ public void setHystrixConfigurations(List<HystrixConfigurationDefinition> hystrixConfigurations) {
+ this.hystrixConfigurations = hystrixConfigurations;
+ }
+
public List<RouteDefinition> getRoutes() {
return routes;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/40e177b5/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index e2c1892..0c2c8b9 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -52,6 +52,7 @@ import org.apache.camel.management.ManagedManagementStrategy;
import org.apache.camel.model.ContextScanDefinition;
import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.GlobalOptionsDefinition;
+import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.model.InterceptDefinition;
import org.apache.camel.model.InterceptFromDefinition;
@@ -791,6 +792,10 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
public abstract List<?> getBeans();
+ public abstract List<HystrixConfigurationDefinition> getHystrixConfigurations();
+
+ public abstract List<ServiceCallConfigurationDefinition> getServiceCallConfigurations();
+
// Implementation methods
// -------------------------------------------------------------------------
@@ -867,13 +872,9 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
if (getRestConfiguration() != null) {
ctx.setRestConfiguration(getRestConfiguration().asRestConfiguration(ctx));
}
- if (getBeans() != null) {
- for (Object bean : getBeans()) {
- if (bean instanceof ServiceCallConfigurationDefinition) {
- @SuppressWarnings("unchecked")
- ServiceCallConfigurationDefinition configuration = (ServiceCallConfigurationDefinition)bean;
- ctx.addServiceCallConfiguration(configuration.getId(), configuration);
- }
+ if (getServiceCallConfigurations() != null) {
+ for (ServiceCallConfigurationDefinition bean : getServiceCallConfigurations()) {
+ ctx.addServiceCallConfiguration(bean.getId(), bean);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/40e177b5/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index a05b4f0..6c2f2d0 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -164,10 +164,12 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
@XmlElements({
@XmlElement(name = "proxy", type = CamelProxyFactoryDefinition.class),
@XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
- @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class),
- @XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class),
- @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)})
+ @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class) })
private List<?> beans;
+ @XmlElement(name = "serviceCallConfiguration", type = ServiceCallConfigurationDefinition.class)
+ private List<ServiceCallConfigurationDefinition> serviceCallConfigurations;
+ @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)
+ private List<HystrixConfigurationDefinition> hystrixConfigurations;
@XmlElement(name = "routeBuilder")
private List<RouteBuilderDefinition> builderRefs = new ArrayList<RouteBuilderDefinition>();
@XmlElement(name = "routeContextRef")
@@ -912,6 +914,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
this.redeliveryPolicies = redeliveryPolicies;
}
+ @Override
public List<AbstractCamelFactoryBean<?>> getBeansFactory() {
return beansFactory;
}
@@ -935,6 +938,30 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
this.beans = beans;
}
+ @Override
+ public List<ServiceCallConfigurationDefinition> getServiceCallConfigurations() {
+ return serviceCallConfigurations;
+ }
+
+ /**
+ * ServiceCall configurations
+ */
+ public void setServiceCallConfigurations(List<ServiceCallConfigurationDefinition> serviceCallConfigurations) {
+ this.serviceCallConfigurations = serviceCallConfigurations;
+ }
+
+ @Override
+ public List<HystrixConfigurationDefinition> getHystrixConfigurations() {
+ return hystrixConfigurations;
+ }
+
+ /**
+ * hystrix configurations
+ */
+ public void setHystrixConfigurations(List<HystrixConfigurationDefinition> hystrixConfigurations) {
+ this.hystrixConfigurations = hystrixConfigurations;
+ }
+
/**
* Configuration of error handlers that triggers on exceptions thrown.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/40e177b5/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
index ff17b4d..e0ef322 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
@@ -402,6 +402,8 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport {
builder.addPropertyValue("threadPoolProfiles", factoryBean.getThreadPoolProfiles());
builder.addPropertyValue("beansFactory", factoryBean.getBeansFactory());
builder.addPropertyValue("beans", factoryBean.getBeans());
+ builder.addPropertyValue("serviceCallConfigurations", factoryBean.getServiceCallConfigurations());
+ builder.addPropertyValue("hystrixConfigurations", factoryBean.getHystrixConfigurations());
// add any depends-on
addDependsOn(factoryBean, builder);
}
[19/24] camel git commit: Added clusterName option to Chronicle
configuration to reflect the change in the API
Posted by da...@apache.org.
Added clusterName option to Chronicle configuration to reflect the change in the API
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d994bcd6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d994bcd6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d994bcd6
Branch: refs/heads/mention
Commit: d994bcd6ad6f6775093781a42fe0ebdfd79eab4d
Parents: ed90ca5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:21:46 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:21:46 2017 +0100
----------------------------------------------------------------------
.../src/main/docs/chronicle-engine-component.adoc | 5 +++--
.../chronicle/engine/ChronicleEngineConfiguration.java | 13 +++++++++++++
.../chronicle/engine/ChronicleEngineProducer.java | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d994bcd6/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc b/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
index e16d870..71cdc84 100644
--- a/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
+++ b/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
@@ -9,7 +9,7 @@ The Chronicle Engine component has no options.
// endpoint options: START
-The Chronicle Engine component supports 13 endpoint options which are listed below:
+The Chronicle Engine component supports 14 endpoint options which are listed below:
{% raw %}
[width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -18,6 +18,7 @@ The Chronicle Engine component supports 13 endpoint options which are listed bel
| addresses | common | | String | *Required* Engine addresses. Multiple addresses can be separated by comman.
| path | common | | String | *Required* Engine path
| action | common | | String | The default action to perform valid values are: - PUBLISH - PPUBLISH_AND_INDEX - PPUT - PGET_AND_PUT - PPUT_ALL - PPUT_IF_ABSENT - PGET - PGET_AND_REMOVE - PREMOVE - PIS_EMPTY - PSIZE
+| clusterName | common | | String | Cluster name for queue
| filteredMapEvents | common | | String | A comma separated list of Map event type to filer valid values are: INSERT UPDATE REMOVE.
| persistent | common | true | boolean | Enable/disable data persistence
| subscribeMapEvents | common | true | boolean | Set if consumer should subscribe to Map events default true.
@@ -30,4 +31,4 @@ The Chronicle Engine component supports 13 endpoint options which are listed bel
| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
|=======================================================================
{% endraw %}
-// endpoint options: END
\ No newline at end of file
+// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/d994bcd6/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
index 6b76ee9..ab56b95 100644
--- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
+++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineConfiguration.java
@@ -37,6 +37,8 @@ public class ChronicleEngineConfiguration {
private String action;
@UriParam(defaultValue = "true")
private boolean persistent = true;
+ @UriParam
+ private String clusterName;
// ****************************
// CLIENT OPTIONS
@@ -159,4 +161,15 @@ public class ChronicleEngineConfiguration {
public void setPersistent(boolean persistent) {
this.persistent = persistent;
}
+
+ public String getClusterName() {
+ return clusterName;
+ }
+
+ /**
+ * Cluster name for queue
+ */
+ public void setClusterName(String clusterName) {
+ this.clusterName = clusterName;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d994bcd6/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
index c8513d4..2c35823 100644
--- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
+++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
@@ -47,7 +47,7 @@ public class ChronicleEngineProducer extends HeaderSelectorProducer {
this.topicPublisher = WeakRef.create(() -> client.acquireTopicPublisher(uri, Object.class, Object.class));
this.publisher = WeakRef.create(() -> client.acquirePublisher(uri, Object.class));
this.mapView = WeakRef.create(() -> client.acquireMap(uri, Object.class, Object.class));
- this.queueView = WeakRef.create(() -> client.acquireQueue(uri, Object.class, Object.class));
+ this.queueView = WeakRef.create(() -> client.acquireQueue(uri, Object.class, Object.class, endpoint.getConfiguration().getClusterName()));
}
// ***************************
[07/24] camel git commit: Upgrade Roaster to version 2.19.5.Final
Posted by da...@apache.org.
Upgrade Roaster to version 2.19.5.Final
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da3e2ea7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da3e2ea7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da3e2ea7
Branch: refs/heads/mention
Commit: da3e2ea7df263f6a7eb77aa1887344280681db2c
Parents: c4abe33
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Feb 6 15:04:07 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 6 15:04:07 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/da3e2ea7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 246c5e5..fc3692f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -519,7 +519,7 @@
<rhino-bundle-version>1.7R2_3</rhino-bundle-version>
<rhino-version>1.7R2</rhino-version>
<ribbon-version>2.2.2</ribbon-version>
- <roaster-version>2.19.4.Final</roaster-version>
+ <roaster-version>2.19.5.Final</roaster-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
<rxjava-version>1.2.6</rxjava-version>
[06/24] camel git commit: Update spring-cloud dependencies
Posted by da...@apache.org.
Update spring-cloud dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4abe335
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4abe335
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4abe335
Branch: refs/heads/mention
Commit: c4abe3351ddab2670ad9d1838fc8fde061a2681a
Parents: 6e3ef75
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Feb 6 13:18:30 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Feb 6 13:18:30 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c4abe335/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f68623d..246c5e5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -561,8 +561,8 @@
<spring-batch-version>3.0.7.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.5.1.RELEASE</spring-boot-version>
- <spring-cloud-commons-version>1.1.6.RELEASE</spring-cloud-commons-version>
- <spring-cloud-netflix-version>1.2.4.RELEASE</spring-cloud-netflix-version>
+ <spring-cloud-commons-version>1.1.7.RELEASE</spring-cloud-commons-version>
+ <spring-cloud-netflix-version>1.2.5.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.11.6.RELEASE</spring-data-commons-version>
<spring-data-redis-version>1.7.5.RELEASE</spring-data-redis-version>
[02/24] camel git commit: CAMEL-10612: added platform compatibility
tests and features
Posted by da...@apache.org.
CAMEL-10612: added platform compatibility tests and features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa629b28
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa629b28
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa629b28
Branch: refs/heads/mention
Commit: aa629b280b3401823844b492a77beefc8f170644
Parents: 91926c2
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Feb 6 10:49:20 2017 +0100
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Feb 6 10:49:28 2017 +0100
----------------------------------------------------------------------
components/camel-reactive-streams/pom.xml | 5 +-
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 4 ++
.../itest/karaf/CamelReactiveStreamsTest.java | 36 ++++++++++++++
.../springboot/CamelReactiveStreamsTest.java | 50 ++++++++++++++++++++
.../itest/springboot/util/LocationUtils.java | 2 +-
6 files changed, 95 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aa629b28/components/camel-reactive-streams/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-reactive-streams/pom.xml b/components/camel-reactive-streams/pom.xml
index 3a69a48..3d29bbc 100644
--- a/components/camel-reactive-streams/pom.xml
+++ b/components/camel-reactive-streams/pom.xml
@@ -32,6 +32,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.reactive.streams.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=reactive-streams</camel.osgi.export.service>
</properties>
<dependencies>
@@ -44,14 +45,14 @@
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
- <version>1.0.0</version>
+ <version>${reactive-streams-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams-tck</artifactId>
- <version>1.0.0</version>
+ <version>${reactive-streams-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/aa629b28/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c21abeb..f68623d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -505,6 +505,7 @@
<quartz2-version>2.2.3</quartz2-version>
<quickfixj-version>1.6.3</quickfixj-version>
<rabbitmq-amqp-client-version>4.0.2</rabbitmq-amqp-client-version>
+ <reactive-streams-version>1.0.0</reactive-streams-version>
<reactor-version>3.0.4.RELEASE</reactor-version>
<reflections-bundle-version>0.9.10_3</reflections-bundle-version>
<regexp-bundle-version>1.4_1</regexp-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/aa629b28/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 20d52f5..c9ec945 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1469,6 +1469,10 @@
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle>mvn:org.apache.camel/camel-rabbitmq/${project.version}</bundle>
</feature>
+ <feature name='camel-reactive-streams' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
+ </feature>
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/aa629b28/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
new file mode 100644
index 0000000..ad395f2
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+@Ignore("Not installing")
+public class CamelReactiveStreamsTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelReactiveStreamsTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/aa629b28/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelReactiveStreamsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelReactiveStreamsTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelReactiveStreamsTest.java
new file mode 100644
index 0000000..05c9f6c
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelReactiveStreamsTest.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.apache.camel.itest.springboot.util.DependencyResolver;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelReactiveStreamsTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelReactiveStreamsTest.class))
+ .unitTestExclusionPattern(".*(\\.tck\\..*)")
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ this.runComponentTest(config);
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/aa629b28/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LocationUtils.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LocationUtils.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LocationUtils.java
index ad23eec..0d564df 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LocationUtils.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LocationUtils.java
@@ -32,7 +32,7 @@ public final class LocationUtils {
try {
File root = new File(".").getCanonicalFile();
while (root != null) {
- File[] names = root.listFiles(pathname -> pathname.getName().equals("components-starter"));
+ File[] names = root.listFiles(pathname -> pathname.getName().equals("camel-core"));
if (names != null && names.length == 1) {
break;
}
[18/24] camel git commit: Upgrade Chronicle Engine to version 1.13.25
Posted by da...@apache.org.
Upgrade Chronicle Engine to version 1.13.25
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed90ca50
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed90ca50
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed90ca50
Branch: refs/heads/mention
Commit: ed90ca50f83a5c637930486c2191225d2c8d9b5a
Parents: b8d1b0d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:08:03 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:08:03 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ed90ca50/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ad996e..94ff059 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
<cglib-version>3.2.4</cglib-version>
<chronicle-bytes-version>1.7.33</chronicle-bytes-version>
<chronicle-core-version>1.7.15</chronicle-core-version>
- <chronicle-engine-version>1.13.21</chronicle-engine-version>
+ <chronicle-engine-version>1.13.25</chronicle-engine-version>
<chronicle-map-version>2.4.15</chronicle-map-version>
<chronicle-network-version>1.7.12</chronicle-network-version>
<chronicle-queue-version>4.5.25</chronicle-queue-version>
[11/24] camel git commit: Upgrade Kubernetes client to version 1.4.35
Posted by da...@apache.org.
Upgrade Kubernetes client to version 1.4.35
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc8edc36
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc8edc36
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc8edc36
Branch: refs/heads/mention
Commit: dc8edc3682a0e961458fe76766855cae73673251
Parents: 9b90639
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 09:54:53 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 09:54:53 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dc8edc36/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d35ab2c..2a44f73 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -388,7 +388,7 @@
<karaf4-version>4.0.8</karaf4-version>
<kie-version>6.5.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
- <kubernetes-client-version>1.4.34</kubernetes-client-version>
+ <kubernetes-client-version>1.4.35</kubernetes-client-version>
<kubernetes-model-version>1.0.66</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[16/24] camel git commit: Upgrade Chronicle Queue to version 4.5.25
Posted by da...@apache.org.
Upgrade Chronicle Queue to version 4.5.25
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2f9f921
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2f9f921
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2f9f921
Branch: refs/heads/mention
Commit: a2f9f921ae8b2eb7ea04cea06729c44eb700a4b7
Parents: 042a71f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:06:52 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:06:52 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a2f9f921/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 19764b4..eec2a3c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,7 +107,7 @@
<chronicle-engine-version>1.13.21</chronicle-engine-version>
<chronicle-map-version>2.4.15</chronicle-map-version>
<chronicle-network-version>1.7.12</chronicle-network-version>
- <chronicle-queue-version>4.5.24</chronicle-queue-version>
+ <chronicle-queue-version>4.5.25</chronicle-queue-version>
<chronicle-threads-version>1.7.6</chronicle-threads-version>
<chronicle-wire-version>1.7.24</chronicle-wire-version>
<chunk-templates-version>3.2.4</chunk-templates-version>
[14/24] camel git commit: Upgrade Chronicle Wire to version 1.7.24
Posted by da...@apache.org.
Upgrade Chronicle Wire to version 1.7.24
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5d8b39ca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5d8b39ca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5d8b39ca
Branch: refs/heads/mention
Commit: 5d8b39ca9475ad8bc9b6e197d2702670d6eafe84
Parents: ab62495
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:05:49 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:05:49 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5d8b39ca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 036c0c7..9086c85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -109,7 +109,7 @@
<chronicle-network-version>1.7.11</chronicle-network-version>
<chronicle-queue-version>4.5.24</chronicle-queue-version>
<chronicle-threads-version>1.7.6</chronicle-threads-version>
- <chronicle-wire-version>1.7.23</chronicle-wire-version>
+ <chronicle-wire-version>1.7.24</chronicle-wire-version>
<chunk-templates-version>3.2.4</chunk-templates-version>
<chunk-templates-bundle-version>3.2.4_1</chunk-templates-bundle-version>
<classmate-version>1.3.3</classmate-version>
[04/24] camel git commit: CAMEL-10612: better doc (spring-boot)
Posted by da...@apache.org.
CAMEL-10612: better doc (spring-boot)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/44766f56
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/44766f56
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/44766f56
Branch: refs/heads/mention
Commit: 44766f565bfc18bc07e89e5584b76d6711aebcab
Parents: 8307841
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Feb 6 01:18:30 2017 +0100
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Feb 6 10:49:28 2017 +0100
----------------------------------------------------------------------
.../src/main/docs/reactive-streams-component.adoc | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/44766f56/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
index f720992..b351017 100644
--- a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
+++ b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
@@ -375,6 +375,24 @@ The number of concurrent consumers (threads) can also be set as endpoint option
When using 1 consumer (the default), the order of items in the source stream is maintained.
When this value is increased, items will be processed concurrently by multiple threads (so not preserving the order).
+
+### Camel Reactive Streams Starter
+
+A starter module is available to spring-boot users. When using the starter,
+the `CamelReactiveStreamsService` can be directly injected into Spring components.
+
+To use the starter, add the following to your spring boot pom.xml file:
+
+[source,xml]
+------------------------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams-starter</artifactId>
+ <version>${camel.version}</version> <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------
+
+
### See Also
* link:configuring-camel.html[Configuring Camel]
[12/24] camel git commit: Remove servlet-api from camel-kubernetes
feature as not needed
Posted by da...@apache.org.
Remove servlet-api from camel-kubernetes feature as not needed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/056b51f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/056b51f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/056b51f5
Branch: refs/heads/mention
Commit: 056b51f5166cbb1eb2117216d7a7966d1240b726
Parents: dc8edc3
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:02:55 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:02:55 2017 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/056b51f5/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ba64ee9..225e749 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1131,7 +1131,6 @@
<feature name='camel-kubernetes' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
[22/24] camel git commit: Upgrade Kubernetes client to 2.0.0
Posted by da...@apache.org.
Upgrade Kubernetes client to 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01204f81
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01204f81
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01204f81
Branch: refs/heads/mention
Commit: 01204f8183f40214e509c573abc750b4b9745eae
Parents: 9730e82
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 13:42:45 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 13:42:45 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/01204f81/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 42b6f7e..1245192 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -388,7 +388,7 @@
<karaf4-version>4.0.8</karaf4-version>
<kie-version>6.5.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
- <kubernetes-client-version>1.4.35</kubernetes-client-version>
+ <kubernetes-client-version>2.0.0</kubernetes-client-version>
<kubernetes-model-version>1.0.66</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[23/24] camel git commit: CAMEL-10797: Create endpoint from uri
without context-path
Posted by da...@apache.org.
CAMEL-10797: Create endpoint from uri without context-path
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bb7dcb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bb7dcb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bb7dcb6
Branch: refs/heads/mention
Commit: 4bb7dcb615c5e3eaf252012eab6df85b0861d57e
Parents: 01204f8
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 7 13:27:05 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 7 13:58:58 2017 +0100
----------------------------------------------------------------------
.../apache/camel/impl/DefaultCamelContext.java | 27 ++++++++++++++++++++
.../org/apache/camel/impl/DefaultComponent.java | 9 ++++++-
.../camel/impl/DefaultCamelContextTest.java | 11 ++++++--
3 files changed, 44 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4bb7dcb6/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 67f77ea..707366d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -628,6 +628,33 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
log.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
}
+ if (answer == null && splitURI[1] == null) {
+ // the uri has no context-path which is rare and it was not referring to an endpoint in the registry
+ // so try to see if it can be created by a component
+
+ int pos = uri.indexOf('?');
+ String componentName = pos > 0 ? uri.substring(0, pos) : uri;
+
+ Component component = getComponent(componentName);
+
+ // Ask the component to resolve the endpoint.
+ if (component != null) {
+ log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+
+ // Have the component create the endpoint if it can.
+ if (component.useRawUri()) {
+ answer = component.createEndpoint(rawUri);
+ } else {
+ answer = component.createEndpoint(uri);
+ }
+
+ if (answer != null && log.isDebugEnabled()) {
+ log.debug("{} converted to endpoint: {} by component: {}", new Object[]{URISupport.sanitizeUri(uri), answer, component});
+ }
+ }
+
+ }
+
if (answer != null) {
addService(answer);
answer = addEndpointToRegistry(uri, answer);
http://git-wip-us.apache.org/repos/asf/camel/blob/4bb7dcb6/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
index a2c18b9..7b5b31e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
@@ -65,7 +65,14 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
// check URI string to the unsafe URI characters
String encodedUri = preProcessUri(uri);
URI u = new URI(encodedUri);
- String path = URISupport.extractRemainderPath(u, useRawUri());
+ String path;
+ if (u.getScheme() != null) {
+ // if there is a scheme then there is also a path
+ path = URISupport.extractRemainderPath(u, useRawUri());
+ } else {
+ // this uri has no context-path as the leading text is the component name (scheme)
+ path = null;
+ }
Map<String, Object> parameters;
if (useRawUri()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4bb7dcb6/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
index b0fc1c4..4a8e84b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
@@ -111,6 +111,13 @@ public class DefaultCamelContextTest extends TestSupport {
}
}
+ public void testGetEndpointNoScheme() throws Exception {
+ DefaultCamelContext ctx = new DefaultCamelContext();
+ ctx.disableJMX();
+ Endpoint endpoint = ctx.getEndpoint("log");
+ assertNotNull(endpoint);
+ }
+
public void testGetEndPointByTypeUnknown() {
DefaultCamelContext camelContext = new DefaultCamelContext();
try {
@@ -159,11 +166,11 @@ public class DefaultCamelContextTest extends TestSupport {
}
}
- public void testGetEndpointNoScheme() throws Exception {
+ public void testGetEndpointUnknownComponentNoScheme() throws Exception {
DefaultCamelContext ctx = new DefaultCamelContext();
ctx.disableJMX();
try {
- CamelContextHelper.getMandatoryEndpoint(ctx, "log.foo");
+ CamelContextHelper.getMandatoryEndpoint(ctx, "unknownname");
fail("Should have thrown a NoSuchEndpointException");
} catch (NoSuchEndpointException e) {
// expected
[15/24] camel git commit: Upgrade Chronicle Network to version 1.7.12
Posted by da...@apache.org.
Upgrade Chronicle Network to version 1.7.12
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/042a71f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/042a71f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/042a71f2
Branch: refs/heads/mention
Commit: 042a71f2c31e7051e95892ba03465847ccbb72e8
Parents: 5d8b39c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:06:23 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:06:23 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/042a71f2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9086c85..19764b4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
<chronicle-core-version>1.7.14</chronicle-core-version>
<chronicle-engine-version>1.13.21</chronicle-engine-version>
<chronicle-map-version>2.4.15</chronicle-map-version>
- <chronicle-network-version>1.7.11</chronicle-network-version>
+ <chronicle-network-version>1.7.12</chronicle-network-version>
<chronicle-queue-version>4.5.24</chronicle-queue-version>
<chronicle-threads-version>1.7.6</chronicle-threads-version>
<chronicle-wire-version>1.7.24</chronicle-wire-version>
[13/24] camel git commit: Upgrade Chronicle Bytes to version 1.7.33
Posted by da...@apache.org.
Upgrade Chronicle Bytes to version 1.7.33
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab624951
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab624951
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab624951
Branch: refs/heads/mention
Commit: ab624951d75591e2e40de3ed01a1ab78b69feed0
Parents: 056b51f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:05:21 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:05:21 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ab624951/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a44f73..036c0c7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
<cdi-api-2.0-version>2.0.Beta1</cdi-api-2.0-version>
<cglib-bundle-version>3.2.4_1</cglib-bundle-version>
<cglib-version>3.2.4</cglib-version>
- <chronicle-bytes-version>1.7.32</chronicle-bytes-version>
+ <chronicle-bytes-version>1.7.33</chronicle-bytes-version>
<chronicle-core-version>1.7.14</chronicle-core-version>
<chronicle-engine-version>1.13.21</chronicle-engine-version>
<chronicle-map-version>2.4.15</chronicle-map-version>
[05/24] camel git commit: CAMEL-10612: fixed osgi compatibility
Posted by da...@apache.org.
CAMEL-10612: fixed osgi compatibility
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e3ef759
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e3ef759
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e3ef759
Branch: refs/heads/mention
Commit: 6e3ef759e143fcc0b78d2cfc94685412d105b29c
Parents: aa629b2
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Feb 6 11:21:12 2017 +0100
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Feb 6 11:21:12 2017 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 1 +
.../org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6e3ef759/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c9ec945..ba64ee9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1472,6 +1472,7 @@
<feature name='camel-reactive-streams' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-reactive-streams/${project.version}</bundle>
</feature>
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/6e3ef759/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
index ad395f2..108409a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
@@ -16,13 +16,11 @@
*/
package org.apache.camel.itest.karaf;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("Not installing")
public class CamelReactiveStreamsTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelReactiveStreamsTest.class);
[21/24] camel git commit: Upgrade Brave Zipkin to version 4.0.6
Posted by da...@apache.org.
Upgrade Brave Zipkin to version 4.0.6
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9730e829
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9730e829
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9730e829
Branch: refs/heads/mention
Commit: 9730e82923165e1b00ac4f22643ae2fc6c521184
Parents: 01c94eb
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 11:27:55 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 11:27:55 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9730e829/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 94ff059..42b6f7e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,7 +84,7 @@
<bouncycastle-version>1.55</bouncycastle-version>
<boxjavalibv2.version>3.2.1</boxjavalibv2.version>
<braintree-gateway-version>2.63.0</braintree-gateway-version>
- <brave-zipkin-version>4.0.5</brave-zipkin-version>
+ <brave-zipkin-version>4.0.6</brave-zipkin-version>
<build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.2</c3p0-version>
<caffeine-version>2.3.5</caffeine-version>
[17/24] camel git commit: Upgrade Chronicle Core to version 1.7.15
Posted by da...@apache.org.
Upgrade Chronicle Core to version 1.7.15
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b8d1b0d5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b8d1b0d5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b8d1b0d5
Branch: refs/heads/mention
Commit: b8d1b0d5a7e9e21d01a5756d49b62f6c175a8e50
Parents: a2f9f92
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 7 10:07:36 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 7 10:07:36 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b8d1b0d5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eec2a3c..6ad996e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,7 +103,7 @@
<cglib-bundle-version>3.2.4_1</cglib-bundle-version>
<cglib-version>3.2.4</cglib-version>
<chronicle-bytes-version>1.7.33</chronicle-bytes-version>
- <chronicle-core-version>1.7.14</chronicle-core-version>
+ <chronicle-core-version>1.7.15</chronicle-core-version>
<chronicle-engine-version>1.13.21</chronicle-engine-version>
<chronicle-map-version>2.4.15</chronicle-map-version>
<chronicle-network-version>1.7.12</chronicle-network-version>