[camel] branch master updated: CAMEL-12564: Fixed examples build
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1e24cc0 CAMEL-12564: Fixed examples build
1e24cc0 is described below
commit 1e24cc0eb1a4cc235860a05ef1c10986d7e0d54b
Author: Dmitry Volodin
AuthorDate: Tue Jun 12 08:51:31 2018 +0300
CAMEL-12564: Fixed examples build
---
.../hello-camel-grpc-client-kubernetes/pom.xml | 298 +++--
.../hello-camel-grpc-server-kubernetes/pom.xml | 298 +++--
2 files changed, 301 insertions(+), 295 deletions(-)
diff --git
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
index b454a88..10eefb4 100644
---
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
+++
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
@@ -1,162 +1,166 @@
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- 4.0.0
+
-
-
-
- org.springframework.boot
-
spring-boot-dependencies
- ${spring.boot-version}
- pom
- import
-
-
- org.apache.camel
- camel-parent
- ${project.version}
- pom
- import
-
-
-
+-->
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ 4.0.0
-
+
+org.apache.camel.example
+camel-example-grpc-kubernetes
+2.22.0-SNAPSHOT
+
-
-
- org.apache.camel
- camel-spring-boot-starter
-
-
- org.apache.camel
- camel-grpc-starter
-
+ camel-example-hello-grpc-client-kubernetes
+ Camel :: Example :: gRPC :: Hello Camel Client Kubernetes
+ An example showing the Camel Grpc component with Spring Boot
runnning on Kubernetes
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.apache.camel
- camel-test
- test
-
-
+
+Cloud
+${spring-boot-version}
+
-
-
-
- kr.motd.maven
- os-maven-plugin
- 1.5.0.Final
-
-
-
-
- org.springframework.boot
-
spring-boot-maven-plugin
- ${spring.boot-version}
-
-
-
- repackage
-
-
-
-
-
- org.xolstice.maven.plugins
- protobuf-maven-plugin
-
${protobuf-maven-plugin-version}
-
-
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
- grpc-java
-
io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}
-
-
-
-
- compile
-
compile-custom
-
-
-
-
-
-
+
+
+
+
+org.springframework.boot
+spring-boot-dependencies
+${spring.boot-version}
+pom
+impo
[camel] branch master updated: Updated the first version of camel-as2
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a9342af Updated the first version of camel-as2
a9342af is described below
commit a9342af301c00b81ff99211c8cc6dffd254390c0
Author: Willem Jiang
AuthorDate: Tue Jun 12 12:35:19 2018 +0800
Updated the first version of camel-as2
---
.../src/main/java/org/apache/camel/component/as2/AS2Endpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
index 5fbed2c..b03d0a5 100644
---
a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
+++
b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
@@ -43,7 +43,7 @@ import
org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* Component used for transferring data secure and reliable over the internet
using the AS2 protocol.
*/
-@UriEndpoint(scheme = "as2", firstVersion = "2.20.0", title = "AS2", syntax =
"as2:name", consumerClass = AS2Consumer.class, label = "AS2")
+@UriEndpoint(scheme = "as2", firstVersion = "2.22.0", title = "AS2", syntax =
"as2:name", consumerClass = AS2Consumer.class, label = "AS2")
public class AS2Endpoint extends AbstractApiEndpoint {
@UriPath @Metadata(required = "true")
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[camel] branch master updated (32c76c5 -> f480c09)
This is an automated email from the ASF dual-hosted git repository. dmvolod pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 32c76c5 CAMEL-11595: Fixed javadoc and removed references to deprecated wording "FixedWidthFieldLengths" new 5d61513 CAMEL-12564: camel-grpc: Bump to version 1.12.0 new f480c09 CAMEL-12564: cleanup tests 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-grpc/pom.xml | 6 ++ .../apache/camel/component/grpc/GrpcConsumerAggregationTest.java | 4 ++-- .../apache/camel/component/grpc/GrpcConsumerConcurrentTest.java| 4 ++-- .../apache/camel/component/grpc/GrpcConsumerPropagationTest.java | 4 ++-- .../org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java | 4 ++-- .../org/apache/camel/component/grpc/GrpcProducerAsyncTest.java | 2 -- .../org/apache/camel/component/grpc/GrpcProducerSecurityTest.java | 2 +- .../org/apache/camel/component/grpc/GrpcProducerStreamingTest.java | 2 -- .../java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java | 4 parent/pom.xml | 7 --- platforms/karaf/features/src/main/resources/features.xml | 2 +- 11 files changed, 20 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact dmvo...@apache.org.
[camel] 01/02: CAMEL-12564: camel-grpc: Bump to version 1.12.0
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5d61513e441c609c9123a83722f26484019212ca
Author: Dmitry Volodin
AuthorDate: Tue Jun 12 01:34:52 2018 +0300
CAMEL-12564: camel-grpc: Bump to version 1.12.0
---
components/camel-grpc/pom.xml| 6 ++
parent/pom.xml | 7 ---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 906b3e9..22f03e2 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -70,6 +70,12 @@
javassist
${javassist-version}
+
+
+ com.google.guava
+ guava
+ ${grpc-guava-version}
+
io.netty
diff --git a/parent/pom.xml b/parent/pom.xml
index 0363ec4..bc1691f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -269,12 +269,13 @@
17.0
0.30
2.3.25
-1.10.1
+1.12.0
0.9.0
+20.0
3.2.0
2.0.7.Final
-1.10.1_1
-2.1.3
+1.12.0_1
+2.2.0
2.8.5
4.0
3.0
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index d88a9e8..e3dc893 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -846,7 +846,7 @@
mvn:io.netty/netty-resolver/${netty-version}
mvn:io.netty/netty-transport/${netty-version}
mvn:io.netty/netty-tcnative-boringssl-static/${grpc-netty-tcnative-boringssl-static-version}
-mvn:com.google.guava/guava/${google-guava-version}
+mvn:com.google.guava/guava/${grpc-guava-version}
wrap:mvn:com.google.errorprone/error_prone_annotations/${grpc-errorprone-version}
mvn:org.javassist/javassist/${javassist-version}
--
To stop receiving notification emails like this one, please contact
dmvo...@apache.org.
[camel] 02/02: CAMEL-12564: cleanup tests
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f480c096f993de0da5466b463f59f796fe250d26
Author: Dmitry Volodin
AuthorDate: Tue Jun 12 01:45:01 2018 +0300
CAMEL-12564: cleanup tests
---
.../org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java | 4 ++--
.../org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java | 4 ++--
.../org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java | 4 ++--
.../org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java | 4 ++--
.../java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java | 2 --
.../org/apache/camel/component/grpc/GrpcProducerSecurityTest.java | 2 +-
.../org/apache/camel/component/grpc/GrpcProducerStreamingTest.java| 2 --
.../java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java| 4
8 files changed, 9 insertions(+), 17 deletions(-)
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
index 54506e1..f96e2fc 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
@@ -50,8 +50,8 @@ public class GrpcConsumerAggregationTest extends
CamelTestSupport {
@Before
public void startGrpcChannels() {
-syncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext(true).build();
-asyncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext(true).build();
+syncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build();
+asyncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build();
blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel);
nonBlockingStub = PingPongGrpc.newStub(syncRequestChannel);
asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel);
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
index 3bf1507..482b6ec 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
@@ -63,7 +63,7 @@ public class GrpcConsumerConcurrentTest extends
CamelTestSupport {
@Override
public void run() {
final CountDownLatch latch = new CountDownLatch(1);
-ManagedChannel asyncRequestChannel =
NettyChannelBuilder.forAddress("localhost",
GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext(true).build();
+ManagedChannel asyncRequestChannel =
NettyChannelBuilder.forAddress("localhost",
GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build();
PingPongGrpc.PingPongStub asyncNonBlockingStub =
PingPongGrpc.newStub(asyncRequestChannel);
PongResponseStreamObserver responseObserver = new
PongResponseStreamObserver(latch);
@@ -102,7 +102,7 @@ public class GrpcConsumerConcurrentTest extends
CamelTestSupport {
int instanceId = createId();
final CountDownLatch latch = new CountDownLatch(1);
ManagedChannel asyncRequestChannel =
NettyChannelBuilder.forAddress("localhost",
GRPC_HEADERS_TEST_PORT).userAgent(GRPC_USER_AGENT_PREFIX + instanceId)
-.usePlaintext(true).build();
+.usePlaintext().build();
PingPongGrpc.PingPongStub asyncNonBlockingStub =
PingPongGrpc.newStub(asyncRequestChannel);
PongResponseStreamObserver responseObserver = new
PongResponseStreamObserver(latch);
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
index 46ebf04..a7537d9 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
@@ -48,8 +48,8 @@ public class GrpcConsumerPropagationTest extends
CamelTestSupport {
@Before
public void startGrpcChannels() {
-asyncOnNextChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_ASYNC_NEXT_REQUEST_TEST_PORT).usePlaintext(true).build();
-
[camel] branch master updated: CAMEL-11595: Fixed javadoc and removed references to deprecated wording "FixedWidthFieldLengths"
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 32c76c5 CAMEL-11595: Fixed javadoc and removed references to deprecated wording "FixedWidthFieldLengths" 32c76c5 is described below commit 32c76c57c645f6755f06127eb7f89a41ff348c76 Author: aldettinger AuthorDate: Mon Jun 11 21:59:09 2018 +0200 CAMEL-11595: Fixed javadoc and removed references to deprecated wording "FixedWidthFieldLengths" --- .../dataformat/univocity/AbstractUniVocityDataFormat.java | 4 ++-- .../univocity/UniVocityFixedWidthDataFormat.java | 14 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/AbstractUniVocityDataFormat.java b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/AbstractUniVocityDataFormat.java index 8a7c4fa..3266cd6 100644 --- a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/AbstractUniVocityDataFormat.java +++ b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/AbstractUniVocityDataFormat.java @@ -70,7 +70,7 @@ public abstract class AbstractUniVocityDataFormat marshaller; // We're using a ThreadLocal for the parser settings because in order to retrieve the headers we need to change the -// settings each time we're parsing... +// settings each time we're parsing private volatile ThreadLocal parserSettings; private final Object parserSettingsToken = new Object(); private volatile Unmarshaller unmarshaller; @@ -312,7 +312,7 @@ public abstract class AbstractUniVocityDataFormat
[camel] branch master updated: CAMEL-12569: service call : create a dns+srv resolver for kubernetes
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4b0fbda CAMEL-12569: service call : create a dns+srv resolver for
kubernetes
4b0fbda is described below
commit 4b0fbdabbca3f38fd03929f20b41725ba3ca82b8
Author: lburgazzoli
AuthorDate: Mon Jun 11 14:48:55 2018 +0200
CAMEL-12569: service call : create a dns+srv resolver for kubernetes
---
.gitignore | 1 +
...esServiceCallServiceDiscoveryConfiguration.java | 61 +++--
.../src/main/docs/kubernetes-component.adoc| 3 +-
.../docs/kubernetes-config-maps-component.adoc | 3 +-
.../docs/kubernetes-deployments-component.adoc | 3 +-
.../main/docs/kubernetes-namespaces-component.adoc | 3 +-
.../src/main/docs/kubernetes-nodes-component.adoc | 3 +-
...rnetes-persistent-volumes-claims-component.adoc | 3 +-
.../kubernetes-persistent-volumes-component.adoc | 3 +-
.../src/main/docs/kubernetes-pods-component.adoc | 3 +-
...bernetes-replication-controllers-component.adoc | 3 +-
.../docs/kubernetes-resources-quota-component.adoc | 3 +-
.../main/docs/kubernetes-secrets-component.adoc| 3 +-
.../kubernetes-service-accounts-component.adoc | 3 +-
.../main/docs/kubernetes-services-component.adoc | 3 +-
.../docs/openshift-build-configs-component.adoc| 3 +-
.../src/main/docs/openshift-builds-component.adoc | 3 +-
.../kubernetes/KubernetesConfiguration.java| 14 ++
.../cloud/KubernetesClientServiceDiscovery.java| 23 +++-
.../cloud/KubernetesDnsServiceDiscovery.java | 21 ++-
.../cloud/KubernetesDnsSrvServiceDiscovery.java| 146 +
.../cloud/KubernetesEnvServiceDiscovery.java | 5 +
.../cloud/KubernetesServiceDiscovery.java | 37 +-
.../cloud/KubernetesServiceDiscoveryFactory.java | 18 +++
...iceCallServiceDiscoveryConfigurationCommon.java | 29 +++-
...netesServiceDiscoveryAutoConfigurationTest.java | 80 ++-
26 files changed, 407 insertions(+), 73 deletions(-)
diff --git a/.gitignore b/.gitignore
index 79c9cc9..67a1214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ components/camel-solr/data
.factorypath
.pmd
.sts4-cache
+log-camel-lsp.out
diff --git
a/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
b/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
index 0aa9cbe..b26df06 100644
---
a/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
+++
b/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
@@ -29,8 +29,12 @@ import org.apache.camel.spi.Metadata;
public class KubernetesServiceCallServiceDiscoveryConfiguration extends
ServiceCallServiceDiscoveryConfiguration {
@XmlAttribute @Metadata(defaultValue = "environment", enums =
"environment,dns,client")
private String lookup = "environment";
-@XmlAttribute
+@XmlAttribute @Metadata(label = "dns,dnssrv")
private String dnsDomain;
+@XmlAttribute @Metadata(label = "dns,dnssrv")
+private String portName;
+@XmlAttribute @Metadata(label = "dns,dnssrv")
+private String portProtocol = "tcp";
@XmlAttribute
private String namespace;
@XmlAttribute
@@ -117,7 +121,9 @@ public class
KubernetesServiceCallServiceDiscoveryConfiguration extends ServiceC
* When using client, then the client queries the kubernetes master to
obtain a list
* of active pods that provides the service, and then random (or round
robin) select a pod.
*
- * When using dns the service name is resolved as
name.namespace.service.dnsDomain.
+ * When using dns the service name is resolved as
name.namespace.svc.dnsDomain.
+ *
+ * When using dnssrv the service name is resolved with SRV query for
_._...svc...
*
* When using environment then environment variables are used to lookup
the service.
*
@@ -138,6 +144,28 @@ public class
KubernetesServiceCallServiceDiscoveryConfiguration extends ServiceC
this.dnsDomain = dnsDomain;
}
+public String getPortName() {
+return portName;
+}
+
+/**
+ * Sets the Port Name to use for DNS/DNSSRV lookup.
+ */
+public void setPortName(String portName) {
+this.portName = portName;
+}
+
+public String getPortProtocol() {
+return portProtocol;
+}
+
+/**
+ * Sets the Port Protocol to use for DNS/DNSSRV lookup.
+ */
+public void setPortProtocol(String portProtocol) {
+this.portProtocol = portProtocol;
+}
+
public String getUsername() {
return username;
}
@@ -
[camel] branch master updated: Upgrade Artemis to version 2.6.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 6db523b Upgrade Artemis to version 2.6.1 6db523b is described below commit 6db523b07fff133625d60371d60b70871ef8ca45 Author: Andrea Cosentino AuthorDate: Mon Jun 11 13:27:43 2018 +0200 Upgrade Artemis to version 2.6.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5b63fd2..0363ec4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ 1.1.3 5.15.4 -2.6.0 +2.6.1 1.0.2.v20150114 2.4.9 1.7.0_6 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
svn commit: r1031043 - in /websites/production/camel/content: cache/main.pageCache camel-2220-release.html
Author: buildbot Date: Mon Jun 11 10:20:27 2018 New Revision: 1031043 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2220-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2220-release.html == --- websites/production/camel/content/camel-2220-release.html (original) +++ websites/production/camel/content/camel-2220-release.html Mon Jun 11 10:20:27 2018 @@ -94,7 +94,7 @@ -New and NoteworthyWelcome to the 2.22.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially su pport Karaf 4.2 in this release.Optimised using toD DSL to reuse endpoints and producers for components where its possible. For example HTTP based components will now reuse producer (http clients) with dynamic uris sending to the same host. See more details in the https://github.com/apache/camel/blob/master/camel-core/src/main/docs/eips/toD-eip.adoc"; rel="nofollow">toD documentation.The File2 consumer with read-lock idempotent/idempotent-changed can now be configured to delay the release tasks to expand the window when a file is regarded as in-process, which is usable in active/active cluster settings with a shared idempotent repository to ensure other nodes dont too quickly see a processed file as a file they can process (only needed if you have readLockRemoveOnCommit=true).Allow to plugin a custom request/reply correlation id manager implementation on Netty4 producer in request/reply mode.The Twitter component now uses extended mode by default to support tweets > 140 charactersRest DSL producer now supports being configured in rest configuration via endpointProperties.The Kafka component now supports HeaderFilterStrategy to plugin custom implementations for controlling header mappings between Camel and Kafka messages.Rest DSL now supports client request validation to validate that Content-Type/Accept headers is possible for the rest service.Camel has now a https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/camel/cloud/ServiceRegistry.java"; rel="nofollow">Service Registry SPI which allow to re gister routes to a service registry such as consul, etcd, zookeeper using a Camel implementation or Spring CloudThe SEDA component now has a default queue size of 1000 instead of unlimited. And these important fixes:Fixed a CXF continuation timeout issue with camel-cxf consumer could cause the consumer to return a response with data instead of triggering a timeout to the calling SOAP client.Fixed camel-cxf consumer doesn't release UoW when using robust oneway operationFixed using AdviceWith and using weave methods on onException etc. not working. Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call.Fixed Kafka consumer to not auto commit if autoCommitEnable=false.Fixed file consumer was using markerFile as read-lock by default, which should have been none. Fixed using manual commit with Kafka to provide the current record offset and not the previous (and -1 for first)Fixed Content Based Router in Java DSL may not resolve property placeholders in when predicatesNew Enterprise Integration PatternsNew Componentscamel-as2 - Component used for transferring data secure and reliable over the internet using the AS2 protocolcamel-mybatis - Now has a mybatis-bean component that supports using MyBatis annotations on POJO beans to specify the SQL queries and mappings.camel-web3j - The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories.New DSLNew AnnotationsNew Data FormatsNew LanguagesAPI breakingThe RestProducerFactory has an API change where the RestConfiguration is provided as parameter as well.Known IssuesImportant changes to consider when upgradingCamel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to SB2 may require change s, see the Spring Boot v1 to v2 migration documentation for details.Upgraded to Spring Framework v5 as default. Support for Spring Framework v4.3 is deprecated and not recommended to be used.Up
[camel] branch camel-2.21.x updated: [CAMEL-12570] Upgrade to blueprint.core 1.10.0, blueprint.cm 1.3.0, aries.proxy 1.1.1
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.21.x by this push:
new 898e86d [CAMEL-12570] Upgrade to blueprint.core 1.10.0, blueprint.cm
1.3.0, aries.proxy 1.1.1
898e86d is described below
commit 898e86dae59013363324fd6779aded8bd4a60173
Author: Grzegorz Grzybek
AuthorDate: Mon Jun 11 11:45:17 2018 +0200
[CAMEL-12570] Upgrade to blueprint.core 1.10.0, blueprint.cm 1.3.0,
aries.proxy 1.1.1
(cherry picked from commit dfe8eeaa55a4ea2b792b9541706a06d67bbd)
---
.../camel/blueprint/BlueprintPropertiesParser.java | 84 +++---
components/camel-test-blueprint/pom.xml| 7 +-
parent/pom.xml | 8 +--
3 files changed, 80 insertions(+), 19 deletions(-)
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
index d16762a..e3b17b5 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
@@ -26,7 +26,9 @@ import java.util.Set;
import org.apache.aries.blueprint.ExtendedBeanMetadata;
import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder;
+import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholderExt;
import org.apache.aries.blueprint.ext.PropertyPlaceholder;
+import org.apache.aries.blueprint.ext.PropertyPlaceholderExt;
import org.apache.camel.component.properties.DefaultPropertiesParser;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
@@ -47,8 +49,9 @@ public class BlueprintPropertiesParser extends
DefaultPropertiesParser {
private final PropertiesComponent propertiesComponent;
private final BlueprintContainer container;
private final PropertiesParser delegate;
-private final Set placeholders = new
LinkedHashSet();
+private final Set placeholders = new
LinkedHashSet();
private Method method;
+private Method oldMethod;
public BlueprintPropertiesParser(PropertiesComponent propertiesComponent,
BlueprintContainer container, PropertiesParser delegate) {
super(propertiesComponent);
@@ -71,7 +74,8 @@ public class BlueprintPropertiesParser extends
DefaultPropertiesParser {
ComponentMetadata meta = container.getComponentMetadata(id);
if (meta instanceof ExtendedBeanMetadata) {
Class clazz = ((ExtendedBeanMetadata)
meta).getRuntimeClass();
-if (clazz != null &&
AbstractPropertyPlaceholder.class.isAssignableFrom(clazz)) {
+if (clazz != null &&
(AbstractPropertyPlaceholder.class.isAssignableFrom(clazz)
+||
AbstractPropertyPlaceholderExt.class.isAssignableFrom(clazz))) {
ids.add(id);
}
}
@@ -88,15 +92,16 @@ public class BlueprintPropertiesParser extends
DefaultPropertiesParser {
public void addPropertyPlaceholder(String id) {
Object component = container.getComponentInstance(id);
-if (component instanceof AbstractPropertyPlaceholder) {
-AbstractPropertyPlaceholder placeholder =
(AbstractPropertyPlaceholder) component;
-placeholders.add(placeholder);
+// new API
+if (component instanceof AbstractPropertyPlaceholderExt) {
+AbstractPropertyPlaceholderExt placeholder =
(AbstractPropertyPlaceholderExt) component;
+placeholders.add(new
AbstractPropertyPlaceholderExtWrapper(placeholder));
log.debug("Adding Blueprint PropertyPlaceholder: {}", id);
if (method == null) {
try {
-method =
AbstractPropertyPlaceholder.class.getDeclaredMethod("retrieveValue",
String.class);
+method =
AbstractPropertyPlaceholderExt.class.getDeclaredMethod("retrieveValue",
String.class);
method.setAccessible(true);
} catch (NoSuchMethodException e) {
throw new IllegalStateException("Cannot add blueprint
property placeholder: " + id
@@ -104,6 +109,24 @@ public class BlueprintPropertiesParser extends
DefaultPropertiesParser {
}
}
}
+
+// old, deprecated API
+if (component instanceof AbstractPropertyPlaceholder) {
+AbstractPropertyPlaceholder placeholder =
(AbstractPropertyPlaceholder) component;
+placeholders.add(new
AbstractPropertyPlaceholderWrapper(placeholder));
+
+log.debug("Adding Blueprint PropertyPlaceholder: {}", id);
+
+
[camel] branch master updated (5b6d16e -> 6c6b3b0)
This is an automated email from the ASF dual-hosted git repository. ggrzybek pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 5b6d16e CAMEL-12473 - Use Counter in Caffeine's dropwizard metrics add dfe8111 [CAMEL-12570] Upgrade to blueprint.core 1.10.0, blueprint.cm 1.3.0, aries.proxy 1.1.1 new 6c6b3b0 Merge pull request #2369 from grgrzybek/CAMEL-12570-master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/blueprint/BlueprintPropertiesParser.java | 84 +++--- components/camel-test-blueprint/pom.xml| 7 +- parent/pom.xml | 8 +-- 3 files changed, 80 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact ggrzy...@apache.org.
[camel] 01/01: Merge pull request #2369 from grgrzybek/CAMEL-12570-master
This is an automated email from the ASF dual-hosted git repository. ggrzybek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 6c6b3b0647e1d8558a7e73af17410f7ddc15bea5 Merge: 5b6d16e dfe8111 Author: Grzegorz Grzybek AuthorDate: Mon Jun 11 11:57:08 2018 +0200 Merge pull request #2369 from grgrzybek/CAMEL-12570-master [CAMEL-12570] Upgrade to blueprint.core 1.10.0, blueprint.cm 1.3.0, a… .../camel/blueprint/BlueprintPropertiesParser.java | 84 +++--- components/camel-test-blueprint/pom.xml| 7 +- parent/pom.xml | 8 +-- 3 files changed, 80 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact ggrzy...@apache.org.
[camel] branch master updated: CAMEL-12473 - Use Counter in Caffeine's dropwizard metrics
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5b6d16e CAMEL-12473 - Use Counter in Caffeine's dropwizard metrics
5b6d16e is described below
commit 5b6d16e4d1f3628251166df86414617e4d3b62fd
Author: Andrea Cosentino
AuthorDate: Mon Jun 11 11:45:06 2018 +0200
CAMEL-12473 - Use Counter in Caffeine's dropwizard metrics
---
.../CaffeineCacheFromScratchStatsCounterTest.java | 4 +--
.../CaffeineCacheStatsCounterProducerTest.java | 2 +-
.../caffeine/cache/MetricsStatsCounter.java| 38 +++---
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
index 0309b62..9b6d397 100644
---
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
+++
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
@@ -52,8 +52,8 @@ public class CaffeineCacheFromScratchStatsCounterTest extends
CamelTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION,
CaffeineConstants.ACTION_GET).withHeader(CaffeineConstants.KEY,
12).withBody(3).to("direct://get").send();
-assertEquals(2, metricRegistry.meter("camelcache.hits").getCount());
-assertEquals(1, metricRegistry.meter("camelcache.misses").getCount());
+assertEquals(2, metricRegistry.counter("camelcache.hits").getCount());
+assertEquals(1,
metricRegistry.counter("camelcache.misses").getCount());
}
diff --git
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheStatsCounterProducerTest.java
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheStatsCounterProducerTest.java
index 3d11eba..1f837b3 100644
---
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheStatsCounterProducerTest.java
+++
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheStatsCounterProducerTest.java
@@ -45,7 +45,7 @@ public class CaffeineCacheStatsCounterProducerTest extends
CaffeineCacheTestSupp
assertEquals(map.get(k), elements.get(k));
});
-assertEquals(2,
getMetricRegistry().meter("camelcache.hits").getCount());
+assertEquals(2,
getMetricRegistry().counter("camelcache.hits").getCount());
}
//
diff --git
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/MetricsStatsCounter.java
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/MetricsStatsCounter.java
index 85687aa..c2238bb 100644
---
a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/MetricsStatsCounter.java
+++
b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/MetricsStatsCounter.java
@@ -18,50 +18,50 @@ package org.apache.camel.component.caffeine.cache;
import java.util.concurrent.TimeUnit;
-import com.codahale.metrics.Meter;
+import com.codahale.metrics.Counter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
import com.github.benmanes.caffeine.cache.stats.CacheStats;
import com.github.benmanes.caffeine.cache.stats.StatsCounter;
public class MetricsStatsCounter implements StatsCounter {
-private final Meter hitCount;
-private final Meter missCount;
-private final Meter loadSuccessCount;
-private final Meter loadFailureCount;
+private final Counter hitCount;
+private final Counter missCount;
+private final Counter loadSuccessCount;
+private final Counter loadFailureCount;
private final Timer totalLoadTime;
-private final Meter evictionCount;
-private final Meter evictionWeight;
+private final Counter evictionCount;
+private final Counter evictionWeight;
public MetricsStatsCounter(MetricRegistry registry) {
-hitCount = registry.meter("camelcache.hits");
-missCount = registry.meter("camelcache.misses");
+hitCount = registry.counter("camelcache.hits");
+missCount = registry.counter("camelcache.misses");
totalLoadTime = registry.timer("camelcache.loads");
-loadSuccessCount = registry.meter("camelcache.loads-success");
-loadFailureCount = registry.meter("camelcache.loads-failure");
-evictionCount = registry.meter("camelcache.evictions");
-evictionWeight = registry.me
[camel] branch master updated: Remove multiple duplicated lines from web3j-component
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 510700b Remove multiple duplicated lines from web3j-component
510700b is described below
commit 510700bf3c07647d1ba9339fa64648dd96083b36
Author: Willem Jiang
AuthorDate: Mon Jun 11 17:27:41 2018 +0800
Remove multiple duplicated lines from web3j-component
---
components/camel-web3j/src/main/docs/web3j-component.adoc | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/components/camel-web3j/src/main/docs/web3j-component.adoc
b/components/camel-web3j/src/main/docs/web3j-component.adoc
index a259d18..d63c0a3 100644
--- a/components/camel-web3j/src/main/docs/web3j-component.adoc
+++ b/components/camel-web3j/src/main/docs/web3j-component.adoc
@@ -3,12 +3,6 @@
*Available as of Camel version 2.22*
-*Available as of Camel version 2.22*
-
-
-*Available as of Camel version 2.22*
-
-
The *Ethereum* blockchain component uses the
https://github.com/web3j/web3j[web3j] client
API and allows you to interact with Ethereum compatible nodes such as
https://github.com/ethereum/go-ethereum/wiki/geth[Geth],
https://github.com/paritytech/parity[Parity],
https://github.com/jpmorganchase/quorum/wiki[Quorum],
https://infura.io[Infura], etc.
@@ -156,4 +150,4 @@ Read the balance of an address at a specific block number:
from("direct:start")
.to("web3j://http://127.0.0.1:7545?operation=ETH_GET_BALANCE&address=0xc8CDceCE5d006dAB638029EBCf6Dd666efF5A952&atBlock=10";);
-
\ No newline at end of file
+
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[camel] branch master updated: Update the camel version of camel-as2 to 2.22.
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e17c3bf Update the camel version of camel-as2 to 2.22. e17c3bf is described below commit e17c3bf6f0c92e6fc7ec5405ba4362d66dceed45 Author: Willem Jiang AuthorDate: Mon Jun 11 17:19:22 2018 +0800 Update the camel version of camel-as2 to 2.22. --- .../camel-as2/camel-as2-component/src/main/docs/as2-component.adoc| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc index 6869634..fed637e 100644 --- a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc +++ b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc @@ -1,7 +1,7 @@ [[as2-component]] == AS2 Component -*Available as of Camel version 2.20* +*Available as of Camel version 2.22* [source,xml] @@ -61,4 +61,4 @@ with the following path and query parameters: | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean |=== -// endpoint options: END \ No newline at end of file +// endpoint options: END -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[camel] branch master updated: Upgrade Derby to version 10.14.2.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 9e194a8 Upgrade Derby to version 10.14.2.0 9e194a8 is described below commit 9e194a8d07aef6c654803c0e948ea35e5cd471f6 Author: Andrea Cosentino AuthorDate: Mon Jun 11 10:48:54 2018 +0200 Upgrade Derby to version 10.14.2.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4e18f68..c8e2666 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -176,7 +176,7 @@ 3.2.0 1.8.2 1.4.0 -10.14.1.0 +10.14.2.0 2.15 2.15_1 3.3.8 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
