[camel] branch master updated: Upgrade Commons-Codec to version 1.12
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 51b3ea4 Upgrade Commons-Codec to version 1.12 51b3ea4 is described below commit 51b3ea4e1fa8f0df0a752540f080e0e4e63f76f0 Author: Andrea Cosentino AuthorDate: Tue Feb 26 07:49:55 2019 +0100 Upgrade Commons-Codec to version 1.12 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d74907a..639fed3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -126,7 +126,7 @@ 2.3.1_2 3.1.2 1.9.3 -1.11 +1.12 3.2.2 1.18 1.9
[camel] branch master updated: Upgrade Commons-Codec to version 1.12
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 51b3ea4 Upgrade Commons-Codec to version 1.12 51b3ea4 is described below commit 51b3ea4e1fa8f0df0a752540f080e0e4e63f76f0 Author: Andrea Cosentino AuthorDate: Tue Feb 26 07:49:55 2019 +0100 Upgrade Commons-Codec to version 1.12 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d74907a..639fed3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -126,7 +126,7 @@ 2.3.1_2 3.1.2 1.9.3 -1.11 +1.12 3.2.2 1.18 1.9
[camel] branch bean-bind updated (a7eb285 -> 60e2a95)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch bean-bind
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a7eb285 CAMEL-10792: Allow Registry to bind beans.
new 7eb9494 CAMEL-10792: Allow Registry to bind beans.
new 54b19e4 Remove old cruft as camel-gae is removed
new 51a3d2a CAMEL-10792: Allow Registry to bind beans.
new 1b8d1c6 CAMEL-10792: Removed not needed registry anymore.
new 046f210 CAMEL-10792: Allow Registry to bind beans.
new f48d279 CAMEL-10792: Allow Registry to bind beans.
new 371b98f CAMEL-10792: Allow Registry to bind beans.
new f347eb4 CAMEL-10792: Allow Registry to bind beans.
new 60e2a95 CAMEL-10792: Deprecate JndiRegistry in favour of
JndiBeanRepository.
The 35652 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:
MIGRATION.md | 2 +
.../apache/camel/component/amqp/AMQPRouteTest.java | 13 +--
.../amqp/artemis/AMQPEmbeddedBrokerTest.java | 12 +-
.../aws/s3/S3ComponentConfigurationTest.java | 13 +--
.../aws/sdb/SdbComponentConfigurationTest.java | 21 ++--
.../aws/ses/SesComponentConfigurationTest.java | 23 ++--
.../aws/sns/SnsComponentConfigurationTest.java | 23 ++--
.../aws/sqs/SqsComponentConfigurationTest.java | 23 ++--
.../azure/blob/BlobServiceAppendConsumerTest.java | 13 +--
.../azure/blob/BlobServiceBlockConsumerTest.java | 19 ++-
.../BlobServiceComponentConfigurationTest.java | 17 +--
.../component/azure/blob/BlobServiceUtilTest.java | 20 ++--
.../QueueServiceComponentConfigurationTest.java| 10 +-
.../azure/queue/QueueServiceProducerTest.java | 9 +-
.../azure/queue/QueueServiceUtilTest.java | 11 +-
.../src/test/resources/log4j.properties| 4 +-
.../csv/BindyCarQuoteAndCommaDelimiterTest.java| 6 +-
.../camel/component/hdfs2/HdfsConsumerTest.java| 5 +-
.../camel/spring/boot/CamelAutoConfiguration.java | 25 ++--
.../spring/boot/CamelAutoConfigurationTest.java| 19 +--
.../apache/camel/spring/RegistryInjectionTest.java | 5 +-
.../apache/camel/impl/AbstractCamelContext.java| 25 +---
.../org/apache/camel/impl/CompositeRegistry.java | 129 -
.../org/apache/camel/impl/DefaultCamelContext.java | 17 +--
.../java/org/apache/camel/impl/JndiRegistry.java | 126 ++--
.../impl/PropertyPlaceholderDelegateRegistry.java | 92 ---
.../component/log/LogCustomFormatterTest.java | 28 +
.../camel/component/log/LogCustomLoggerTest.java | 23 +---
.../PropertiesComponentRegistryTest.java | 21 ++--
.../camel/component/ref/RefComponentTest.java | 10 +-
.../ValidatorWithResourceResolverRouteTest.java| 6 +-
.../apache/camel/impl/CompositeRegistryTest.java | 50
.../apache/camel/impl/GetRegistryAsTypeTest.java | 24 +---
.../org/apache/camel/support/DefaultRegistry.java | 69 ++-
.../camel/support/jndi/JndiBeanRepository.java}| 29 ++---
35 files changed, 237 insertions(+), 705 deletions(-)
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
copy core/{camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java =>
camel-support/src/main/java/org/apache/camel/support/jndi/JndiBeanRepository.java}
(87%)
[camel] branch bean-bind updated (a7eb285 -> 60e2a95)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch bean-bind
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a7eb285 CAMEL-10792: Allow Registry to bind beans.
new 7eb9494 CAMEL-10792: Allow Registry to bind beans.
new 54b19e4 Remove old cruft as camel-gae is removed
new 51a3d2a CAMEL-10792: Allow Registry to bind beans.
new 1b8d1c6 CAMEL-10792: Removed not needed registry anymore.
new 046f210 CAMEL-10792: Allow Registry to bind beans.
new f48d279 CAMEL-10792: Allow Registry to bind beans.
new 371b98f CAMEL-10792: Allow Registry to bind beans.
new f347eb4 CAMEL-10792: Allow Registry to bind beans.
new 60e2a95 CAMEL-10792: Deprecate JndiRegistry in favour of
JndiBeanRepository.
The 35652 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:
MIGRATION.md | 2 +
.../apache/camel/component/amqp/AMQPRouteTest.java | 13 +--
.../amqp/artemis/AMQPEmbeddedBrokerTest.java | 12 +-
.../aws/s3/S3ComponentConfigurationTest.java | 13 +--
.../aws/sdb/SdbComponentConfigurationTest.java | 21 ++--
.../aws/ses/SesComponentConfigurationTest.java | 23 ++--
.../aws/sns/SnsComponentConfigurationTest.java | 23 ++--
.../aws/sqs/SqsComponentConfigurationTest.java | 23 ++--
.../azure/blob/BlobServiceAppendConsumerTest.java | 13 +--
.../azure/blob/BlobServiceBlockConsumerTest.java | 19 ++-
.../BlobServiceComponentConfigurationTest.java | 17 +--
.../component/azure/blob/BlobServiceUtilTest.java | 20 ++--
.../QueueServiceComponentConfigurationTest.java| 10 +-
.../azure/queue/QueueServiceProducerTest.java | 9 +-
.../azure/queue/QueueServiceUtilTest.java | 11 +-
.../src/test/resources/log4j.properties| 4 +-
.../csv/BindyCarQuoteAndCommaDelimiterTest.java| 6 +-
.../camel/component/hdfs2/HdfsConsumerTest.java| 5 +-
.../camel/spring/boot/CamelAutoConfiguration.java | 25 ++--
.../spring/boot/CamelAutoConfigurationTest.java| 19 +--
.../apache/camel/spring/RegistryInjectionTest.java | 5 +-
.../apache/camel/impl/AbstractCamelContext.java| 25 +---
.../org/apache/camel/impl/CompositeRegistry.java | 129 -
.../org/apache/camel/impl/DefaultCamelContext.java | 17 +--
.../java/org/apache/camel/impl/JndiRegistry.java | 126 ++--
.../impl/PropertyPlaceholderDelegateRegistry.java | 92 ---
.../component/log/LogCustomFormatterTest.java | 28 +
.../camel/component/log/LogCustomLoggerTest.java | 23 +---
.../PropertiesComponentRegistryTest.java | 21 ++--
.../camel/component/ref/RefComponentTest.java | 10 +-
.../ValidatorWithResourceResolverRouteTest.java| 6 +-
.../apache/camel/impl/CompositeRegistryTest.java | 50
.../apache/camel/impl/GetRegistryAsTypeTest.java | 24 +---
.../org/apache/camel/support/DefaultRegistry.java | 69 ++-
.../camel/support/jndi/JndiBeanRepository.java}| 29 ++---
35 files changed, 237 insertions(+), 705 deletions(-)
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
copy core/{camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java =>
camel-support/src/main/java/org/apache/camel/support/jndi/JndiBeanRepository.java}
(87%)
[camel] branch java-10-test updated: Delete .pom.xml.swp
This is an automated email from the ASF dual-hosted git repository. onders pushed a commit to branch java-10-test in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/java-10-test by this push: new 7d0b54c Delete .pom.xml.swp 7d0b54c is described below commit 7d0b54c0d8c1cf6c577bc5fb12c0fa2c0bf9f603 Author: önder sezgin AuthorDate: Tue Feb 26 09:42:55 2019 +0300 Delete .pom.xml.swp --- docs/.pom.xml.swp | Bin 20480 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/.pom.xml.swp b/docs/.pom.xml.swp deleted file mode 100644 index 55ed3d8..000 Binary files a/docs/.pom.xml.swp and /dev/null differ
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32011 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated (8b16b96 -> 0328ceb)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 8b16b96 CAMEL-13249 Fixed the build of camel-http4 new 34cc9aa CAMEL-13240 Removed the camel-validator-test-resources jar new 0328ceb CAMEL-13240 Removed the test jars from camel-spring components The 35649 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-spring/pom.xml| 16 ++ .../camel-spring/src/test/java/a/b/c/Test.java | 24 + .../scan/DefaultPackageScanClassResolverTest.java | 6 ++- .../src/test/resources/package+scan+test.jar | Bin 1041 -> 0 bytes .../src/test/resources/package_scan_test.jar | Bin 1041 -> 0 bytes .../1.0.0/camel-validator-test-resources-1.0.0.jar | Bin 17660 -> 0 bytes .../1.0.0/camel-validator-test-resources-1.0.0.pom | 25 -- tests/camel-itest/pom.xml | 14 +- .../camel-validator-test-resources/pom.xml | 55 + .../camel/component/validator/dotslash/child.xsd | 33 + .../camel/component/validator/dotslash/parent.xsd | 34 + .../component/validator/doubleslash/child.xsd | 33 + .../component/validator/doubleslash/parent.xsd | 34 + .../validator/relativeparent/child/child.xsd | 33 + .../component/validator/relativeparent/parent.xsd | 34 + tests/test-bundles/pom.xml | 3 +- 16 files changed, 305 insertions(+), 39 deletions(-) create mode 100644 components/camel-spring/src/test/java/a/b/c/Test.java delete mode 100644 components/camel-spring/src/test/resources/package+scan+test.jar delete mode 100644 components/camel-spring/src/test/resources/package_scan_test.jar delete mode 100644 tests/camel-itest/lib/org/apache/camel/camel-validator-test-resources/1.0.0/camel-validator-test-resources-1.0.0.jar delete mode 100644 tests/camel-itest/lib/org/apache/camel/camel-validator-test-resources/1.0.0/camel-validator-test-resources-1.0.0.pom create mode 100644 tests/test-bundles/camel-validator-test-resources/pom.xml create mode 100644 tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/dotslash/child.xsd create mode 100644 tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/dotslash/parent.xsd create mode 100644 tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/doubleslash/child.xsd create mode 100644 tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/doubleslash/parent.xsd create mode 100644 tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/relativeparent/child/child.xsd create mode 100644 tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/relativeparent/parent.xsd
[camel] branch master updated: CAMEL-13249 Fixed the build of camel-http4
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 8b16b96 CAMEL-13249 Fixed the build of camel-http4 8b16b96 is described below commit 8b16b960670d9abc2a1b755f502db6afcf03ac52 Author: Willem Jiang AuthorDate: Tue Feb 26 12:13:43 2019 +0800 CAMEL-13249 Fixed the build of camel-http4 --- .../java/org/apache/camel/component/http4/HeaderFilteringTest.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java index 3815a25..8772952 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java @@ -32,8 +32,8 @@ import com.sun.net.httpserver.HttpServer; import org.apache.camel.Producer; import org.apache.camel.http.common.HttpOperationFailedException; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.DefaultExchange; -import org.apache.camel.impl.DefaultMessage; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.support.DefaultMessage; import org.apache.camel.spi.RestConfiguration; import org.junit.After; import org.junit.Before;
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32008 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32007 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32005 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32004 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32003 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/32000 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31997 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated: CAMEL-13249: invoke `applyFilterToCamelHeaders`...
This is an automated email from the ASF dual-hosted git repository.
zregvart 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 e89b8f5 CAMEL-13249: invoke `applyFilterToCamelHeaders`...
e89b8f5 is described below
commit e89b8f568758f02eb777c9c731c831ba1fb14c60
Author: Zoran Regvart
AuthorDate: Fri Feb 22 18:03:41 2019 +0100
CAMEL-13249: invoke `applyFilterToCamelHeaders`...
... instead of `applyFilterToExternalHeaders`
This changes the invocation in
`HttpRestHeaderFilterStrategy::applyFilterToCamelHeaders` to delegate to
`super::applyFilterToCamelHeaders` instead of
`super::applyFilterToExternalHeaders`.
Also adds integration test demonstrating the issue and refactors
`HttpRestHeaderFilterStrategyTest` from `components/camel-http4` to
`/components/camel-http-common` as it doesn't depend on `http4`
component and tests a class in `camel-http-common`.
---
components/camel-http-common/pom.xml | 6 ++
.../http/common/HttpRestHeaderFilterStrategy.java | 2 +-
.../http/common}/HttpHeaderFilterStrategyTest.java | 2 +-
.../common/HttpRestHeaderFilterStrategyTest.java | 39
components/camel-http4/pom.xml | 6 ++
.../camel/component/http4/HeaderFilteringTest.java | 108 +
.../http/NettyHttpRestHeaderFilterStrategy.java| 2 +-
7 files changed, 162 insertions(+), 3 deletions(-)
diff --git a/components/camel-http-common/pom.xml
b/components/camel-http-common/pom.xml
index d3d937e..fb22563 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -77,6 +77,12 @@
log4j-slf4j-impl
test
+
+ org.assertj
+ assertj-core
+ ${assertj-version}
+ test
+
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
index 762fe03..4a930d5 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
@@ -31,7 +31,7 @@ public class HttpRestHeaderFilterStrategy extends
HttpHeaderFilterStrategy {
@Override
public boolean applyFilterToCamelHeaders(String headerName, Object
headerValue, Exchange exchange) {
-boolean answer = super.applyFilterToExternalHeaders(headerName,
headerValue, exchange);
+boolean answer = super.applyFilterToCamelHeaders(headerName,
headerValue, exchange);
// using rest producer then headers are mapping to uri and query
parameters using {key} syntax
// if there is a match to an existing Camel Message header, then we
should filter (=true) this
// header as its already been mapped by the RestProducer from
camel-core, and we do not want
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
similarity index 99%
rename from
components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
rename to
components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
index 0f3ee02..d8c798a 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
+++
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.http.common;
import org.apache.camel.Exchange;
import org.apache.camel.http.common.HttpHeaderFilterStrategy;
diff --git
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
new file mode 100644
index 000..d2c0141
--- /dev/null
+++
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
@@ -0,0 +1,39 @@
+/**
+ * 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.
[camel] branch camel-2.23.x updated: CAMEL-13249: invoke `applyFilterToCamelHeaders`...
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.23.x by this push:
new 9494be9 CAMEL-13249: invoke `applyFilterToCamelHeaders`...
9494be9 is described below
commit 9494be95d39dab2622689cde2ead959a4d268b9f
Author: Zoran Regvart
AuthorDate: Fri Feb 22 18:03:41 2019 +0100
CAMEL-13249: invoke `applyFilterToCamelHeaders`...
... instead of `applyFilterToExternalHeaders`
This changes the invocation in
`HttpRestHeaderFilterStrategy::applyFilterToCamelHeaders` to delegate to
`super::applyFilterToCamelHeaders` instead of
`super::applyFilterToExternalHeaders`.
Also adds integration test demonstrating the issue and refactors
`HttpRestHeaderFilterStrategyTest` from `components/camel-http4` to
`/components/camel-http-common` as it doesn't depend on `http4`
component and tests a class in `camel-http-common`.
---
components/camel-http-common/pom.xml | 6 ++
.../http/common/HttpRestHeaderFilterStrategy.java | 2 +-
.../http/common}/HttpHeaderFilterStrategyTest.java | 2 +-
.../common/HttpRestHeaderFilterStrategyTest.java | 39
components/camel-http4/pom.xml | 6 ++
.../camel/component/http4/HeaderFilteringTest.java | 108 +
.../http/NettyHttpRestHeaderFilterStrategy.java| 2 +-
7 files changed, 162 insertions(+), 3 deletions(-)
diff --git a/components/camel-http-common/pom.xml
b/components/camel-http-common/pom.xml
index 11f9736..1480601 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -78,6 +78,12 @@
log4j-slf4j-impl
test
+
+ org.assertj
+ assertj-core
+ ${assertj-version}
+ test
+
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
index 762fe03..4a930d5 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
@@ -31,7 +31,7 @@ public class HttpRestHeaderFilterStrategy extends
HttpHeaderFilterStrategy {
@Override
public boolean applyFilterToCamelHeaders(String headerName, Object
headerValue, Exchange exchange) {
-boolean answer = super.applyFilterToExternalHeaders(headerName,
headerValue, exchange);
+boolean answer = super.applyFilterToCamelHeaders(headerName,
headerValue, exchange);
// using rest producer then headers are mapping to uri and query
parameters using {key} syntax
// if there is a match to an existing Camel Message header, then we
should filter (=true) this
// header as its already been mapped by the RestProducer from
camel-core, and we do not want
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
similarity index 99%
rename from
components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
rename to
components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
index 803e05f..c2e79ca 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
+++
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.http.common;
import org.apache.camel.Exchange;
import org.apache.camel.http.common.HttpHeaderFilterStrategy;
diff --git
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
new file mode 100644
index 000..d2c0141
--- /dev/null
+++
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
@@ -0,0 +1,39 @@
+/**
+ * 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
+ *
[camel] branch camel-2.x updated: CAMEL-13249: invoke `applyFilterToCamelHeaders`...
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 1511dc6 CAMEL-13249: invoke `applyFilterToCamelHeaders`...
1511dc6 is described below
commit 1511dc6f4af1bef64e30fdb57168244a9f9c1f09
Author: Zoran Regvart
AuthorDate: Fri Feb 22 18:03:41 2019 +0100
CAMEL-13249: invoke `applyFilterToCamelHeaders`...
... instead of `applyFilterToExternalHeaders`
This changes the invocation in
`HttpRestHeaderFilterStrategy::applyFilterToCamelHeaders` to delegate to
`super::applyFilterToCamelHeaders` instead of
`super::applyFilterToExternalHeaders`.
Also adds integration test demonstrating the issue and refactors
`HttpRestHeaderFilterStrategyTest` from `components/camel-http4` to
`/components/camel-http-common` as it doesn't depend on `http4`
component and tests a class in `camel-http-common`.
---
components/camel-http-common/pom.xml | 6 ++
.../http/common/HttpRestHeaderFilterStrategy.java | 2 +-
.../http/common}/HttpHeaderFilterStrategyTest.java | 2 +-
.../common/HttpRestHeaderFilterStrategyTest.java | 39
components/camel-http4/pom.xml | 6 ++
.../camel/component/http4/HeaderFilteringTest.java | 108 +
.../http/NettyHttpRestHeaderFilterStrategy.java| 2 +-
7 files changed, 162 insertions(+), 3 deletions(-)
diff --git a/components/camel-http-common/pom.xml
b/components/camel-http-common/pom.xml
index 9d78644..99c4b09 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -78,6 +78,12 @@
log4j-slf4j-impl
test
+
+ org.assertj
+ assertj-core
+ ${assertj-version}
+ test
+
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
index 762fe03..4a930d5 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategy.java
@@ -31,7 +31,7 @@ public class HttpRestHeaderFilterStrategy extends
HttpHeaderFilterStrategy {
@Override
public boolean applyFilterToCamelHeaders(String headerName, Object
headerValue, Exchange exchange) {
-boolean answer = super.applyFilterToExternalHeaders(headerName,
headerValue, exchange);
+boolean answer = super.applyFilterToCamelHeaders(headerName,
headerValue, exchange);
// using rest producer then headers are mapping to uri and query
parameters using {key} syntax
// if there is a match to an existing Camel Message header, then we
should filter (=true) this
// header as its already been mapped by the RestProducer from
camel-core, and we do not want
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
similarity index 99%
rename from
components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
rename to
components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
index 803e05f..c2e79ca 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
+++
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.http.common;
import org.apache.camel.Exchange;
import org.apache.camel.http.common.HttpHeaderFilterStrategy;
diff --git
a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
new file mode 100644
index 000..d2c0141
--- /dev/null
+++
b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpRestHeaderFilterStrategyTest.java
@@ -0,0 +1,39 @@
+/**
+ * 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
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31996 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel-k] branch master updated: do not include runtime artefacts in operator image by default #468
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-k.git
The following commit(s) were added to refs/heads/master by this push:
new 2d9eda0 do not include runtime artefacts in operator image by default
#468
2d9eda0 is described below
commit 2d9eda01dadc6da106c8b65436d57a130871c636
Author: lburgazzoli
AuthorDate: Fri Feb 22 10:01:07 2019 +0100
do not include runtime artefacts in operator image by default #468
---
.gitmodules | 3 -
build/maven/pom-catalog.xml | 104
build/maven/pom-runtime.xml | 146 +++
build/maven/settings.xml | 6 -
cmd/util/json-schema-gen/jsonschemagen.go| 10 +-
deploy/camel-catalog-2.23.0.yaml | 8 +-
deploy/camel-catalog-2.23.1.yaml | 8 +-
deploy/resources.go | 16 +--
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 101 +++-
pkg/builder/builder_utils.go | 8 +-
pkg/cmd/completion_bash.go | 2 +-
pkg/cmd/install.go | 5 +
pkg/cmd/version.go | 5 +-
pkg/controller/integrationplatform/initialize.go | 2 +-
pkg/platform/images/images.go| 5 +-
pkg/platform/images/images_test.go | 12 +-
pkg/trait/builder_test.go| 2 +-
pkg/trait/environment.go | 4 +-
pkg/trait/rest-dsl.go| 4 +-
pkg/util/defaults/defaults.go| 41 +++
pkg/util/digest/digest.go| 6 +-
pkg/util/test/catalog.go | 2 +-
pkg/util/test/catalog_test.go| 3 -
runtime | 1 -
script/Makefile | 145 +-
script/build_catalog.sh | 27 ++---
script/cross_compile.sh | 8 +-
script/get_version.sh| 4 -
script/git_tag.sh| 20 ++--
script/images_build.sh | 6 -
script/images_push.sh| 9 +-
script/install_minikube.sh | 2 -
script/install_minishift.sh | 2 -
script/package_examples.sh | 7 +-
script/package_maven_artifacts.sh| 15 ++-
script/publish_base_images.sh| 9 +-
script/set_version.sh| 23 ++--
script/travis_build.sh | 5 +-
version/version.go | 25
39 files changed, 585 insertions(+), 226 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 1f98a99..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "runtime"]
- path = runtime
- url = https://github.com/apache/camel-k-runtime.git
diff --git a/build/maven/pom-catalog.xml b/build/maven/pom-catalog.xml
new file mode 100644
index 000..db52c6d
--- /dev/null
+++ b/build/maven/pom-catalog.xml
@@ -0,0 +1,104 @@
+
+
+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.k
+camel-k-catalog-generator
+1.0.0
+
+
+generate-resources
+
+
+org.apache.camel.k
+camel-k-maven-plugin
+${runtime.version}
+
+
+generate-catalog
+
+generate-catalog
+
+
+
+
+
+org.apache.camel
+camel-catalog
+${catalog.version}
+
+
+
+
+
+
+
+
+apache.snapshots
+Apache Development Snapshot Repository
+
https://repository.apache.org/content/repositories/snapshots/
+
+false
+
+
+true
+
+
+
+oss.snapshots
+https://oss.sonatype.org/content/repositories/snapshots
+
+false
+
+
+true
+
+
+
+
+
+
+apache.snapshots
+Apache Development Snapshot Repository
+
https://repository.apache.org/content/repositories/snapshots/
[camel] branch master updated: Upgrade RxJava to version 2.2.7
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 7d51c30 Upgrade RxJava to version 2.2.7 7d51c30 is described below commit 7d51c30663e5a461d4af5ff8252164b135e6c1b4 Author: Andrea Cosentino AuthorDate: Mon Feb 25 15:56:32 2019 +0100 Upgrade RxJava to version 2.2.7 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7aa22ee..d74907a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -582,7 +582,7 @@ 1.0_3 1.0 1.3.8 -2.2.6 +2.2.7 1.3.2_2 9.9.0-2_1 9.9.0-2
[camel-k] branch master updated (fde8e1f -> ca4d656)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from fde8e1f sanitize dependencies new 68dcb5e Perform garbage collection asynchronously new ca4d656 Make sure only older generation resources get garbage collected The 552 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: pkg/trait/gc.go | 78 + pkg/util/kubernetes/util.go | 4 --- 2 files changed, 51 insertions(+), 31 deletions(-)
[camel] branch master updated: CAMEL-13255 - Regen docs
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 3202754 CAMEL-13255 - Regen docs 3202754 is described below commit 3202754e50b8968a9a99aa8bc851c420c8e14f5f Author: Andrea Cosentino AuthorDate: Mon Feb 25 15:46:34 2019 +0100 CAMEL-13255 - Regen docs --- .../src/main/docs/spring-redis-component.adoc| 12 .../modules/ROOT/pages/spring-redis-component.adoc | 12 2 files changed, 24 insertions(+) diff --git a/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc b/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc index c1ac0ea..890c486 100644 --- a/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc +++ b/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc @@ -76,6 +76,18 @@ with the following path and query parameters: // spring-boot-auto-configure options: START === Spring Boot Auto-Configuration +When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration: + +[source,xml] + + + org.apache.camel + camel-spring-redis-starter + x.x.x + + + + The component supports 2 options, which are listed below. diff --git a/docs/components/modules/ROOT/pages/spring-redis-component.adoc b/docs/components/modules/ROOT/pages/spring-redis-component.adoc index 18930ef..890c486 100644 --- a/docs/components/modules/ROOT/pages/spring-redis-component.adoc +++ b/docs/components/modules/ROOT/pages/spring-redis-component.adoc @@ -359,6 +359,18 @@ milliseconds |CamelRedis.Key (String), CamelRedis.Timestamp (Long) |Boolean [width="100%",cols="20%,20%,20%,60%",options="header",] |=== +|Geo Commands |Description |Parameters |Result + +|`GEOADD` |Adds the specified geospatial items (latitude, longitude, name) to the specified key |CamelRedis.Key (String), CamelRedis.Latitude (Double), CamelRedis.Longitude (Double), CamelRedis.Value (Object) |Long +|`GEODIST` |Return the distance between two members in the geospatial index for the specified key |CamelRedis.Key (String), CamelRedis.Values (Object[]) |Distance +|`GEOHASH` |Return valid Geohash strings representing the position of an element in the geospatial index for the specified key |CamelRedis.Key (String), CamelRedis.Value (Object) |List +|`GEOPOS` |Return the positions (longitude,latitude) of an element in the geospatial index for the specified key |CamelRedis.Key (String), CamelRedis.Value (Object) |List +|`GEORADIUS` |Return the element in the geospatial index for the specified key which are within the borders of the area specified with the center location and the maximum distance from the center (the radius) |CamelRedis.Key (String), CamelRedis.Latitude (Double), CamelRedis.Longitude (Double), CamelRedis.Radius (Double), CamelRedis.Count (Integer) |GeoResults +|`GEORADIUSBYMEMBER` |This command is exactly like GEORADIUS with the sole difference that instead of taking, as the center of the area to query, a longitude and latitude value, it takes the name of a member already existing inside the geospatial index for the specified key |CamelRedis.Key (String), CamelRedis.Value (Object), CamelRedis.Radius (Double), CamelRedis.Count (Integer) |GeoResults +|=== + +[width="100%",cols="20%,20%,20%,60%",options="header",] +|=== |Other Command |Description |Parameters |Result |`MULTI` |Mark the start of a transaction block |none |void
[camel] branch camel-2.x updated (7475fb0 -> 743d95d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 7475fb0 Regen new ba8b444 CAMEL-13255 - Add support for GEO functions new 743d95d CAMEL-13255 - Fixed CS The 34371 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: .../src/main/docs/spring-redis-component.adoc | 12 +++ .../component/redis/AllRedisProcessorsCreator.java | 1 + .../org/apache/camel/component/redis/Command.java | 3 +- .../camel/component/redis/ExchangeConverter.java | 16 .../component/redis/GeoRedisProcessorsCreator.java | 39 .../apache/camel/component/redis/RedisClient.java | 42 + .../camel/component/redis/RedisConstants.java | 3 + .../apache/camel/component/redis/RedisGeoTest.java | 102 + 8 files changed, 217 insertions(+), 1 deletion(-) create mode 100755 components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/GeoRedisProcessorsCreator.java create mode 100755 components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31995 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated (c8e3557 -> fac71e0)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c8e3557 CAMEL-13253 - Regen new 333b02b CAMEL-13255 - Add support for GEO functions new 968c687 CAMEL-13255 - Fixed CS new fac71e0 Removed out.txt from Repo The 35643 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: .../src/main/docs/spring-redis-component.adoc |24 +- .../component/redis/AllRedisProcessorsCreator.java | 1 + .../org/apache/camel/component/redis/Command.java | 3 +- .../camel/component/redis/ExchangeConverter.java |16 + .../component/redis/GeoRedisProcessorsCreator.java |39 + .../apache/camel/component/redis/RedisClient.java |42 + .../camel/component/redis/RedisConstants.java | 3 + .../apache/camel/component/redis/RedisGeoTest.java | 102 + out.txt| 35934 --- 9 files changed, 217 insertions(+), 35947 deletions(-) create mode 100755 components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/GeoRedisProcessorsCreator.java create mode 100755 components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java delete mode 100644 out.txt
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31994 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel-k-runtime] branch master updated: Support for camel 3.x #11
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-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new d3fc05a Support for camel 3.x #11
new 023d3c8 Merge pull request #16 from lburgazzoli/github-11-camel-3
d3fc05a is described below
commit d3fc05aa508a109fb859eb6412bcdae2527d4543
Author: lburgazzoli
AuthorDate: Mon Feb 25 01:18:07 2019 +0100
Support for camel 3.x #11
---
.travis.yml| 4 +-
Jenkinsfile| 10 +-
.../pom.xml| 19 +-
.../camel/k/adapter/DefaultAsyncProducer.java | 25 ++
.../apache/camel/k/adapter/DefaultComponent.java | 28 +++
.../apache/camel/k/adapter/DefaultEndpoint.java| 27 +++
.../java/org/apache/camel/k/adapter/Exchanges.java | 30 +++
.../org/apache/camel/k/adapter/Introspection.java | 43
.../org/apache/camel/k/adapter/Processors.java | 33 +--
.../java/org/apache/camel/k/adapter/Resources.java | 33 +--
.../java/org/apache/camel/k/adapter/Services.java | 47
.../pom.xml| 19 +-
.../camel/k/adapter/DefaultAsyncProducer.java | 25 ++
.../apache/camel/k/adapter/DefaultComponent.java | 28 +++
.../apache/camel/k/adapter/DefaultEndpoint.java| 27 +++
.../java/org/apache/camel/k/adapter/Exchanges.java | 30 +++
.../org/apache/camel/k/adapter/Introspection.java | 47
.../org/apache/camel/k/adapter/Processors.java | 33 +--
.../java/org/apache/camel/k/adapter/Resources.java | 33 +--
.../java/org/apache/camel/k/adapter/Services.java | 48
camel-k-maven-plugin/pom.xml | 1 +
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 2 +-
.../maven/processors/CatalogProcessor_2_x.java | 1 +
...rocessor_2_x.java => CatalogProcessor_3_x.java} | 24 +-
...he.camel.k.tooling.maven.model.CatalogProcessor | 1 +
camel-k-runtime-core/pom.xml | 48 +++-
.../src/main/java/org/apache/camel/k/Runtime.java | 5 -
.../org/apache/camel/k/listener/RoutesDumper.java | 5 +-
.../org/apache/camel/k/support/RuntimeSupport.java | 4 +-
.../org/apache/camel/k/support/URIResolver.java| 4 +-
camel-k-runtime-groovy/pom.xml | 48 +++-
.../k/groovy/dsl/ComponentConfiguration.groovy | 10 +-
.../org/apache/camel/k/groovy/LoaderTest.groovy| 4 +-
.../k/groovy/dsl/extension/LogExtensionTest.groovy | 4 +-
camel-k-runtime-jvm/pom.xml| 51 +++-
.../camel/k/jvm/loader/JavaSourceLoader.java | 13 +-
.../camel/k/jvm/RoutesLoadersCommonTest.java | 1 +
.../org/apache/camel/k/jvm/RoutesLoadersTest.java | 4 +
.../java/org/apache/camel/k/jvm/RuntimeTest.java | 11 +-
camel-k-runtime-kotlin/pom.xml | 53 -
.../kotlin/org/apache/camel/k/kotlin/LoaderTest.kt | 4 +-
.../apache/camel/k/kotlin/dsl/IntegrationTest.kt | 21 +-
.../camel/k/kotlin/extension/LogExtensionTest.kt | 4 +-
camel-k-runtime-spring-boot/pom.xml| 42 +++-
camel-k-runtime-yaml/pom.xml | 54 -
.../org/apache/camel/k/yaml/RoutesLoaderTest.java | 5 +-
camel-knative-http/pom.xml | 47 +++-
.../knative/http/KnativeHttpComponent.java | 4 +-
camel-knative/pom.xml | 57 -
.../apache/camel/component/knative/Knative.java| 1 -
.../camel/component/knative/KnativeComponent.java | 6 +-
.../component/knative/KnativeConfiguration.java| 2 -
.../camel/component/knative/KnativeEndpoint.java | 10 +-
.../component/knative/KnativeEnvironment.java | 4 +-
.../camel/component/knative/KnativeProducer.java | 18 +-
pom.xml| 263 ++---
56 files changed, 1098 insertions(+), 327 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1f77f5a..6d79b9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,6 @@
#
language: java
-script: ./mvnw test
+script:
+ - ./mvnw test -Dcamel2
+ - ./mvnw test -Dcamel3
diff --git a/Jenkinsfile b/Jenkinsfile
index 81ce795..1c57e46 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,9 +42,15 @@ pipeline {
stages {
-stage('Test & Install') {
+stage('Test Vs Camel 2.x & Install') {
steps {
-sh "./mvnw $MAVEN_PARAMS clean install -f pom.xml"
+sh "./mvnw $MAVEN_PARAMS clean install -Dcamel2 -f pom.xml"
+}
+}
+
+stage('Test Vs Camel 3.x & Install') {
+steps {
+sh "./mvnw $MAVEN_PARAMS clean install -Dcamel3 -f pom.xml"
}
}
diff --git a/camel-k-runtime-core/pom.xml b/camel-k-adapter-camel-2/pom.xml
similarity index 81%
[camel] branch master updated (efa0066 -> c8e3557)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from efa0066 Upgrade Smack to version 4.3.2 new 3a071c7 CAMEL-13253 - Remove deprecated examples, report incident example removed new f3093f6 CAMEL-13253 - Remove deprecated examples, report incident ws security removed new c8e3557 CAMEL-13253 - Regen The 35640 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: examples/README.adoc | 10 +- .../README.md | 130 --- .../pom.xml| 248 - .../example/reportincident/FilenameGenerator.java | 29 --- .../camel/example/reportincident/MyBean.java | 26 --- .../example/reportincident/UTPasswordCallback.java | 114 -- .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 - .../resources/META-INF/spring/camel-context.xml| 104 - .../src/main/resources/etc/MailBody.vm | 28 --- .../src/main/resources/etc/report_incident.wsdl| 92 .../src/main/resources/incident.properties | 19 -- .../src/main/resources/log4j2.properties | 23 -- .../reportincident/ReportIncidentRoutesTest.java | 126 --- examples/camel-example-reportincident/README.md| 39 examples/camel-example-reportincident/pom.xml | 217 -- .../example/reportincident/FilenameGenerator.java | 29 --- .../camel/example/reportincident/MyBean.java | 27 --- .../reportincident/ReportIncidentRoutes.java | 85 --- .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 - .../resources/META-INF/spring/camel-context.xml| 82 --- .../src/main/resources/camel-config.xml| 33 --- .../src/main/resources/etc/MailBody.vm | 28 --- .../src/main/resources/etc/report_incident.wsdl| 92 .../src/main/resources/incident.properties | 19 -- .../src/main/resources/log4j2.properties | 23 -- .../src/main/webapp/WEB-INF/web.xml| 50 - .../reportincident/ReportIncidentRoutesTest.java | 105 - examples/pom.xml | 2 - 30 files changed, 1 insertion(+), 2207 deletions(-) delete mode 100644 examples/camel-example-reportincident-wssecurity/README.md delete mode 100644 examples/camel-example-reportincident-wssecurity/pom.xml delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/FilenameGenerator.java delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/MyBean.java delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/UTPasswordCallback.java delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/LICENSE.txt delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/NOTICE.txt delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/etc/MailBody.vm delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/etc/report_incident.wsdl delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/incident.properties delete mode 100644 examples/camel-example-reportincident-wssecurity/src/main/resources/log4j2.properties delete mode 100644 examples/camel-example-reportincident-wssecurity/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java delete mode 100644 examples/camel-example-reportincident/README.md delete mode 100644 examples/camel-example-reportincident/pom.xml delete mode 100644 examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/FilenameGenerator.java delete mode 100644 examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/MyBean.java delete mode 100644 examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java delete mode 100644 examples/camel-example-reportincident/src/main/resources/META-INF/LICENSE.txt delete mode 100644 examples/camel-example-reportincident/src/main/resources/META-INF/NOTICE.txt delete mode 100644
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31993 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel-k] branch master updated: sanitize dependencies
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-k.git
The following commit(s) were added to refs/heads/master by this push:
new fde8e1f sanitize dependencies
fde8e1f is described below
commit fde8e1f049f4664eafe058a51303ce7b592dc450
Author: lburgazzoli
AuthorDate: Sun Feb 24 18:34:05 2019 +0100
sanitize dependencies
---
pkg/builder/builder_steps.go | 23 +++
pkg/builder/builder_steps_test.go | 60 ---
pkg/builder/kaniko/kaniko.go | 1 +
pkg/builder/s2i/s2i.go| 1 +
pkg/trait/builder_test.go | 4 +--
5 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/pkg/builder/builder_steps.go b/pkg/builder/builder_steps.go
index 3fb2be5..6fcd317 100644
--- a/pkg/builder/builder_steps.go
+++ b/pkg/builder/builder_steps.go
@@ -164,6 +164,29 @@ func InjectDependencies(ctx *Context) error {
return nil
}
+// SanitizeDependencies --
+func SanitizeDependencies(ctx *Context) error {
+ for i := 0; i < len(ctx.Project.Dependencies); i++ {
+ dep := ctx.Project.Dependencies[i]
+
+ switch dep.GroupID {
+ case "org.apache.camel":
+ //
+ // Remove the version so we force using the one
configured by the bom
+ //
+ ctx.Project.Dependencies[i].Version = ""
+ case "org.apache.camel.k":
+ //
+ // Force every runtime dependency to have the required
version discardin
+ // any version eventually set on the catalog
+ //
+ ctx.Project.Dependencies[i].Version =
ctx.Request.RuntimeVersion
+ }
+ }
+
+ return nil
+}
+
// ComputeDependencies --
func ComputeDependencies(ctx *Context) error {
p := path.Join(ctx.Path, "maven")
diff --git a/pkg/builder/builder_steps_test.go
b/pkg/builder/builder_steps_test.go
index fc69f33..bfad198 100644
--- a/pkg/builder/builder_steps_test.go
+++ b/pkg/builder/builder_steps_test.go
@@ -20,12 +20,10 @@ package builder
import (
"testing"
- "github.com/apache/camel-k/pkg/util/defaults"
-
- "github.com/apache/camel-k/pkg/util/test"
-
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/maven"
+ "github.com/apache/camel-k/pkg/util/test"
"github.com/stretchr/testify/assert"
)
@@ -171,3 +169,57 @@ func TestGenerateProjectWithRepositories(t *testing.T) {
assert.False(t, ctx.Project.Repositories[1].Releases.Enabled)
assert.True(t, ctx.Project.Repositories[1].Snapshots.Enabled)
}
+
+func TestSanitizeDependencies(t *testing.T) {
+ catalog, err := test.DefaultCatalog()
+ assert.Nil(t, err)
+
+ ctx := Context{
+ Catalog: catalog,
+ Request: Request{
+ Catalog:catalog,
+ RuntimeVersion: defaults.RuntimeVersion,
+ Platform: v1alpha1.IntegrationPlatformSpec{
+ Build: v1alpha1.IntegrationPlatformBuildSpec{
+ CamelVersion: catalog.Version,
+ },
+ },
+ Dependencies: []string{
+ "camel:undertow",
+ "mvn:org.apache.camel/camel-core/2.18.0",
+
"mvn:org.apache.camel.k/camel-k-runtime-jvm/1.0.0",
+ "mvn:com.mycompany/my-dep/1.2.3",
+ },
+ },
+ }
+
+ err = GenerateProject()
+ assert.Nil(t, err)
+ err = InjectDependencies()
+ assert.Nil(t, err)
+ err = SanitizeDependencies()
+ assert.Nil(t, err)
+
+ assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
+ GroupID:"org.apache.camel.k",
+ ArtifactID: "camel-k-runtime-jvm",
+ Version:defaults.RuntimeVersion,
+ Type: "jar",
+ })
+ assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
+ GroupID:"org.apache.camel",
+ ArtifactID: "camel-core",
+ Type: "jar",
+ })
+ assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
+ GroupID:"org.apache.camel",
+ ArtifactID: "camel-undertow",
+ Type: "jar",
+ })
+ assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
+ GroupID:"com.mycompany",
+ ArtifactID: "my-dep",
+ Version:"1.2.3",
+ Type: "jar",
+
[camel] branch master updated: Upgrade Smack to version 4.3.2
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 efa0066 Upgrade Smack to version 4.3.2 efa0066 is described below commit efa0066c133eca280c1ba87a1cfbb39cf6bd641d Author: Andrea Cosentino AuthorDate: Mon Feb 25 13:03:33 2019 +0100 Upgrade Smack to version 4.3.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 36ba5b5..7aa22ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -604,7 +604,7 @@ 1.1 1.7.25 1.7.25 -4.3.1 +4.3.2 1.23 1.1.4 2.6.3_1
[camel-k] branch master updated: Do not swallow error returned by controller actions
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new cfbb5f8 Do not swallow error returned by controller actions
cfbb5f8 is described below
commit cfbb5f88ab52cdedeb2003fcf4f20a0651628696
Author: Antonin Stefanutti
AuthorDate: Mon Feb 25 11:56:09 2019 +0100
Do not swallow error returned by controller actions
---
pkg/controller/integration/integration_controller.go | 2 +-
pkg/controller/integrationcontext/integrationcontext_controller.go | 2 +-
pkg/controller/integrationplatform/integrationplatform_controller.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go
b/pkg/controller/integration/integration_controller.go
index bff5513..adf6c7d 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -139,7 +139,7 @@ func (r *ReconcileIntegration) Reconcile(request
reconcile.Request) (reconcile.R
}, nil
}
- return reconcile.Result{}, nil
+ return reconcile.Result{}, err
}
}
}
diff --git a/pkg/controller/integrationcontext/integrationcontext_controller.go
b/pkg/controller/integrationcontext/integrationcontext_controller.go
index f432539..cefb27b 100644
--- a/pkg/controller/integrationcontext/integrationcontext_controller.go
+++ b/pkg/controller/integrationcontext/integrationcontext_controller.go
@@ -126,7 +126,7 @@ func (r *ReconcileIntegrationContext) Reconcile(request
reconcile.Request) (reco
}, nil
}
- return reconcile.Result{}, nil
+ return reconcile.Result{}, err
}
}
}
diff --git
a/pkg/controller/integrationplatform/integrationplatform_controller.go
b/pkg/controller/integrationplatform/integrationplatform_controller.go
index 385cad5..2960787 100644
--- a/pkg/controller/integrationplatform/integrationplatform_controller.go
+++ b/pkg/controller/integrationplatform/integrationplatform_controller.go
@@ -126,7 +126,7 @@ func (r *ReconcileIntegrationPlatform) Reconcile(request
reconcile.Request) (rec
}, nil
}
- return reconcile.Result{}, nil
+ return reconcile.Result{}, err
}
}
}
[camel-k-runtime] branch k-runtime-14 deleted (was 4cc1e99)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch k-runtime-14 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. was 4cc1e99 fix(deploy): Camel-k-runtime-merge job is failing, fixes #14 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k-runtime] branch travis-license deleted (was 1010fe6)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch travis-license in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. was 1010fe6 chore(refactor): Added license for .travis.yml The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k-runtime] 01/01: Merge pull request #15 from apache/k-runtime-14
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-k-runtime.git commit 66368478bda77a01c4042887298da0d97a7163fd Merge: 09eada9 4cc1e99 Author: Andrea Cosentino AuthorDate: Mon Feb 25 12:03:29 2019 +0100 Merge pull request #15 from apache/k-runtime-14 fix(deploy): Camel-k-runtime-merge job is failing, fixes #14 camel-k-runtime-bom/pom.xml | 35 ++- 1 file changed, 34 insertions(+), 1 deletion(-)
[camel-k-runtime] branch master updated (09eada9 -> 6636847)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. from 09eada9 Polished license header add 4cc1e99 fix(deploy): Camel-k-runtime-merge job is failing, fixes #14 new 6636847 Merge pull request #15 from apache/k-runtime-14 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-k-runtime-bom/pom.xml | 35 ++- 1 file changed, 34 insertions(+), 1 deletion(-)
[camel-k-runtime] branch k-runtime-14 created (now 4cc1e99)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch k-runtime-14 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at 4cc1e99 fix(deploy): Camel-k-runtime-merge job is failing, fixes #14 This branch includes the following new commits: new 37be71a Initial import new e2bfda2 Adding JVM runtime new 4363dca Add support for .js, .java and classes new 2dca3ec Fix integration with new runtime classes new dc0d072 swith to full in-memory java compiler and some minro cleanup new 839b67c Added Property placeholder for commons-lang3 version new dd37cbd runtime: add support for groovy new 252114f initial code for integration context new 92e35eb Bump Camel to version 2.22.1 new 6708ec9 add support for non java integrations new 6bf7879 Route loaders should derive language from 'kamel run --language' #46 new a5b3a25 kamel run should support adding dependencies #49 new 4f2828f kamel run runtime/examples/Sample.java fails with java.lang.NoClassDefFoundError #57 new 1ff678e Support for properties #62 new 20f1912 Support for environment variables #65 new 3996d16 Support for configmap and secrets #67 new 61c7692 Add support for XML routes #70 new 50631cf Bump version to 0.0.2-SNAPSHOT new 5c0f115 fix bug preventint integration to run new 8edda17 jvm: improve language detection new 525479e Context handling improvement new 6118f46 Embed camel catalog #93 new c14e7af Embed camel catalog #93 new aeba7a0 Implementation of auto-discovery new 3d6efa7 feat(examples): Add a Camel-caffeine Cache java sample new 40cc47d Bump version to 0.0.3-SNAPSHOT new 73ca6ce maven: plugin to generate detailed project dependencies new a2509a4 Add bindings for rest dsl in groovy/js routes #117 new aa37b99 Avoid deprecated addRoutes (replaced by includeRoutes) new 8404298 Fix typo new 9eb625c runtime: support for kotlin runtime new 7ff7efd support component configuration from properties new ea4dbdb Add initial DSL to bind object to camel registry new 5067f29 chore: small improvement to groovy dls new 493708d Added an example of binding object in Camel registry in groovy new c032749 Bump to next Snapshot new 4276333 runtime: enhance groovy dsl new 8e5ff08 runtime: improve groovy dsl new 8624567 runtime: improve kotlin dsl new be96f08 runtime: improve rest dsl for groovy and kotlin runtimes new 64a3b6a doc: add initial documentation about integration DSLs new b3e4d3c runtime: refine groovy dsl new de2dd4e Fixed errors during redeploy new 736ee40 runtime(groovy) : improve registry dsl new 6a5ac56 configure camel context from properties #175 new 124af0b chore(logging): move log colouring definition to runtime new 2c098ea Bump version to 0.0.5-SNAPSHOT new 4a988f7 runtime(kotlin) : switch to kotlin 1.3 scripting new 3d43779 chore(test) : switch to junit 5 new 191c209 chore(build): remove deprecated methos new 1d4126e runtime(kotline): update to kotlin 1.3.0 release new 8d6047b (chore) add an example of xml route new 1108cae cloudevents & knative new bcdef14 Added profiles and Knative serving new 09ee1f2 Add automatic configuration to Knative endpoints new 8b903a5 chore(runtime) : add a java rest example with restlet new 0ef99e2 chore(dependencies): update kotlin to v1.3.10 new d8a1f12 chore(dependencies): update camel to v2.22.2 new 08d45f0 chore(dependencies): update to maven 3.6.0 new a5fb2bd chore(runtime): configure maven surefire plugin new 4c056ab chore(runtime): replace test logging configuration via properties with xml configuiration for camel-knative submodule new 8305a60 Add eventing subscription new 2b77886 runtime: small improvement to the dependency lister plugin new c8c2ff6 Bump version to 0.0.6-SNAPSHOT new 5acc7fe runtime: add a netty4-http based knative component new 4643a42 Support for multiple integration definitions #45 new fea66ef fix findings new 9de9b09 initial support for spring boot new 07ba605 Fix #218: allow to push to Knative new 0752ace fix netty header new b47bc53 chore: support for computing knative channel/service host name from uri new a4326ad chore: remove spring boot example bits new e46e2e2 fix pr review findings new b6d18bb chore(dependencies): update camel to v2.23.0 new acd3d72 chore(dependencies): update junit-jupiter to v5.3.2 new be33da6 chore(deps): allign groovy version to the one used by camel 2.23.0 new 6366efd chore(deps): update joor to v0.9.10 new f4d97bb chore(runtime): code cleanup new 65cb562 (chore) reorganizing examples new 560024e Support for
[camel] branch master updated: Upgrade Caffeine to version 2.7.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 059a644 Upgrade Caffeine to version 2.7.0 059a644 is described below commit 059a644204d724b792b4fe3b40fbbe1df9a6 Author: Andrea Cosentino AuthorDate: Mon Feb 25 11:44:09 2019 +0100 Upgrade Caffeine to version 2.7.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0578da9..36ba5b5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -103,7 +103,7 @@ 1.12 0.9.5.3 0.9.5.3_1 -2.6.2 +2.7.0 1.0.6 3.6.0 19.0
