[camel] branch master updated: Fixed CS for Camel-Spring
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 59b1799 Fixed CS for Camel-Spring 59b1799 is described below commit 59b1799fb850ded7467a05e619379765a5f19011 Author: Andrea Cosentino AuthorDate: Fri Feb 1 07:56:57 2019 +0100 Fixed CS for Camel-Spring --- .../src/main/java/org/apache/camel/component/event/EventEndpoint.java | 4 ++-- .../src/main/java/org/apache/camel/spring/SpringCamelContext.java | 2 +- .../java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java | 2 +- .../java/org/apache/camel/spring/remoting/CamelServiceExporter.java | 2 +- .../java/org/apache/camel/spring/CamelContextFactoryBeanTest.java | 4 ++-- .../org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java | 4 ++-- .../java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java | 2 +- .../config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java | 4 ++-- .../spring/config/SpringCamelContextCustomThreadPoolProfileTest.java | 4 ++-- .../SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java | 4 ++-- .../camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java | 4 ++-- .../TransactedInterceptUsingAdviceWithSendToEndpointTest.java | 4 ++-- .../src/test/java/org/apache/camel/spring/processor/MyAggregator.java | 2 +- .../apache/camel/spring/processor/SpringComplexBlockWithEndTest.java | 4 ++-- .../processor/scattergather/LowestQuoteAggregationStrategy.java | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java index 45a1e86..6aaaf8b 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java +++ b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java @@ -19,12 +19,12 @@ package org.apache.camel.component.event; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.support.DefaultProducer; import org.apache.camel.processor.loadbalancer.LoadBalancer; import org.apache.camel.processor.loadbalancer.TopicLoadBalancer; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; +import org.apache.camel.support.DefaultProducer; import org.apache.camel.util.ObjectHelper; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java index 0ae04f8..d8e371d 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java @@ -21,7 +21,6 @@ import org.apache.camel.component.bean.BeanProcessor; import org.apache.camel.component.event.EventComponent; import org.apache.camel.component.event.EventEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.support.ProcessorEndpoint; import org.apache.camel.spi.Injector; import org.apache.camel.spi.ManagementMBeanAssembler; import org.apache.camel.spi.ModelJAXBContextFactory; @@ -29,6 +28,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.spring.spi.ApplicationContextRegistry; import org.apache.camel.spring.spi.SpringInjector; import org.apache.camel.spring.spi.SpringManagementMBeanAssembler; +import org.apache.camel.support.ProcessorEndpoint; import org.apache.camel.util.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java index 35e057f..1b71768 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java @@ -23,8 +23,8 @@ import org.apache.camel.FailedToCreateProducerException; import org.apache.camel.Producer; import org.apache.camel.component.bean.ProxyHelper; import org.apache.camel.spring.util.CamelContextResolverHelper; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.service.ServiceHelper; +import org.apache.camel.util.ObjectHelper; import org.springframework.beans.BeansException; import
[camel] branch camel-2.x updated: CAMEL-13084 Clean up the camel-example dependencies
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 13277e4 CAMEL-13084 Clean up the camel-example dependencies
13277e4 is described below
commit 13277e44c5066d996d74519cbb53d55e20ad4458
Author: Willem Jiang
AuthorDate: Fri Feb 1 11:08:23 2019 +0800
CAMEL-13084 Clean up the camel-example dependencies
---
examples/camel-example-rest-producer/pom.xml | 5 -
examples/camel-example-spring-boot/pom.xml | 5 -
examples/pom.xml | 25 -
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/examples/camel-example-rest-producer/pom.xml
b/examples/camel-example-rest-producer/pom.xml
index 5621d21..39f2ae4 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -58,11 +58,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-4.0.1
-
diff --git a/examples/camel-example-spring-boot/pom.xml
b/examples/camel-example-spring-boot/pom.xml
index 9cb269b..c7f633b 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -58,11 +58,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-4.0.1
-
diff --git a/examples/pom.xml b/examples/pom.xml
index 03c0e8a..80c55be 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -80,7 +80,7 @@
camel-example-loan-broker-cxf
camel-example-loan-broker-jms
camel-example-management
-camel-example-micrometer
+camel-example-micrometer
camel-example-mybatis
camel-example-netty-custom-correlation
camel-example-netty-http
@@ -151,9 +151,24 @@
${project.artifactId}
false
-
+4.0.1
+
+
+
+
+
+javax.servlet
+javax.servlet-api
+${javax.servlet.api.version}
+
+
+
+
@@ -260,9 +275,9 @@
true
-
add-remote-repo
[camel] branch master updated: CAMEL-13084 Clean up the camel-example dependencies
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 97b08d7 CAMEL-13084 Clean up the camel-example dependencies
97b08d7 is described below
commit 97b08d77d7f313c823e00be01caad7b694b23c3e
Author: Willem Jiang
AuthorDate: Fri Feb 1 11:08:23 2019 +0800
CAMEL-13084 Clean up the camel-example dependencies
---
examples/camel-example-fhir-auth-tx-spring-boot/pom.xml| 5 -
examples/camel-example-fhir-spring-boot/pom.xml| 5 -
examples/camel-example-rabbitmq/pom.xml| 5 -
examples/camel-example-rest-producer/pom.xml | 5 -
.../cluster-node/pom.xml | 5 -
.../application/pom.xml| 5 -
.../service/pom.xml| 5 -
examples/camel-example-spring-boot-master/pom.xml | 5 -
examples/camel-example-spring-boot-rest-swagger/pom.xml| 5 -
.../camel-example-spring-boot-servicecall/consumer/pom.xml | 5 -
.../pom.xml| 5 -
examples/camel-example-spring-boot-xml/pom.xml | 5 -
examples/camel-example-spring-boot/pom.xml | 5 -
.../consumer/pom.xml | 5 -
.../camel-example-spring-cloud-servicecall/service/pom.xml | 5 -
.../consumer/pom.xml | 5 -
.../service/pom.xml| 5 -
examples/camel-example-twitter-salesforce/pom.xml | 5 -
examples/camel-example-validator-spring-boot/pom.xml | 5 -
examples/pom.xml | 14 ++
20 files changed, 14 insertions(+), 95 deletions(-)
diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
index eb95990..4dc9f98 100644
--- a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
@@ -58,11 +58,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-${javax.servlet.api.version}
-
diff --git a/examples/camel-example-fhir-spring-boot/pom.xml
b/examples/camel-example-fhir-spring-boot/pom.xml
index 5d27f6f..7392138 100644
--- a/examples/camel-example-fhir-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-spring-boot/pom.xml
@@ -58,11 +58,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-${javax.servlet.api.version}
-
diff --git a/examples/camel-example-rabbitmq/pom.xml
b/examples/camel-example-rabbitmq/pom.xml
index 7d7c8e7..9990146 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -58,11 +58,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-${javax.servlet.api.version}
-
diff --git a/examples/camel-example-rest-producer/pom.xml
b/examples/camel-example-rest-producer/pom.xml
index ea0f08f..dc10f54 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -58,11 +58,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-${javax.servlet.api.version}
-
diff --git
a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
index 870b0c0..c8a5ef7 100644
---
a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
+++
b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
@@ -51,11 +51,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-${javax.servlet.api.version}
-
diff --git
a/examples/camel-example-spring-boot-health-checks/application/pom.xml
b/examples/camel-example-spring-boot-health-checks/application/pom.xml
index ad17bb6..8eaceb3 100644
--- a/examples/camel-example-spring-boot-health-checks/application/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/application/pom.xml
@@ -55,11 +55,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-${javax.servlet.api.version}
-
diff --git a/examples/camel-example-spring-boot-health-checks/service/pom.xml
b/examples/camel-example-spring-boot-health-checks/service/pom.xml
index 8979790..62c0ad4 100644
--- a/examples/camel-example-spring-boot-health-checks/service/pom.xml
+++
[camel] branch camel-2.23.x updated: CAMEL-13084 Clean up the camel-example dependencies
This is an automated email from the ASF dual-hosted git repository.
ningjiang 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 a66645c CAMEL-13084 Clean up the camel-example dependencies
a66645c is described below
commit a66645cf04fbe62aa94be9d1333c2f4f786e0439
Author: Willem Jiang
AuthorDate: Fri Feb 1 11:08:23 2019 +0800
CAMEL-13084 Clean up the camel-example dependencies
---
examples/camel-example-rest-producer/pom.xml | 5 -
examples/camel-example-spring-boot/pom.xml | 5 -
examples/pom.xml | 23 +++
3 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/examples/camel-example-rest-producer/pom.xml
b/examples/camel-example-rest-producer/pom.xml
index 0e96306..bbae384 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -57,11 +57,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-4.0.1
-
diff --git a/examples/camel-example-spring-boot/pom.xml
b/examples/camel-example-spring-boot/pom.xml
index 20fea0e..3f1e049 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -57,11 +57,6 @@
pom
import
-
-javax.servlet
-javax.servlet-api
-4.0.1
-
diff --git a/examples/pom.xml b/examples/pom.xml
index 89be640..81ac0b8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -80,7 +80,7 @@
camel-example-loan-broker-cxf
camel-example-loan-broker-jms
camel-example-management
-camel-example-micrometer
+camel-example-micrometer
camel-example-mybatis
camel-example-netty-custom-correlation
camel-example-netty-http
@@ -152,9 +152,24 @@
${project.artifactId}
false
+4.0.1
+
+
+
+
+javax.servlet
+javax.servlet-api
+${javax.servlet.api.version}
+
+
+
+
@@ -261,9 +276,9 @@
true
-
add-remote-repo
svn commit: r1039817 - in /websites/production/camel/content: 2019/01/29/camel-bof-at-fosdem-2019.html cache/main.pageCache index.html news.html
Author: buildbot Date: Thu Jan 31 22:20:40 2019 New Revision: 1039817 Log: Production update by buildbot for camel Modified: websites/production/camel/content/2019/01/29/camel-bof-at-fosdem-2019.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/index.html websites/production/camel/content/news.html Modified: websites/production/camel/content/2019/01/29/camel-bof-at-fosdem-2019.html == --- websites/production/camel/content/2019/01/29/camel-bof-at-fosdem-2019.html (original) +++ websites/production/camel/content/2019/01/29/camel-bof-at-fosdem-2019.html Thu Jan 31 22:20:40 2019 @@ -78,7 +78,7 @@ -Come join us at the https://fosdem.org/2019/schedule/event/bof_apache_camel/; rel="nofollow">Camel Birds of a Feather session at https://fosdem.org/2019/; rel="nofollow">FOSDEM 2019 this Saturday, 2.2.2019. from 12:00 to 13:00 in the Room H.3242 at Universit libre de Bruxelles Campus du Solbosch, Brussels, Belgium. For those not familiar with FOSDEM: Free and Open source Software Developers' European Meeting (FOSDEM) it's a two-day event organized by volunteers to promote the widespread use of free and open source software. It is the biggest free software event in Europe organized by the community. Entrance is completely free, there's no registration, you just need to show up. Find more information on the https://fosdem.org/2019/; rel="nofollow">FOSDEM 2019 website.On behalf of Camel PMC,Zoran Regvart +Come join us at the https://fosdem.org/2019/schedule/event/bof_apache_camel/; rel="nofollow">Camel Birds of a Feather session at https://fosdem.org/2019/; rel="nofollow">FOSDEM 2019 this Saturday, 2.2.2019. from 12:00 to 13:00 in the Room H.3242J.1.106 at Universit libre de Bruxelles Campus du Solbosch, Brussels, Belgium. For those not familiar with FOSDEM: Free and Open source Software Developers' European Meeting (FOSDEM) it's a two-day event organized by volunteers to promote the widespread use of free and open source software. It is the biggest free software event in Europe organized by the community. Entrance is completely free, there's no registration, you just need to show up. Find more information on the FOSDEM 2019 website.On behalf of Camel PMC,Zoran Regvart Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/index.html == --- websites/production/camel/content/index.html (original) +++ websites/production/camel/content/index.html Thu Jan 31 22:20:40 2019 @@ -78,7 +78,7 @@ - Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the asciidoc in the repository:https://github.com/apache/camel/blob/master/README.md; rel="nofollow">https://github.com/apache/camel/blob/master/README.mdhttps://github.com/apache/camel/blob/master/components/readme.adoc; rel="nofollow">https://github.com/apache/camel/blob/mas ter/components/readme.adocDownload it Today! http://camel.apache.org/images/camel-box-small.png; data-image-src="http://camel.apache.org/images/camel-box-small.png;>Apache Camel is a versatile open-source integration framework based on known Enter prise Integration Patterns.Camel empowers you to define routing and mediation rules in a variety of domain-specific languages, including a Java-based Fluent API, Spring or Blueprint XML Configuration files, and a Scala DSL. This means you get smart completion of routing rules in your IDE, whether in a Java, Scala or XML editor.Apache Camel uses URIs to work directly with any kind of Transport or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA or CXF, as well as pluggable Components and Data Format options. Apache Camel is a small library with minimal dependencies for easy embedding in any Java application. Apache Camel lets you work with the same API regardless which kind of Transport is used - so learn the API once and you can interact with all the Components provided out-of-box.Apache Camel provides support for Bean Binding and seamless integration with popular frameworks such as CDI,Spring, Blueprint and Guice. C amel also has extensive support for unit testing your routes.The following projects can leverage Apache Camel as a routing and mediation engine:http://servicemix.apache.org/;>Apache ServiceMix - a popular distributed open source ESB and JBI containerhttp://activemq.apache.org/;>Apache ActiveMQ - a mature, widely used open source message brokerhttp://cxf.apache.org/;>Apache CXF - a smart web services suite (JAX-WS and
[camel] branch master updated (2a0ba7d -> 77517f2)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 2a0ba7d Fixing ssh examples new ae8aa96 Clean pom for OSGi metadata new 77517f2 Fix CS for camel-util-json The 35176 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: .../java/org/apache/camel/util/json/Jsoner.java| 16 +++-- .../java/org/apache/camel/util/json/Yylex.java | 71 -- components/camel-atom/pom.xml | 9 --- components/camel-aws-xray/pom.xml | 1 + components/camel-aws/pom.xml | 2 +- components/camel-cometd/pom.xml| 1 - components/camel-consul/pom.xml| 1 + components/camel-core-osgi/pom.xml | 1 + components/camel-crypto-cms/pom.xml| 8 --- components/camel-crypto/pom.xml| 9 --- components/camel-dns/pom.xml | 8 --- components/camel-drill/pom.xml | 8 --- components/camel-elsql/pom.xml | 9 --- components/camel-flatpack/pom.xml | 1 + components/camel-jpa/pom.xml | 3 - components/camel-lucene/pom.xml| 9 --- components/camel-quartz2/pom.xml | 11 +--- components/camel-sql/pom.xml | 10 --- examples/camel-example-cdi-aws-s3/pom.xml | 4 ++ parent/pom.xml | 4 ++ 20 files changed, 64 insertions(+), 122 deletions(-)
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/31401 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/31400 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 camel-2.23.x updated: Fixing ssh examples
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 386564a Fixing ssh examples
386564a is described below
commit 386564a840bd32b7b74d1710aaccf1c92ff1b0fd
Author: Colm O hEigeartaigh
AuthorDate: Thu Jan 31 17:12:05 2019 +
Fixing ssh examples
---
examples/camel-example-ssh-security/README.md | 2 +-
.../src/main/resources/META-INF/spring/camelContext.xml | 2 +-
.../src/main/resources/META-INF/feature/features.xml | 2 +-
.../src/main/resources/META-INF/spring/camelContext.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/camel-example-ssh-security/README.md
b/examples/camel-example-ssh-security/README.md
index 9051ee2..57fedc7 100644
--- a/examples/camel-example-ssh-security/README.md
+++ b/examples/camel-example-ssh-security/README.md
@@ -50,7 +50,7 @@ For this example you will need to add a new user `scott` with
the key value from
Append the following to the `/etc/keys.properties` file
-
scott=B3NzaC1yc2EDAQABAAABAQC4MSqXneGVM9n3Rnqfya0D31crTx+J8X8dKZ5/+2Rq96/klnmt6uGyl+DI8G0HXVK66KqU2Z0qUE9ytOMR+zSPA+zU4Bhd3G82qdJsys7Nz8t9wSWQs8/ItWTjwg+b3vVLcI1Q8sSgfxqZvD/XQk4srbDs9ba55yjEPn5DOhA7UFbFAv8menSgbpNFMrUQQ9DJcMVlu3MOcMylI5UFFf1uvDD3vUoFXZa6GQOK9j1AGvfagGgBEqV4/AiKzDmQDFqMzmTfTfBpi1crY0SGXdT26PE4Knx7KP7bBJupBm6lJ9Pk39iw8dnDWcq45EEqrHsI0dps7/iQgYxYqBmFLIkP,admin
+
scott=B3NzaC1yc2EDAQABAAABAQC4MSqXneGVM9n3Rnqfya0D31crTx+J8X8dKZ5/+2Rq96/klnmt6uGyl+DI8G0HXVK66KqU2Z0qUE9ytOMR+zSPA+zU4Bhd3G82qdJsys7Nz8t9wSWQs8/ItWTjwg+b3vVLcI1Q8sSgfxqZvD/XQk4srbDs9ba55yjEPn5DOhA7UFbFAv8menSgbpNFMrUQQ9DJcMVlu3MOcMylI5UFFf1uvDD3vUoFXZa6GQOK9j1AGvfagGgBEqV4/AiKzDmQDFqMzmTfTfBpi1crY0SGXdT26PE4Knx7KP7bBJupBm6lJ9Pk39iw8dnDWcq45EEqrHsI0dps7/iQgYxYqBmFLIkP,_g_:admingroup
diff --git
a/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
b/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
index 4651d9c..c1d58a6 100644
---
a/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
+++
b/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
@@ -32,7 +32,7 @@
http://camel.apache.org/schema/spring;>
-
+
diff --git
a/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
b/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
index d4e2e0b..d814df2 100644
---
a/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
+++
b/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
@@ -26,6 +26,6 @@
camel-ssh
camel-spring
-
mvn:org.apache.camel.examples/camel-example-ssh/${project.version}
+
mvn:org.apache.camel.example/camel-example-ssh/${project.version}
diff --git
a/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
b/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
index d6f9e8f..6b72dae 100644
---
a/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
+++
b/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
@@ -31,14 +31,14 @@
-->
http://camel.apache.org/schema/spring;>
-
+
-features:list
+feature:list
[camel] branch master updated: Fixing ssh examples
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 2a0ba7d Fixing ssh examples
2a0ba7d is described below
commit 2a0ba7d185df562884dea0803c0c911196b826d2
Author: Colm O hEigeartaigh
AuthorDate: Thu Jan 31 17:12:05 2019 +
Fixing ssh examples
---
examples/camel-example-ssh-security/README.md | 2 +-
.../src/main/resources/META-INF/spring/camelContext.xml | 2 +-
.../src/main/resources/META-INF/feature/features.xml | 2 +-
.../src/main/resources/META-INF/spring/camelContext.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/camel-example-ssh-security/README.md
b/examples/camel-example-ssh-security/README.md
index 9051ee2..57fedc7 100644
--- a/examples/camel-example-ssh-security/README.md
+++ b/examples/camel-example-ssh-security/README.md
@@ -50,7 +50,7 @@ For this example you will need to add a new user `scott` with
the key value from
Append the following to the `/etc/keys.properties` file
-
scott=B3NzaC1yc2EDAQABAAABAQC4MSqXneGVM9n3Rnqfya0D31crTx+J8X8dKZ5/+2Rq96/klnmt6uGyl+DI8G0HXVK66KqU2Z0qUE9ytOMR+zSPA+zU4Bhd3G82qdJsys7Nz8t9wSWQs8/ItWTjwg+b3vVLcI1Q8sSgfxqZvD/XQk4srbDs9ba55yjEPn5DOhA7UFbFAv8menSgbpNFMrUQQ9DJcMVlu3MOcMylI5UFFf1uvDD3vUoFXZa6GQOK9j1AGvfagGgBEqV4/AiKzDmQDFqMzmTfTfBpi1crY0SGXdT26PE4Knx7KP7bBJupBm6lJ9Pk39iw8dnDWcq45EEqrHsI0dps7/iQgYxYqBmFLIkP,admin
+
scott=B3NzaC1yc2EDAQABAAABAQC4MSqXneGVM9n3Rnqfya0D31crTx+J8X8dKZ5/+2Rq96/klnmt6uGyl+DI8G0HXVK66KqU2Z0qUE9ytOMR+zSPA+zU4Bhd3G82qdJsys7Nz8t9wSWQs8/ItWTjwg+b3vVLcI1Q8sSgfxqZvD/XQk4srbDs9ba55yjEPn5DOhA7UFbFAv8menSgbpNFMrUQQ9DJcMVlu3MOcMylI5UFFf1uvDD3vUoFXZa6GQOK9j1AGvfagGgBEqV4/AiKzDmQDFqMzmTfTfBpi1crY0SGXdT26PE4Knx7KP7bBJupBm6lJ9Pk39iw8dnDWcq45EEqrHsI0dps7/iQgYxYqBmFLIkP,_g_:admingroup
diff --git
a/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
b/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
index 4651d9c..c1d58a6 100644
---
a/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
+++
b/examples/camel-example-ssh-security/src/main/resources/META-INF/spring/camelContext.xml
@@ -32,7 +32,7 @@
http://camel.apache.org/schema/spring;>
-
+
diff --git
a/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
b/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
index d4e2e0b..d814df2 100644
---
a/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
+++
b/examples/camel-example-ssh/src/main/resources/META-INF/feature/features.xml
@@ -26,6 +26,6 @@
camel-ssh
camel-spring
-
mvn:org.apache.camel.examples/camel-example-ssh/${project.version}
+
mvn:org.apache.camel.example/camel-example-ssh/${project.version}
diff --git
a/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
b/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
index d6f9e8f..6b72dae 100644
---
a/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
+++
b/examples/camel-example-ssh/src/main/resources/META-INF/spring/camelContext.xml
@@ -31,14 +31,14 @@
-->
http://camel.apache.org/schema/spring;>
-
+
-features:list
+feature:list
[camel-k] branch master updated: Default OpenShift proxy client principal in Jolokia trait
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 c57247e Default OpenShift proxy client principal in Jolokia trait
c57247e is described below
commit c57247e1648668b6e136ae2b4cde1c6abdf779af
Author: Antonin Stefanutti
AuthorDate: Thu Jan 31 16:56:49 2019 +0100
Default OpenShift proxy client principal in Jolokia trait
---
pkg/trait/jolokia.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index a851215..ba9b8b7 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -73,6 +73,7 @@ func (t *jolokiaTrait) Configure(e *Environment) (bool,
error) {
setDefaultJolokiaOption(options, , "protocol",
"https")
setDefaultJolokiaOption(options, , "caCert",
"/var/run/secrets/kubernetes.io/serviceaccount/ca.crt")
setDefaultJolokiaOption(options, ,
"extendedClientCheck", true)
+ setDefaultJolokiaOption(options, ,
"clientPrincipal", "cn=system:master-proxy")
setDefaultJolokiaOption(options, ,
"useSslClientAuthentication", true)
}
[camel-k] branch master updated: Factorize CSV map string parsing
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 49df1be Factorize CSV map string parsing
49df1be is described below
commit 49df1be1c6096202e8ce90451f9243803e9fa940
Author: Antonin Stefanutti
AuthorDate: Thu Jan 31 15:47:14 2019 +0100
Factorize CSV map string parsing
---
pkg/trait/jolokia.go| 23 ++-
pkg/trait/prometheus.go | 22 +-
pkg/trait/util.go | 25 +
3 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 7a29a6f..a851215 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -19,7 +19,6 @@ package trait
import (
"errors"
- "fmt"
"strconv"
"strings"
@@ -61,7 +60,7 @@ func newJolokiaTrait() *jolokiaTrait {
}
func (t *jolokiaTrait) Configure(e *Environment) (bool, error) {
- options, err := parseJolokiaOptions(t.Options)
+ options, err := parseCsvMap(t.Options)
if err != nil {
return false, err
}
@@ -93,7 +92,7 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) {
// Configure the Jolokia Java agent
// Populate first with the extra options
- options, err := parseJolokiaOptions(t.Options)
+ options, err := parseCsvMap(t.Options)
if err != nil {
return err
}
@@ -182,21 +181,3 @@ func addToJolokiaOptions(options map[string]string, key
string, value interface{
}
}
}
-
-func parseJolokiaOptions(options *string) (map[string]string, error) {
- m := make(map[string]string)
-
- if options == nil || len(*options) == 0 {
- return m, nil
- }
-
- for _, option := range strings.Split(*options, ",") {
- kv := strings.Split(option, "=")
- if len(kv) != 2 {
- return nil, fmt.Errorf("invalid option [%s] in options
[%s]", option, *options)
- }
- m[kv[0]] = kv[1]
- }
-
- return m, nil
-}
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index d0a494e..eedf7f4 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -19,9 +19,7 @@ package trait
import (
"errors"
- "fmt"
"strconv"
- "strings"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/envvar"
@@ -117,7 +115,7 @@ func (t *prometheusTrait) Apply(e *Environment) (err error)
{
}
func (t *prometheusTrait) getServiceMonitorFor(e *Environment)
(*monitoringv1.ServiceMonitor, error) {
- labels, err := parseLabels(t.Labels)
+ labels, err := parseCsvMap()
if err != nil {
return nil, err
}
@@ -148,21 +146,3 @@ func (t *prometheusTrait) getServiceMonitorFor(e
*Environment) (*monitoringv1.Se
}
return , nil
}
-
-func parseLabels(labels string) (map[string]string, error) {
- m := make(map[string]string)
-
- if len(labels) == 0 {
- return m, nil
- }
-
- for _, label := range strings.Split(labels, ",") {
- kv := strings.Split(label, "=")
- if len(kv) != 2 {
- return nil, fmt.Errorf("invalid label [%s] in labels
[%s]", label, labels)
- }
- m[kv[0]] = kv[1]
- }
-
- return m, nil
-}
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index 14554e7..3d58f74 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -19,6 +19,8 @@ package trait
import (
"context"
+ "fmt"
+ "regexp"
"strings"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
@@ -99,3 +101,26 @@ func VisitKeyValConfigurations(
}
}
}
+
+var (
+ csvMapRegexp = regexp.MustCompile(`^(\w+)=([^,]+)(?:,(\w+)=([^,]+))*$`)
+)
+
+func parseCsvMap(csvMap *string) (map[string]string, error) {
+ m := make(map[string]string)
+
+ if csvMap == nil || len(*csvMap) == 0 {
+ return m, nil
+ }
+
+ if !csvMapRegexp.MatchString(*csvMap) {
+ return nil, fmt.Errorf("cannot parse [%s] as CSV map", *csvMap)
+ }
+
+ matches := csvMapRegexp.FindStringSubmatch(*csvMap)[2:]
+ for i := range matches[:len(matches)-1] {
+ m[matches[i]] = matches[i+1]
+ }
+
+ return m, nil
+}
[camel-k] branch master updated: Update Jolokia trait documentation
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.git The following commit(s) were added to refs/heads/master by this push: new 055c0fb Update Jolokia trait documentation new 637f32a Merge pull request #404 from astefanutti/jolokia-03 055c0fb is described below commit 055c0fb21be5d28a7fefc490c347ea1f01f68f31 Author: Antonin Stefanutti AuthorDate: Thu Jan 31 16:42:49 2019 +0100 Update Jolokia trait documentation --- docs/traits.adoc | 33 +++-- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/docs/traits.adoc b/docs/traits.adoc index 60456cb..76b36ed 100644 --- a/docs/traits.adoc +++ b/docs/traits.adoc @@ -161,17 +161,38 @@ The following is a list of common traits that can be configured by the end users [cols="m,"] !=== +! jolokia.protocol +! The protocol to use, either `http` or `https` (default `https` for OpenShift) + +! jolokia.host +! The Hostaddress to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). + ! jolokia.port ! The Jolokia endpoint port (default `8778`). -! jolokia.openshift-ssl-auth -! Configures OpenShift proxy SSL client authentication (only applicable for the OpenShift profile, default `true`) +! jolokia.user +! The user to be used for authentication -! jolokia.options -! A comma-separared list of Jolokia options as defined in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], e.g.: `protocol=https,extendedClientCheck=false` +! jolokia.password +! The password used for authentication, applicable when the `user` option is set + +! jolokia.discovery-enabled +! Listen for multicast requests (default `false`) + +! jolokia.use-ssl-client-authentication +! Whether client certificates should be used for authentication (default `true` for OpenShift) -! jolokia.random-password -! Generates a random password for basic authentication +! jolokia.ca-cert +! The PEM encoded CA certification file path, used to verify client certificates, applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` (default `/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` for OpenShift). + +! jolokia.client-principal +! The principal which must be given in a client certificate to allow access to the Jolokia endpoint, applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` (default `clientPrincipal=cn=system:master-proxy` for OpenShift). + +! jolokia.extended-client-check +! Mandate the client certificate contains a client flag in the extended key usage section, applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` (default `true` for OpenShift). + +! jolokia.options +! A comma-separared list of additional Jolokia options as defined in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], e.g.: `keystore=...,executor=...` !===
[camel] branch master updated (cc0f768 -> 820d3fa)
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 cc0f768 CAMEL-13148 - Camel-AWS IAM: Make the operations more robust new 596d0ca Added a Jenkins Pipeline to run Karaf Integration tests new 820d3fa Added a Jenkins Pipeline for Spring Boot Integration Tests The 35173 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: Jenkinsfile => Jenkinsfile.karaf | 54 Jenkinsfile => Jenkinsfile.sb| 49 +++- 2 files changed, 36 insertions(+), 67 deletions(-) copy Jenkinsfile => Jenkinsfile.karaf (59%) copy Jenkinsfile => Jenkinsfile.sb (59%)
[camel] branch master updated: CAMEL-13148 - Camel-AWS IAM: Make the operations more robust
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 cc0f768 CAMEL-13148 - Camel-AWS IAM: Make the operations more robust
cc0f768 is described below
commit cc0f7686376e330bc869a91f97d5315de76bf5e0
Author: Andrea Cosentino
AuthorDate: Thu Jan 31 15:09:04 2019 +0100
CAMEL-13148 - Camel-AWS IAM: Make the operations more robust
---
.../camel/component/aws/iam/IAMProducer.java | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
index b5bc330..4e6558e 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
@@ -152,6 +152,8 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.USERNAME))) {
String userName =
exchange.getIn().getHeader(IAMConstants.USERNAME, String.class);
request.withUserName(userName);
+} else {
+throw new IllegalArgumentException("User Name must be specified");
}
CreateUserResult result;
try {
@@ -169,6 +171,8 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.USERNAME))) {
String userName =
exchange.getIn().getHeader(IAMConstants.USERNAME, String.class);
request.withUserName(userName);
+} else {
+throw new IllegalArgumentException("User Name must be specified");
}
DeleteUserResult result;
try {
@@ -186,6 +190,8 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.USERNAME))) {
String userName =
exchange.getIn().getHeader(IAMConstants.USERNAME, String.class);
request.withUserName(userName);
+} else {
+throw new IllegalArgumentException("User Name must be specified");
}
GetUserResult result;
try {
@@ -215,7 +221,7 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.USERNAME))) {
String userName =
exchange.getIn().getHeader(IAMConstants.USERNAME, String.class);
request.withUserName(userName);
-}
+}
CreateAccessKeyResult result;
try {
result = iamClient.createAccessKey(request);
@@ -284,11 +290,13 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.GROUP_NAME))) {
String groupName =
exchange.getIn().getHeader(IAMConstants.GROUP_NAME, String.class);
request.withGroupName(groupName);
+} else {
+throw new IllegalArgumentException("Group Name must be specified");
}
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.GROUP_PATH))) {
String groupPath =
exchange.getIn().getHeader(IAMConstants.GROUP_PATH, String.class);
request.withPath(groupPath);
-}
+}
CreateGroupResult result;
try {
result = iamClient.createGroup(request);
@@ -305,6 +313,8 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.GROUP_NAME))) {
String groupName =
exchange.getIn().getHeader(IAMConstants.GROUP_NAME, String.class);
request.withGroupName(groupName);
+} else {
+throw new IllegalArgumentException("Group Name must be specified");
}
DeleteGroupResult result;
try {
@@ -334,10 +344,14 @@ public class IAMProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.GROUP_NAME))) {
String groupName =
exchange.getIn().getHeader(IAMConstants.GROUP_NAME, String.class);
request.withGroupName(groupName);
+} else {
+throw new IllegalArgumentException("Group Name must be specified");
}
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAMConstants.USERNAME))) {
String userName =
exchange.getIn().getHeader(IAMConstants.USERNAME, String.class);
request.withUserName(userName);
+} else {
+throw new IllegalArgumentException("User Name must be specified");
}
AddUserToGroupResult result;
try {
@@ -355,10
[camel-k] branch master updated: chore(maven): simplify maven model
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 e415310 chore(maven): simplify maven model
e415310 is described below
commit e4153106bb59cb5e2d9f8e3ed02b27d14b2c
Author: lburgazzoli
AuthorDate: Wed Jan 30 18:01:15 2019 +0100
chore(maven): simplify maven model
---
pkg/builder/builder_steps.go | 17 +--
pkg/builder/builder_steps_test.go | 28 ++--
pkg/builder/builder_utils.go | 20 ++-
pkg/builder/springboot/generator.go| 23 ++-
pkg/util/maven/maven_project.go| 158 ++---
.../{maven_project.go => maven_project_types.go} | 138 +++---
pkg/util/maven/maven_test.go | 72 +-
7 files changed, 95 insertions(+), 361 deletions(-)
diff --git a/pkg/builder/builder_steps.go b/pkg/builder/builder_steps.go
index 555befc..fe90b78 100644
--- a/pkg/builder/builder_steps.go
+++ b/pkg/builder/builder_steps.go
@@ -47,9 +47,7 @@ func GenerateProject(ctx *Context) error {
// Repositories
//
- ctx.Project.Repositories = maven.Repositories{
- Repositories: make([]maven.Repository, 0,
len(ctx.Request.Repositories)),
- }
+ ctx.Project.Repositories = make([]maven.Repository, 0,
len(ctx.Request.Repositories))
for i, r := range ctx.Request.Repositories {
repo := maven.NewRepository(r)
@@ -57,15 +55,14 @@ func GenerateProject(ctx *Context) error {
repo.ID = fmt.Sprintf("repo-%03d", i)
}
- ctx.Project.Repositories.Repositories =
append(ctx.Project.Repositories.Repositories, repo)
+ ctx.Project.Repositories = append(ctx.Project.Repositories,
repo)
}
//
// set-up dependencies
//
- deps :=
- deps.AddGAV("org.apache.camel.k", "camel-k-runtime-jvm",
version.Version)
+ ctx.Project.AddDependencyGAV("org.apache.camel.k",
"camel-k-runtime-jvm", version.Version)
for _, d := range ctx.Request.Dependencies {
switch {
@@ -76,7 +73,7 @@ func GenerateProject(ctx *Context) error {
artifactID = "camel-" + artifactID
}
- deps.AddGAV("org.apache.camel", artifactID, "")
+ ctx.Project.AddDependencyGAV("org.apache.camel",
artifactID, "")
case strings.HasPrefix(d, "camel-k:"):
artifactID := strings.TrimPrefix(d, "camel-k:")
@@ -84,16 +81,16 @@ func GenerateProject(ctx *Context) error {
artifactID = "camel-" + artifactID
}
- deps.AddGAV("org.apache.camel.k", artifactID,
version.Version)
+ ctx.Project.AddDependencyGAV("org.apache.camel.k",
artifactID, version.Version)
case strings.HasPrefix(d, "mvn:"):
mid := strings.TrimPrefix(d, "mvn:")
gav := strings.Replace(mid, "/", ":", -1)
- deps.AddEncodedGAV(gav)
+ ctx.Project.AddEncodedDependencyGAV(gav)
case strings.HasPrefix(d, "runtime:"):
artifactID := strings.Replace(d, "runtime:",
"camel-k-runtime-", 1)
- deps.AddGAV("org.apache.camel.k", artifactID,
version.Version)
+ ctx.Project.AddDependencyGAV("org.apache.camel.k",
artifactID, version.Version)
default:
return fmt.Errorf("unknown dependency type: %s", d)
}
diff --git a/pkg/builder/builder_steps_test.go
b/pkg/builder/builder_steps_test.go
index ad31eb9..eebf28c 100644
--- a/pkg/builder/builder_steps_test.go
+++ b/pkg/builder/builder_steps_test.go
@@ -44,18 +44,18 @@ func TestGenerateProject(t *testing.T) {
assert.Nil(t, err)
- assert.Equal(t, 1,
len(ctx.Project.DependencyManagement.Dependencies.Dependencies))
- assert.Equal(t, "org.apache.camel",
ctx.Project.DependencyManagement.Dependencies.Dependencies[0].GroupID)
- assert.Equal(t, "camel-bom",
ctx.Project.DependencyManagement.Dependencies.Dependencies[0].ArtifactID)
- assert.Equal(t, "2.22.1",
ctx.Project.DependencyManagement.Dependencies.Dependencies[0].Version)
- assert.Equal(t, "pom",
ctx.Project.DependencyManagement.Dependencies.Dependencies[0].Type)
- assert.Equal(t, "import",
ctx.Project.DependencyManagement.Dependencies.Dependencies[0].Scope)
-
- assert.Equal(t, 2, len(ctx.Project.Repositories.Repositories))
- assert.Equal(t, "apache-snapshots",
ctx.Project.Repositories.Repositories[0].ID)
- assert.False(t,
[camel-k] branch master updated: Improve error handling while parsing Prometheus service monitor labels
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 ec8f3b8 Improve error handling while parsing Prometheus service
monitor labels
ec8f3b8 is described below
commit ec8f3b8edd6538107841a3f0ff41e513bfcd2546
Author: Antonin Stefanutti
AuthorDate: Wed Jan 30 18:21:54 2019 +0100
Improve error handling while parsing Prometheus service monitor labels
---
pkg/trait/prometheus.go | 34 +-
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 66121a8..d0a494e 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -18,12 +18,13 @@ limitations under the License.
package trait
import (
- "strings"
+ "errors"
+ "fmt"
"strconv"
+ "strings"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/envvar"
- "github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,7 +37,7 @@ type prometheusTrait struct {
BaseTrait `property:",squash"`
Labels string `property:"labels"`
- Port int `property:"port"`
+ Port int`property:"port"`
}
const prometheusPortName = "prometheus"
@@ -106,14 +107,20 @@ func (t *prometheusTrait) Apply(e *Environment) (err
error) {
})
// Add the ServiceMonitor resource
- smt := t.getServiceMonitorFor(e)
+ smt, err := t.getServiceMonitorFor(e)
+ if err != nil {
+ return err
+ }
e.Resources.Add(smt)
return nil
}
-func (t *prometheusTrait) getServiceMonitorFor(e *Environment)
*monitoringv1.ServiceMonitor {
- labels := parseLabels(t.Labels)
+func (t *prometheusTrait) getServiceMonitorFor(e *Environment)
(*monitoringv1.ServiceMonitor, error) {
+ labels, err := parseLabels(t.Labels)
+ if err != nil {
+ return nil, err
+ }
labels["camel.apache.org/integration"] = e.Integration.Name
smt := monitoringv1.ServiceMonitor{
@@ -139,14 +146,23 @@ func (t *prometheusTrait) getServiceMonitorFor(e
*Environment) *monitoringv1.Ser
},
},
}
- return
+ return , nil
}
-func parseLabels(labels string) map[string]string {
+func parseLabels(labels string) (map[string]string, error) {
m := make(map[string]string)
+
+ if len(labels) == 0 {
+ return m, nil
+ }
+
for _, label := range strings.Split(labels, ",") {
kv := strings.Split(label, "=")
+ if len(kv) != 2 {
+ return nil, fmt.Errorf("invalid label [%s] in labels
[%s]", label, labels)
+ }
m[kv[0]] = kv[1]
}
- return m
+
+ return m, nil
}
[camel] branch master updated (d93eaae -> 4c8964d)
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 d93eaae Fix OSGi problems with manifest generation new ef07da1 Fixed JMS Tests new 4c8964d Fixed CS in Camel-JMS The 35170 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/component/ActiveMQComponent.java | 259 + 1 file changed, 259 insertions(+) create mode 100644 components/camel-jms/src/test/java/org/apache/activemq/camel/component/ActiveMQComponent.java
[camel] branch master updated (d54f4a1 -> d93eaae)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d54f4a1 Regen new c40b23f Clean up poms a bit new 9ad51ee Generate legal files for new modules new d93eaae Fix OSGi problems with manifest generation The 35168 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-api/pom.xml | 41 ++--- camel-base/pom.xml| 71 --- camel-management-api/pom.xml | 30 +++--- camel-management-impl/pom.xml | 25 --- camel-util/pom.xml| 56 -- parent/pom.xml| 3 +- 6 files changed, 55 insertions(+), 171 deletions(-)
[camel] branch master updated: Regen
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 d54f4a1 Regen d54f4a1 is described below commit d54f4a184b681fe48e8e6b999fc14d9479982c25 Author: Andrea Cosentino AuthorDate: Thu Jan 31 13:04:41 2019 +0100 Regen --- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index decc926..ce16e5c 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3336,7 +3336,7 @@ org.awaitility awaitility -3.1.5 +3.1.6 org.cassandraunit
[camel] branch master updated (90e005e -> 64c670a)
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 90e005e Fixed CS for Camel-Itest new 8bd2a7e Fixed CS for Camel-test-blueprint new 64c670a Fixed CS for Camel-test-spring The 35164 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: .../java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java| 4 ++-- .../main/java/org/apache/camel/test/spring/RouteCoverageDumper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch master updated: Fixed CS for Camel-Itest
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 90e005e Fixed CS for Camel-Itest 90e005e is described below commit 90e005e87d4fd2f8fd766e2a0a2e88170cfc0c97 Author: Andrea Cosentino AuthorDate: Thu Jan 31 11:41:33 2019 +0100 Fixed CS for Camel-Itest --- .../src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java | 2 +- .../test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java | 2 +- .../test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/DynamicRouteTest.java| 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java | 4 ++-- .../test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java| 4 ++-- .../java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java | 4 ++-- .../src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jms/JmsValidatorTest.java| 2 +- .../java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java | 2 +- .../src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java index d06f98b..f82b1f7 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java @@ -25,8 +25,8 @@ import org.apache.camel.impl.JndiRegistry; import org.apache.camel.impl.StringDataFormat; import org.apache.camel.itest.CamelJmsTestHelper; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.support.jndi.JndiContext; +import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Before; import org.junit.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java index 774e856..4a26102 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java @@ -26,8 +26,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jms.JmsComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.CamelJmsTestHelper; -import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.support.jndi.JndiContext; +import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java index 74df394..0eb7886 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java @@ -24,10 +24,10 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.util.ObjectHelper; -import org.apache.camel.support.ResourceHelper; import org.apache.camel.util.StringHelper; import org.junit.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java index 845f58d..226b81f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java @@ -24,10 +24,10 @@ import
[camel] branch master updated: Fixed CS for Camel-Util
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 38e5ee1 Fixed CS for Camel-Util
38e5ee1 is described below
commit 38e5ee102ba5393ed0b821e31eae408a716c1e60
Author: Andrea Cosentino
AuthorDate: Thu Jan 31 11:30:48 2019 +0100
Fixed CS for Camel-Util
---
.../main/java/org/apache/camel/util/IOHelper.java | 93 --
.../src/main/java/org/apache/camel/util/Pair.java | 13 +-
.../java/org/apache/camel/util/URISupport.java | 141 -
3 files changed, 141 insertions(+), 106 deletions(-)
diff --git a/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
b/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
index 3acc734..fbac259 100644
--- a/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* IO helper class.
*/
public final class IOHelper {
-
+
public static Supplier defaultCharset = Charset::defaultCharset;
public static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
@@ -56,17 +56,18 @@ public final class IOHelper {
private static final Logger LOG = LoggerFactory.getLogger(IOHelper.class);
private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
-// allows to turn on backwards compatible to turn off regarding the first
read byte with value zero (0b0) as EOL.
+// allows to turn on backwards compatible to turn off regarding the first
+// read byte with value zero (0b0) as EOL.
// See more at CAMEL-11672
-private static final boolean ZERO_BYTE_EOL_ENABLED =
-"true".equalsIgnoreCase(System.getProperty("camel.zeroByteEOLEnabled",
"true"));
+private static final boolean ZERO_BYTE_EOL_ENABLED =
"true".equalsIgnoreCase(System.getProperty("camel.zeroByteEOLEnabled", "true"));
private IOHelper() {
// Utility Class
}
-
+
/**
- * Use this function instead of new String(byte[]) to avoid surprises from
non-standard default encodings.
+ * Use this function instead of new String(byte[]) to avoid surprises from
+ * non-standard default encodings.
*/
public static String newStringFromBytes(byte[] bytes) {
try {
@@ -77,8 +78,8 @@ public final class IOHelper {
}
/**
- * Use this function instead of new String(byte[], int, int)
- * to avoid surprises from non-standard default encodings.
+ * Use this function instead of new String(byte[], int, int) to avoid
+ * surprises from non-standard default encodings.
*/
public static String newStringFromBytes(byte[] bytes, int start, int
length) {
try {
@@ -195,8 +196,7 @@ public final class IOHelper {
}
if (LOG.isTraceEnabled()) {
-LOG.trace("Copying InputStream: {} -> OutputStream: {} with
buffer: {} and flush on each write {}",
-new Object[]{input, output, bufferSize, flushOnEachWrite});
+LOG.trace("Copying InputStream: {} -> OutputStream: {} with
buffer: {} and flush on each write {}", new Object[] {input, output,
bufferSize, flushOnEachWrite});
}
int total = 0;
@@ -205,7 +205,8 @@ public final class IOHelper {
boolean hasData;
if (ZERO_BYTE_EOL_ENABLED) {
-// workaround issue on some application servers which can return 0
(instead of -1)
+// workaround issue on some application servers which can return 0
+// (instead of -1)
// as first byte to indicate end of stream (CAMEL-11672)
hasData = n > 0;
} else {
@@ -227,11 +228,11 @@ public final class IOHelper {
}
return total;
}
-
+
public static void copyAndCloseInput(InputStream input, OutputStream
output) throws IOException {
copyAndCloseInput(input, output, DEFAULT_BUFFER_SIZE);
}
-
+
public static void copyAndCloseInput(InputStream input, OutputStream
output, int bufferSize) throws IOException {
copy(input, output, bufferSize);
close(input, null, LOG);
@@ -251,11 +252,13 @@ public final class IOHelper {
}
/**
- * Forces any updates to this channel's file to be written to the storage
device that contains it.
+ * Forces any updates to this channel's file to be written to the storage
+ * device that contains it.
*
* @param channel the file channel
* @param name the name of the resource
- * @param log the log to use when reporting warnings, will use this
class's own {@link Logger} if log == null
+ * @param log the log to use when reporting warnings, will use this class's
+ *own {@link Logger} if log == null
*/
public static void
[camel] branch master updated: Upgrade Vertx to version 3.6.3
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 146f987 Upgrade Vertx to version 3.6.3 146f987 is described below commit 146f98782a816abd6d10e280e568aa4c3ac176ce Author: Andrea Cosentino AuthorDate: Thu Jan 31 11:23:52 2019 +0100 Upgrade Vertx to version 3.6.3 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f628a94..ade1675 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -681,7 +681,7 @@ 1.7_6 2.0 2.0 -3.6.2 +3.6.3 0.7 3.6.0 0.8.0
[camel] branch master updated: [CAMEL-13129] Move osgi out of camel-core
This is an automated email from the ASF dual-hosted git repository.
gnodet 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 e65d069 [CAMEL-13129] Move osgi out of camel-core
e65d069 is described below
commit e65d06954105e0b74b49735dc892739e1b10cfb1
Author: Guillaume Nodet
AuthorDate: Thu Jan 31 10:12:38 2019 +0100
[CAMEL-13129] Move osgi out of camel-core
---
camel-core/pom.xml | 7 --
components/camel-blueprint/pom.xml | 78 --
components/camel-core-osgi/pom.xml | 7 ++
.../apache/camel/core/osgi/impl}/Activator.java| 2 +-
.../org/apache/camel/core/osgi/impl}/package.html | 0
components/camel-spring/pom.xml| 62 -
.../karaf/features/src/main/resources/features.xml | 5 +-
7 files changed, 11 insertions(+), 150 deletions(-)
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 1ed38f4..f8c5416 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -63,13 +63,6 @@
org.apache.camel.pollconsumer.quartz2;${camel.osgi.import.strict.version},
net.sf.saxon
-
- osgi.extender; osgi.extender="org.apache.camel";
uses:="org.apache.camel.impl.osgi";
- version:Version="$(version;==;${camel.osgi.version.clean})"
-
-
- org.apache.camel.impl.osgi.Activator
-
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 1df6410..d834ebb 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -36,27 +36,6 @@
2.4.0
java,osgi
-
-
- !org.apache.camel.blueprint.*,
- !org.apache.camel.util.blueprint.*,
- !org.apache.camel.core.osgi.*,
- !org.apache.camel.core.xml.*,
- org.apache.camel.*;${camel.osgi.import.strict.version},
- org.osgi.service.event*;resolution:=optional,
- org.apache.karaf.bundle.core;version="[4,5)";resolution:=optional,
- org.apache.aries*;version="[1.0,2)",
- ${camel.osgi.import.defaults},
- *
-
-
- org.apache.camel.blueprint*;${camel.osgi.version},
- org.apache.camel.util.blueprint*;${camel.osgi.version}
-
-
- org.apache.camel.core.osgi*,
- org.apache.camel.core.xml*
-
@@ -148,63 +127,6 @@
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-3.1.1
-
-
-unpack
-prepare-package
-
- unpack
-
-
-
-
- org.apache.camel
- camel-core-xml
- ${project.version}
- org/apache/camel/**
-
${project.build.directory}/classes
-
-
- org.apache.camel
- camel-core-osgi
- ${project.version}
- org/apache/camel/**
-
${project.build.directory}/classes
-
-
-
-
-
-
-
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-attach-artifacts
-package
-
- attach-artifact
-
-
-
-
-
${project.build.directory}/schema/camel-blueprint.xsd
- xsd
-
-
-
-
-
-
-
org.apache.camel
diff --git a/components/camel-core-osgi/pom.xml
b/components/camel-core-osgi/pom.xml
index 7c263e5..5bed2b8 100644
--- a/components/camel-core-osgi/pom.xml
+++ b/components/camel-core-osgi/pom.xml
@@ -36,6 +36,13 @@
org.osgi.service.event;resolution:=optional,
*
+
+ osgi.extender; osgi.extender="org.apache.camel";
uses:="org.apache.camel.core.osgi.impl";
+ version:Version="$(version;==;${camel.osgi.version.clean})"
+
+
+ org.apache.camel.core.osgi.impl.Activator
+
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
similarity index 99%
rename from camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
rename to
components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index 27b0f45..ce309ff 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.osgi;
[camel] branch master updated: Okay we gotta use the specific languages here as the xml dsl will output it as generic language instead of header/consntant etc.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 34df9f4 Okay we gotta use the specific languages here as the xml dsl
will output it as generic language instead of header/consntant etc.
34df9f4 is described below
commit 34df9f431e1e456252bdeeebc28f508c72aa3296
Author: Claus Ibsen
AuthorDate: Thu Jan 31 09:41:20 2019 +0100
Okay we gotta use the specific languages here as the xml dsl will output it
as generic language instead of header/consntant etc.
---
.../main/java/org/apache/camel/builder/ExpressionClauseSupport.java| 3 +++
1 file changed, 3 insertions(+)
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index b6a972d..a11ff09 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -46,6 +46,9 @@ import org.apache.camel.model.language.XQueryExpression;
*/
public class ExpressionClauseSupport {
+// Implementation detail: We must use the specific model.language.xxx
classes to make the DSL use these specific types
+// which ensures that the route model dumped as XML uses these types, eg
instead of etc.
+
private T result;
private Expression expressionValue;
private ExpressionDefinition expressionType;
[camel] branch master updated: Okay we gotta use the specific languages here as the xml dsl will output it as generic language instead of header/consntant etc.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d9a8a7a Okay we gotta use the specific languages here as the xml dsl
will output it as generic language instead of header/consntant etc.
d9a8a7a is described below
commit d9a8a7ac83d2ea2ac4df7e4870077e828ef7f556
Author: Claus Ibsen
AuthorDate: Thu Jan 31 09:34:52 2019 +0100
Okay we gotta use the specific languages here as the xml dsl will output it
as generic language instead of header/consntant etc.
---
.../camel/builder/ExpressionClauseSupport.java | 34 +++---
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 6d1aec6..b6a972d 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -21,11 +21,21 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.model.language.ConstantExpression;
+import org.apache.camel.model.language.ExchangePropertyExpression;
import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.model.language.GroovyExpression;
+import org.apache.camel.model.language.HeaderExpression;
+import org.apache.camel.model.language.JavaScriptExpression;
import org.apache.camel.model.language.JsonPathExpression;
import org.apache.camel.model.language.LanguageExpression;
import org.apache.camel.model.language.MethodCallExpression;
+import org.apache.camel.model.language.MvelExpression;
+import org.apache.camel.model.language.OgnlExpression;
+import org.apache.camel.model.language.RefExpression;
import org.apache.camel.model.language.SimpleExpression;
+import org.apache.camel.model.language.SpELExpression;
+import org.apache.camel.model.language.TerserExpression;
import org.apache.camel.model.language.TokenizerExpression;
import org.apache.camel.model.language.XMLTokenizerExpression;
import org.apache.camel.model.language.XPathExpression;
@@ -67,7 +77,11 @@ public class ExpressionClauseSupport {
* do not use this if you want dynamic values during routing.
*/
public T constant(Object value) {
-return expression(ExpressionBuilder.constantExpression(value));
+if (value instanceof String) {
+return expression(new ConstantExpression((String) value));
+} else {
+return expression(ExpressionBuilder.constantExpression(value));
+}
}
/**
@@ -124,7 +138,7 @@ public class ExpressionClauseSupport {
* An expression of an inbound message header of the given name
*/
public T header(String name) {
-return expression(new LanguageExpression("header", name));
+return expression(new HeaderExpression(name));
}
/**
@@ -166,7 +180,7 @@ public class ExpressionClauseSupport {
* An expression of an exchange property of the given name
*/
public T exchangeProperty(String name) {
-return expression(ExpressionBuilder.exchangePropertyExpression(name));
+return expression(new ExchangePropertyExpression(name));
}
/**
@@ -268,7 +282,7 @@ public class ExpressionClauseSupport {
* @return the builder to continue processing the DSL
*/
public T groovy(String text) {
-return expression(new LanguageExpression("groovy", text));
+return expression(new GroovyExpression(text));
}
/**
@@ -282,7 +296,7 @@ public class ExpressionClauseSupport {
*/
@Deprecated
public T javaScript(String text) {
-return expression(new LanguageExpression("js", text));
+return expression(new JavaScriptExpression(text));
}
/**
@@ -468,7 +482,7 @@ public class ExpressionClauseSupport {
* @return the builder to continue processing the DSL
*/
public T ognl(String text) {
-return expression(new LanguageExpression("ognl", text));
+return expression(new OgnlExpression(text));
}
/**
@@ -479,7 +493,7 @@ public class ExpressionClauseSupport {
* @return the builder to continue processing the DSL
*/
public T mvel(String text) {
-return expression(new LanguageExpression("mvel", text));
+return expression(new MvelExpression(text));
}
/**
@@ -490,7 +504,7 @@ public class ExpressionClauseSupport {
* @return the builder to continue processing the DSL
*/
public T ref(String ref) {
-return expression(new LanguageExpression("ref", ref));
+return expression(new
[camel] branch master updated: Upgrade Awaitility to version 3.1.6
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 1c15b96 Upgrade Awaitility to version 3.1.6 1c15b96 is described below commit 1c15b96f4d7ec696cc2fd8af3cb76b84931402f4 Author: Andrea Cosentino AuthorDate: Thu Jan 31 09:28:00 2019 +0100 Upgrade Awaitility to version 3.1.6 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 068ba83..f628a94 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -81,7 +81,7 @@ 1.8.2 1.8.2_1 1.8.2_1 -3.1.5 +3.1.6 1.11.469_1 1.11.469 2.1.0
