camel git commit: CAMEL-9957 camel-kafka producer sends the message in an async way

2016-05-10 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 2657ce788 -> 123f08fa4


CAMEL-9957 camel-kafka producer sends the message in an async way


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/123f08fa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/123f08fa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/123f08fa

Branch: refs/heads/master
Commit: 123f08fa4c7161167e986fed33f318e7b5ad460a
Parents: 2657ce7
Author: Willem Jiang 
Authored: Wed May 11 11:55:13 2016 +0800
Committer: Willem Jiang 
Committed: Wed May 11 11:55:13 2016 +0800

--
 .../camel/component/kafka/KafkaProducer.java| 54 +---
 .../component/kafka/KafkaProducerTest.java  | 52 +++
 2 files changed, 100 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/123f08fa/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 4f6468b..0c4013f 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -18,14 +18,18 @@ package org.apache.camel.component.kafka;
 
 import java.util.Properties;
 
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
 import org.apache.camel.CamelException;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
 
-public class KafkaProducer extends DefaultProducer {
+public class KafkaProducer extends DefaultProducer implements AsyncProcessor {
 
 private org.apache.kafka.clients.producer.KafkaProducer kafkaProducer;
 private final KafkaEndpoint endpoint;
@@ -69,9 +73,7 @@ public class KafkaProducer extends DefaultProducer {
 }
 }
 
-@Override
-@SuppressWarnings("unchecked")
-public void process(Exchange exchange) throws CamelException {
+protected ProducerRecord createRecorder(Exchange exchange) throws 
CamelException {
 String topic = endpoint.getTopic();
 if (!endpoint.isBridgeEndpoint()) {
 topic = exchange.getIn().getHeader(KafkaConstants.TOPIC, topic, 
String.class);
@@ -96,9 +98,15 @@ public class KafkaProducer extends DefaultProducer {
 log.warn("No message key or partition key set");
 record = new ProducerRecord(topic, msg);
 }
+return record;
+}
+
+@Override
+@SuppressWarnings("unchecked")
+public void process(Exchange exchange) throws CamelException {
 
-// TODO: add support for async callback
-// requires a thread pool for processing outgoing routing
+ProducerRecord record = createRecorder(exchange);
+// Just send out the record in the sync way
 try {
 kafkaProducer.send(record).get();
 } catch (Exception e) {
@@ -106,4 +114,38 @@ public class KafkaProducer extends DefaultProducer {
 }
 }
 
+@Override
+public boolean process(Exchange exchange, AsyncCallback callback) {
+try {
+ProducerRecord record = createRecorder(exchange);
+kafkaProducer.send(record, new KafkaProducerCallBack(exchange, 
callback));
+// Finishing the processing in an async way
+return false;
+} catch (Exception ex) {
+// Just set the exception back to the client
+exchange.setException(ex);
+callback.done(true);
+return true;
+}
+}
+
+class KafkaProducerCallBack implements Callback {
+
+private Exchange exchange;
+private AsyncCallback callback;
+
+KafkaProducerCallBack(Exchange exchange, AsyncCallback callback) {
+this.exchange = exchange;
+this.callback = callback;
+}
+
+@Override
+public void onCompletion(RecordMetadata recordMetadata, Exception e) {
+if (e != null) {
+// Just set the exception back
+exchange.setException(e);
+}
+callback.done(false);
+}
+}
 }

buildbot success in on camel-site-production

2016-05-10 Thread buildbot 
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/7583

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

2016-05-10 Thread buildbot 
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/7582

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 git commit: CAMEL-9884 : remove final from Producer/Consumer class definition, fix typo in pom

2016-05-10 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 9a473f398 -> 2657ce788


CAMEL-9884 : remove final from Producer/Consumer class definition, fix typo in 
pom


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2657ce78
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2657ce78
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2657ce78

Branch: refs/heads/master
Commit: 2657ce78877d8358f4ae686baf6f1f9a920f2f50
Parents: 9a473f3
Author: lburgazzoli 
Authored: Tue May 10 19:13:57 2016 +0200
Committer: lburgazzoli 
Committed: Tue May 10 19:13:57 2016 +0200

--
 components/camel-ehcache/pom.xml   | 2 +-
 .../java/org/apache/camel/component/ehcache/EhcacheConsumer.java   | 2 +-
 .../java/org/apache/camel/component/ehcache/EhcacheProducer.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2657ce78/components/camel-ehcache/pom.xml
--
diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml
index c9ec2ab..2f66af7 100644
--- a/components/camel-ehcache/pom.xml
+++ b/components/camel-ehcache/pom.xml
@@ -27,7 +27,7 @@
 
   camel-ehcache
   jar
-  Camel : Ehcache
+  Camel :: Ehcache
   Camel Ehcache support
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/2657ce78/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
--
diff --git 
a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
 
b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
index 1129081..0098974 100644
--- 
a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
+++ 
b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
@@ -24,7 +24,7 @@ import org.ehcache.Cache;
 import org.ehcache.event.CacheEvent;
 import org.ehcache.event.CacheEventListener;
 
-public final class EhcacheConsumer extends DefaultConsumer implements 
CacheEventListener {
+public class EhcacheConsumer extends DefaultConsumer implements 
CacheEventListener {
 private final EhcacheConfiguration configuration;
 private final EhcacheManager manager;
 private final Cache cache;

http://git-wip-us.apache.org/repos/asf/camel/blob/2657ce78/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
--
diff --git 
a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
 
b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
index 1015c66..5967270 100644
--- 
a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
+++ 
b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
@@ -26,7 +26,7 @@ import org.apache.camel.NoSuchHeaderException;
 import org.apache.camel.impl.DefaultProducer;
 import org.ehcache.Cache;
 
-public final class EhcacheProducer extends DefaultProducer {
+public class EhcacheProducer extends DefaultProducer {
 private final EhcacheConfiguration configuration;
 private final EhcacheManager manager;
 private final Cache cache;

camel git commit: CAMEL-9884 : Create a camel-ehcache component

2016-05-10 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master eef0e9d73 -> 9a473f398


CAMEL-9884 : Create a camel-ehcache component


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a473f39
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a473f39
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a473f39

Branch: refs/heads/master
Commit: 9a473f3980f679b62a22fc6a191b54164ad38001
Parents: eef0e9d
Author: lburgazzoli 
Authored: Tue May 10 15:12:12 2016 +0200
Committer: lburgazzoli 
Committed: Tue May 10 15:13:34 2016 +0200

--
 apache-camel/pom.xml|   4 +
 .../src/main/descriptors/common-bin.xml |   1 +
 components/camel-ehcache/pom.xml|  83 +
 .../component/ehcache/EhcacheComponent.java |  49 +++
 .../component/ehcache/EhcacheConfiguration.java | 356 ++
 .../component/ehcache/EhcacheConstants.java |  39 ++
 .../component/ehcache/EhcacheConsumer.java  |  75 
 .../component/ehcache/EhcacheEndpoint.java  |  84 +
 .../camel/component/ehcache/EhcacheManager.java |  99 +
 .../component/ehcache/EhcacheProducer.java  | 203 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/ehcache |   1 +
 .../component/ehcache/EhcacheConsumerTest.java  |  71 
 .../component/ehcache/EhcacheProducerTest.java  | 361 +++
 .../component/ehcache/EhcacheTestSupport.java   | 105 ++
 .../test/resources/ehcache/ehcache-config.xml   |  34 ++
 .../src/test/resources/log4j.properties |  21 ++
 components/pom.xml  |   1 +
 parent/pom.xml  |   8 +-
 .../features/src/main/resources/features.xml|   5 +
 .../camel/itest/karaf/CamelEhcacheTest.java |  35 ++
 22 files changed, 1848 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9a473f39/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 95b808a..8f8c2f7 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -213,6 +213,10 @@
 
 
   org.apache.camel
+  camel-ehcache
+
+
+  org.apache.camel
   camel-ejb
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/9a473f39/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 34a34f1..ae84bf4 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -66,6 +66,7 @@
 org.apache.camel:camel-dozer
 org.apache.camel:camel-dropbox
 org.apache.camel:camel-eclipse
+org.apache.camel:camel-ehcache
 org.apache.camel:camel-ejb
 org.apache.camel:camel-elasticsearch
 org.apache.camel:camel-elsql

http://git-wip-us.apache.org/repos/asf/camel/blob/9a473f39/components/camel-ehcache/pom.xml
--
diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml
new file mode 100644
index 000..c9ec2ab
--- /dev/null
+++ b/components/camel-ehcache/pom.xml
@@ -0,0 +1,83 @@
+
+
+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/maven-v4_0_0.xsd;>
+
+  4.0.0
+
+  
+org.apache.camel
+components
+2.18-SNAPSHOT
+  
+
+  camel-ehcache
+  jar
+  Camel : Ehcache
+  Camel Ehcache support
+
+  
+
+  org.apache.camel.component.ehcache.*,
+
+
+  org.apache.camel.spi.ComponentResolver;component=ehcache
+
+  
+
+  
+
+  org.apache.camel
+  camel-core
+
+
+  org.ehcache
+  ehcache
+  ${ehcache3-version}
+
+
+
+
+  org.apache.camel
+  camel-test
+  test
+
+
+  org.slf4j
+  slf4j-log4j12
+  test
+
+
+  log4j
+  log4j
+  test
+
+
+  org.mockito
+  mockito-all
+  ${mockito-version}
+  test
+
+
+  org.hamcrest
+  java-hamcrest
+  ${hamcrest-version}
+  test
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/camel/blob/9a473f39/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheComponent.java
--
diff --git

camel git commit: Upgrade Cassandra Driver to version 3.0.1

2016-05-10 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 3173d96ca -> eef0e9d73


Upgrade Cassandra Driver to version 3.0.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eef0e9d7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eef0e9d7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eef0e9d7

Branch: refs/heads/master
Commit: eef0e9d7345516011df89daba0ae02d03f7e9a60
Parents: 3173d96
Author: Andrea Cosentino 
Authored: Tue May 10 13:28:43 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue May 10 13:28:43 2016 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/eef0e9d7/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 54a312f..d5eb6f5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -85,7 +85,7 @@
 2.3.0
 1.0.0-M3
 
camel-test-spring
-3.0.0
+3.0.1
 18.0
 3.5
 3.0.0.1

[1/2] camel git commit: Added camel-mongodb docs to Gitbook

2016-05-10 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 35be1b70e -> 3173d96ca


Added camel-mongodb docs to Gitbook


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38fefbcb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38fefbcb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38fefbcb

Branch: refs/heads/master
Commit: 38fefbcb482998559a2a5f5376062b4423af2d35
Parents: 35be1b7
Author: Andrea Cosentino 
Authored: Tue May 10 09:01:40 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue May 10 09:01:40 2016 +0200

--
 .../camel-mongodb/src/main/docs/mongodb.adoc| 814 +++
 docs/user-manual/en/SUMMARY.md  |   1 +
 2 files changed, 815 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/38fefbcb/components/camel-mongodb/src/main/docs/mongodb.adoc
--
diff --git a/components/camel-mongodb/src/main/docs/mongodb.adoc 
b/components/camel-mongodb/src/main/docs/mongodb.adoc
new file mode 100644
index 000..a6032a0
--- /dev/null
+++ b/components/camel-mongodb/src/main/docs/mongodb.adoc
@@ -0,0 +1,814 @@
+[[MongoDB-CamelMongoDBcomponent]]
+Camel MongoDB component
+~~~
+
+*Available as of Camel 2.10*
+
+According to Wikipedia: "NoSQL is a movement promoting a loosely defined
+class of non-relational data stores that break with a long history of
+relational databases and ACID guarantees." NoSQL solutions have grown in
+popularity in the last few years, and major extremely-used sites and
+services such as Facebook, LinkedIn, Twitter, etc. are known to use them
+extensively to achieve scalability and agility.
+
+Basically, NoSQL solutions differ from traditional RDBMS (Relational
+Database Management Systems) in that they don't use SQL as their query
+language and generally don't offer ACID-like transactional behaviour nor
+relational data. Instead, they are designed around the concept of
+flexible data structures and schemas (meaning that the traditional
+concept of a database table with a fixed schema is dropped), extreme
+scalability on commodity hardware and blazing-fast processing.
+
+MongoDB is a very popular NoSQL solution and the camel-mongodb component
+integrates Camel with MongoDB allowing you to interact with MongoDB
+collections both as a producer (performing operations on the collection)
+and as a consumer (consuming documents from a MongoDB collection).
+
+MongoDB revolves around the concepts of documents (not as is office
+documents, but rather hierarchical data defined in JSON/BSON) and
+collections. This component page will assume you are familiar with them.
+Otherwise, visit http://www.mongodb.org/[http://www.mongodb.org/].
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-mongodb
+x.y.z
+
+
+
+
+[[MongoDB-URIformat]]
+URI format
+~~
+
+[source,java]
+---
+mongodb:connectionBean?database=databaseName=collectionName=operationName[]
+---
+
+[[MongoDB-options]]
+MongoDB options
+~~~
+
+
+// component options: START
+The MongoDB component has no options.
+// component options: END
+
+
+
+// endpoint options: START
+The MongoDB component supports 22 endpoint options which are listed below:
+
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|===
+| Name | Group | Default | Java Type | Description
+| connectionBean | common |  | String | *Required* Name of com.mongodb.Mongo 
to use.
+| collection | common |  | String | Sets the name of the MongoDB collection to 
bind to this endpoint
+| collectionIndex | common |  | String | Sets the collection index (JSON 
FORMAT : field1 : order1 field2 : order2)
+| createCollection | common | true | boolean | Create collection during 
initialisation if it doesn't exist. Default is true.
+| cursorRegenerationDelay | common | 1000 | long | MongoDB tailable cursors 
will block until new data arrives. If no new data is inserted after some time 
the cursor will be automatically freed and closed by the MongoDB server. The 
client is expected to regenerate the cursor if needed. This value specifies the 
time to wait before attempting to fetch a new cursor and if the attempt fails 
how long before the next attempt is made. Default value is 1000ms.
+|

[2/2] camel git commit: Upgrade Spring-boot to version 1.3.5.RELEASE

2016-05-10 Thread acosentino 
Upgrade Spring-boot to version 1.3.5.RELEASE


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3173d96c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3173d96c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3173d96c

Branch: refs/heads/master
Commit: 3173d96ca480b1ca1c9a21c0a01bf5c4d8f14eca
Parents: 38fefbc
Author: Andrea Cosentino 
Authored: Tue May 10 09:24:54 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue May 10 09:24:54 2016 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3173d96c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a285391..54a312f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -509,7 +509,7 @@
 1.5.0.0_1
 3.0.7.RELEASE
 3.0.7.RELEASE_1
-1.3.4.RELEASE
+1.3.5.RELEASE
 1.2.0
 1.6.5.RELEASE
 1.6.4.RELEASE

[1/2] camel git commit: Upgrade HtmlUnit and related bundle to version 2.20 in camel-linkedin

2016-05-10 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 250de646d -> 04179ec97


Upgrade HtmlUnit and related bundle to version 2.20 in camel-linkedin


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fc41734
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fc41734
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fc41734

Branch: refs/heads/camel-2.17.x
Commit: 1fc41734872ab82c82ecadf8970332afe968313e
Parents: 250de64
Author: Andrea Cosentino 
Authored: Thu Apr 28 14:36:54 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue May 10 09:06:31 2016 +0200

--
 .../component/linkedin/api/LinkedInOAuthRequestFilter.java  | 4 ++--
 parent/pom.xml  | 4 ++--
 platforms/karaf/features/src/main/resources/features.xml| 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1fc41734/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index 7c5def9..4d781d1 100644
--- 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -93,7 +93,7 @@ public final class LinkedInOAuthRequestFilter implements 
ClientRequestFilter {
 this.oAuthToken = null;
 
 // create HtmlUnit client
-webClient = new WebClient(BrowserVersion.FIREFOX_24);
+webClient = new WebClient(BrowserVersion.FIREFOX_38);
 final WebClientOptions options = webClient.getOptions();
 options.setRedirectEnabled(true);
 options.setJavaScriptEnabled(false);
@@ -224,7 +224,7 @@ public final class LinkedInOAuthRequestFilter implements 
ClientRequestFilter {
 }
 
 public void close() {
-webClient.closeAllWindows();
+webClient.close();
 }
 
 private OAuthToken getAccessToken(String refreshToken) throws IOException {

http://git-wip-us.apache.org/repos/asf/camel/blob/1fc41734/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ff9fe76..6ea3bca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,8 +234,8 @@
 2.3.0
 1.0.1
 2.3.3
-2.15
-2.15_1
+2.20
+2.20_1
 1.7
 4.4.4
 4.5.2

http://git-wip-us.apache.org/repos/asf/camel/blob/1fc41734/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index a2906c1..8d4b50f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1027,12 +1027,13 @@
 mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
 mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-version}
-wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14
+wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.18
 wrap:mvn:org.w3c.css/sac/1.3
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}
 mvn:commons-collections/commons-collections/${commons-collections-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
-wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21
+wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22
+wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/2.17
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}

[2/2] camel git commit: Upgrade HtmlUnit and related bundle to version 2.20 in camel-box

2016-05-10 Thread acosentino 
Upgrade HtmlUnit and related bundle to version 2.20 in camel-box


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/04179ec9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04179ec9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04179ec9

Branch: refs/heads/camel-2.17.x
Commit: 04179ec97a6f3aad0c781055af2f959cdfe4c455
Parents: 1fc4173
Author: Andrea Cosentino 
Authored: Thu Apr 28 14:47:17 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue May 10 09:06:40 2016 +0200

--
 .../apache/camel/component/box/internal/LoginAuthFlowUI.java| 2 +-
 platforms/karaf/features/src/main/resources/features.xml| 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/04179ec9/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
--
diff --git 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
index d5d2d33..8044ecd 100644
--- 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
+++ 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
@@ -84,7 +84,7 @@ public final class LoginAuthFlowUI implements IAuthFlowUI {
 // TODO run this on an Executor to make it async
 
 // create HtmlUnit client
-final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_24);
+final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_38);
 final WebClientOptions options = webClient.getOptions();
 options.setRedirectEnabled(true);
 options.setJavaScriptEnabled(false);

http://git-wip-us.apache.org/repos/asf/camel/blob/04179ec9/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 8d4b50f..bf8886b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -224,12 +224,13 @@
 mvn:commons-io/commons-io/${commons-io-version}
 wrap:mvn:net.box/boxjavalibv2/${boxjavalibv2.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-version}
-wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14
+wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.18
 wrap:mvn:org.w3c.css/sac/1.3
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}
 mvn:commons-collections/commons-collections/${commons-collections-version}
-wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21
+wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22
+wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/2.17
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}