camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/3] git commit: A bunch of dependency upgrades.
Date Fri, 12 Jul 2013 12:47:40 GMT
A bunch of dependency upgrades.


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

Branch: refs/heads/master
Commit: 11644925786635d42742b7c70ccd24b8b367711a
Parents: 736a849
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Jul 12 11:47:40 2013 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Jul 12 11:47:40 2013 +0200

----------------------------------------------------------------------
 components/camel-ftp/pom.xml                    |  2 +-
 components/camel-jsch/pom.xml                   |  2 +-
 .../src/test/resources/log4j.properties         |  2 +-
 .../org/apache/camel/rx/ObservableBody.java     |  6 +--
 .../org/apache/camel/rx/ObservableMessage.java  |  7 +--
 .../java/org/apache/camel/rx/ReactiveCamel.java |  6 +--
 .../camel/rx/support/EndpointObservable.java    |  2 +-
 .../camel/rx/support/EndpointSubscription.java  |  5 ++-
 .../camel/rx/support/ObservableProcessor.java   |  9 ++--
 .../apache/camel/rx/support/ObserverSender.java |  5 ++-
 .../camel/rx/support/ProcessorToObserver.java   |  2 +-
 parent/pom.xml                                  | 45 ++++++++++----------
 .../features/src/main/resources/features.xml    |  2 +
 13 files changed, 50 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-ftp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 62393d5..4a1c0a0 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
     <camel.osgi.import.before.defaults>
-        com.jcraft.jsch.*;version="[0.1.40,0.1.50)",
+        com.jcraft.jsch.*;version="[0.1.40,0.2)",
         org.apache.camel.component.file.strategy;${camel.osgi.import.strict.version}
     </camel.osgi.import.before.defaults>
     <camel.osgi.export.pkg>org.apache.camel.component.file.remote.*</camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-jsch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index 5c6d86c..7c6c4ea 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -33,7 +33,7 @@
 
   <properties>
     <camel.osgi.import.before.defaults>
-        com.jcraft.jsch.*;version="[0.1.40,0.1.50)",
+        com.jcraft.jsch.*;version="[0.1.40,0.2)",
         org.apache.camel.component.file.strategy;${camel.osgi.import.strict.version}
     </camel.osgi.import.before.defaults>
     <camel.osgi.export.pkg>org.apache.camel.component.jsch.*</camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-jsch/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/test/resources/log4j.properties b/components/camel-jsch/src/test/resources/log4j.properties
index d3a9f47..2e3ddb7 100644
--- a/components/camel-jsch/src/test/resources/log4j.properties
+++ b/components/camel-jsch/src/test/resources/log4j.properties
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used for testing
 #
 log4j.rootLogger=INFO, file
 

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java b/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java
index 0758bfe..0dc05af 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java
@@ -20,9 +20,9 @@ import org.apache.camel.rx.support.ExchangeToBodyFunc1;
 import org.apache.camel.rx.support.ObservableProcessor;
 
 /**
- * A base class for a {@link Processor} which allows you to process
- * messages using an {@link Observable< org.apache.camel.Message>} by implementing
the
- * abstract {@link org.apache.camel.rx.support.ObservableProcessor#configure(rx.Observable}
method.
+ * A base class for a {@link org.apache.camel.Processor} which allows you to process
+ * messages using an {@link rx.Observable < org.apache.camel.Message>} by implementing
the
+ * abstract {@link org.apache.camel.rx.support.ObservableProcessor#configure(rx.Observable})
method.
  */
 public abstract class ObservableBody<T> extends ObservableProcessor<T> {
     private final Class<T> bodyType;

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java
index 3c621ce..ecd3e31 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java
@@ -21,11 +21,12 @@ import org.apache.camel.rx.support.ExchangeToMessageFunc1;
 import org.apache.camel.rx.support.ObservableProcessor;
 
 /**
- * A base class for a {@link Processor} which allows you to process
- * messages using an {@link Observable<Message>} by implementing the
- * abstract {@link org.apache.camel.rx.support.ObservableProcessor#configure(rx.Observable}
method.
+ * A base class for a {@link org.apache.camel.Processor} which allows you to process
+ * messages using an {@link rx.Observable <Message>} by implementing the
+ * abstract {@link org.apache.camel.rx.support.ObservableProcessor#configure(rx.Observable)}
method.
  */
 public abstract class ObservableMessage extends ObservableProcessor<Message> {
+
     public ObservableMessage() {
         super(ExchangeToMessageFunc1.getInstance());
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
index 8e88165..d17e7a1 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
@@ -60,8 +60,6 @@ public class ReactiveCamel {
         return toObservable(endpoint(uri), bodyType);
     }
 
-
-
     /**
      * Returns an {@link rx.Observable < org.apache.camel.Message >} to allow the messages
sent on the endpoint
      * to be processed using  <a href="https://rx.codeplex.com/">Reactive Extensions</a>
@@ -88,6 +86,7 @@ public class ReactiveCamel {
     /**
      * Sends events on the given {@link Observable} to the given camel endpoint
      */
+    @SuppressWarnings("unchecked")
     public <T> void sendTo(Observable<T> observable, Endpoint endpoint) {
         try {
             ObserverSender observer = new ObserverSender(endpoint);
@@ -97,7 +96,6 @@ public class ReactiveCamel {
         }
     }
 
-
     public CamelContext getCamelContext() {
         return camelContext;
     }
@@ -106,11 +104,11 @@ public class ReactiveCamel {
         return CamelContextHelper.getMandatoryEndpoint(camelContext, endpointUri);
     }
 
-
     /**
      * Returns a newly created {@link Observable} given a function which converts
      * the {@link Exchange} from the Camel consumer to the required type
      */
+    @SuppressWarnings("unchecked")
     protected <T> Observable<T> createEndpointObservable(final Endpoint endpoint,
                                                          final Func1<Exchange, T> converter)
{
         Func1<Observer<Message>, Subscription> func = new Func1<Observer<Message>,
Subscription>() {

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
index a302c11..1cd89c8 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java
@@ -24,7 +24,7 @@ import rx.Subscription;
 import rx.util.functions.Func1;
 
 /**
- * An {@link Observerable} Camel {@link Endpoint}
+ * An {@link Observable} Camel {@link Endpoint}
  */
 public class EndpointObservable<T> extends Observable<T> {
     private final Endpoint endpoint;

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
index b6f92a5..1684838 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
@@ -21,6 +21,7 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 
+import org.apache.camel.util.ServiceHelper;
 import rx.Observer;
 import rx.Subscription;
 import rx.util.functions.Func1;
@@ -42,7 +43,7 @@ public class EndpointSubscription<T> implements Subscription {
         Processor processor = new ProcessorToObserver<T>(func, observer);
         try {
             this.consumer = endpoint.createConsumer(processor);
-            this.consumer.start();
+            ServiceHelper.startService(consumer);
         } catch (Exception e) {
             observer.onError(e);
         }
@@ -57,7 +58,7 @@ public class EndpointSubscription<T> implements Subscription {
     public void unsubscribe() {
         if (consumer != null) {
             try {
-                consumer.stop();
+                ServiceHelper.stopServices(consumer);
 
                 // TODO should this fire the observer.onComplete()?
                 observer.onCompleted();

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
index 8164c8d..056f591 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
@@ -21,6 +21,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.support.ServiceSupport;
 
 import rx.Observable;
+import rx.subjects.PublishSubject;
 import rx.subjects.Subject;
 import rx.util.functions.Func1;
 
@@ -29,9 +30,10 @@ import rx.util.functions.Func1;
  * so that the messages can be processed using the <a href="https://github.com/Netflix/RxJava/wiki">RX
Java API</a>
  */
 public abstract class ObservableProcessor<T> extends ServiceSupport implements Processor
{
-    private final Subject<T> observable = Subject.create();
+    private final Subject observable = PublishSubject.create();
     private final ProcessorToObserver processor;
 
+    @SuppressWarnings("unchecked")
     protected ObservableProcessor(Func1<Exchange, T> func) {
         this.processor = new ProcessorToObserver(func, observable);
     }
@@ -44,6 +46,7 @@ public abstract class ObservableProcessor<T> extends ServiceSupport
implements P
      * Returns the {@link Observable} for this {@link Processor} so that the messages that
are received
      * can be processed using the <a href="https://github.com/Netflix/RxJava/wiki">RX
Java API</a>
      */
+    @SuppressWarnings("unchecked")
     public Observable<T> getObservable() {
         return observable;
     }
@@ -51,7 +54,6 @@ public abstract class ObservableProcessor<T> extends ServiceSupport
implements P
     /**
      * Provides the configuration hook so that derived classes can process the observable
      * to use whatever RX methods they wish to process the incoming events
-     * @param observable
      */
     protected abstract void configure(Observable<T> observable);
 
@@ -59,8 +61,7 @@ public abstract class ObservableProcessor<T> extends ServiceSupport
implements P
         configure(getObservable());
     }
 
-
     protected void doStop() throws Exception {
-        observable.onCompleted();
+        // noop
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
index 7e01074..fcff057 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
@@ -21,6 +21,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Producer;
 import org.apache.camel.rx.RuntimeCamelRxException;
 
+import org.apache.camel.util.ServiceHelper;
 import rx.Observer;
 
 /**
@@ -31,13 +32,13 @@ public class ObserverSender implements Observer {
 
     public ObserverSender(Endpoint endpoint) throws Exception {
         this.producer = endpoint.createProducer();
-        this.producer.start();
+        ServiceHelper.startService(producer);
     }
 
     public void onCompleted() {
         if (producer != null) {
             try {
-                producer.stop();
+                ServiceHelper.stopService(producer);
             } catch (Exception e) {
                 throw new RuntimeCamelRxException(e);
             } finally {

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
index fe1af4f..57d0c36 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
@@ -24,7 +24,7 @@ import rx.util.functions.Func1;
 
 /**
  * A {@link Processor} which invokes an underling {@link Observer} as messages
- * arrive using hte given function to convert the {@link Exchange} to the required
+ * arrive using the given function to convert the {@link Exchange} to the required
  * object
  */
 public class ProcessorToObserver<T> implements Processor {

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 83ef166..67aa098 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -57,8 +57,8 @@
     <aspectj-version>1.6.2</aspectj-version>
     <atomikos-transactions-version>3.8.0</atomikos-transactions-version>
     <avalon-bundle-version>4.3.1_1</avalon-bundle-version>
-    <avro-version>1.7.3</avro-version>
-    <avro-bundle-version>1.7.3_1</avro-bundle-version>
+    <avro-version>1.7.4</avro-version>
+    <avro-bundle-version>1.7.4_1</avro-bundle-version>
     <aws-java-sdk-bundle-version>1.4.7_1</aws-java-sdk-bundle-version>
     <aws-java-sdk-version>1.4.7</aws-java-sdk-version>
     <axiom-version>1.2.14</axiom-version>
@@ -79,11 +79,12 @@
     <commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
     <commons-codec-version>1.8</commons-codec-version>
     <commons-collections-version>3.2.1</commons-collections-version>
-    <commons-configuration-version>1.8</commons-configuration-version>
+    <commons-compress-version>1.5</commons-compress-version>
+    <commons-configuration-version>1.9</commons-configuration-version>
     <commons-configuration-bundle-version>1.9_1</commons-configuration-bundle-version>
     <commons-csv-bundle-version>1.0-r706899_5</commons-csv-bundle-version>
     <commons-cli-version>1.2</commons-cli-version>
-    <commons-daemon-version>1.0.5</commons-daemon-version>
+    <commons-daemon-version>1.0.15</commons-daemon-version>
     <commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version>
     <commons-dbcp-version>1.4</commons-dbcp-version>
     <commons-digester-1x-version>1.8.1</commons-digester-1x-version>
@@ -91,7 +92,7 @@
     <commons-exec-version>1.1</commons-exec-version>
     <commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
     <commons-io-version>1.4</commons-io-version>
-    <commons-jexl2-version>2.0.1</commons-jexl2-version>
+    <commons-jexl2-version>2.1.1</commons-jexl2-version>
     <commons-jxpath-version>1.3</commons-jxpath-version>
     <commons-lang-version>2.6</commons-lang-version>
     <commons-lang-version-xmljson>2.5</commons-lang-version-xmljson>
@@ -113,16 +114,16 @@
     <dnsjava-bundle-version>2.1.1_1</dnsjava-bundle-version>
     <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
     <dozer-version>5.4.0</dozer-version>
-    <easymock-version>3.1</easymock-version>
+    <easymock-version>3.2</easymock-version>
     <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
     <ehcache-version>2.7.2</ehcache-version>
     <!-- The 0.20 bundle is flawed, see SMX4-1372 -->
     <elasticsearch-bundle-version>0.19.10_1</elasticsearch-bundle-version>
-    <elasticsearch-version>0.20.5</elasticsearch-version>
+    <elasticsearch-version>0.20.6</elasticsearch-version>
     <el-api-1.0-version>1.0.1</el-api-1.0-version>
     <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
     <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
-    <fastinfoset-version>1.2.7_4</fastinfoset-version>
+    <fastinfoset-version>1.2.13_1</fastinfoset-version>
     <felix-configadmin-version>1.4.0</felix-configadmin-version>
     <felix-fileinstall-version>3.2.6</felix-fileinstall-version>
     <felix-framework-version>3.2.2</felix-framework-version>
@@ -132,7 +133,7 @@
     <fop-version>1.0</fop-version>
     <ftpserver-version>1.0.6</ftpserver-version>
     <freemarker-bundle-version>2.3.19_1</freemarker-bundle-version>
-    <freemarker-version>2.3.19</freemarker-version>
+    <freemarker-version>2.3.20</freemarker-version>
     <geocoder-java-version>0.15</geocoder-java-version>
     <geronimo-annotation-spec-version>1.1.1</geronimo-annotation-spec-version>
     <geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version>
@@ -157,7 +158,7 @@
     <google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
     <google-guava-version>14.0.1</google-guava-version>
     <groovy-version>2.1.6</groovy-version>
-    <gson-version>2.2.2</gson-version>
+    <gson-version>2.2.4</gson-version>
     <guice-bundle-version>3.0_1</guice-bundle-version>
     <guice-version>3.0</guice-version>
     <hadoop-bundle-version>1.1.1_1</hadoop-bundle-version>
@@ -168,10 +169,10 @@
     <hawtdb-version>1.6</hawtdb-version>
     <hawtdispatch-version>1.17</hawtdispatch-version>
     <hazelcast-version>2.6</hazelcast-version>
-    <hbase-version>0.94.3</hbase-version>
-    <hbase-bundle-version>0.94.3_1</hbase-bundle-version>
+    <hbase-version>0.94.6</hbase-version>
+    <hbase-bundle-version>0.94.6_1</hbase-bundle-version>
     <hibernate-validator-version>5.0.1.Final</hibernate-validator-version>
-    <hibernate-version>4.2.2.Final</hibernate-version>
+    <hibernate-version>4.2.3.Final</hibernate-version>
     <httpunit-version>1.7</httpunit-version>
     <httpcore4-version>4.2.4</httpcore4-version>
     <httpclient4-version>4.2.5</httpclient4-version>
@@ -208,13 +209,13 @@
     <jdom-bundle-version>1.1_4</jdom-bundle-version>
     <jdom-version>1.1.3</jdom-version>
     <jedis-client-bundle-version>2.1.0_1</jedis-client-bundle-version>
-    <jetty-version>7.6.8.v20121106</jetty-version>
+    <jetty-version>7.6.9.v20130131</jetty-version>
     <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
     <jetty6-version>6.1.26</jetty6-version>
     <jettison-version>1.3.3</jettison-version>
     <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
     <jexcelapi-version>2.4.2</jexcelapi-version>
-    <jibx-version>1.2.4.5</jibx-version>
+    <jibx-version>1.2.5</jibx-version>
     <jing-bundle-version>20030619_5</jing-bundle-version>
     <jing-version>20030619</jing-version>
     <jline-version>0.9.94</jline-version>
@@ -225,8 +226,8 @@
     <jruby-version>1.7.4</jruby-version>
     <jsendnsca-version>1.3.1</jsendnsca-version>
     <jsmpp-version>2.1.0_4</jsmpp-version>
-    <jsch-bundle-version>0.1.49_1</jsch-bundle-version>
     <jsch-version>0.1.49</jsch-version>
+    <jsch-bundle-version>0.1.49_1</jsch-bundle-version>
     <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
     <jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>
     <jsonlib-version>2.4</jsonlib-version>
@@ -247,7 +248,7 @@
     <!-- we await upgrade for lucene 4.x to sync -->
     <lucene-bundle-version>3.6.0_1</lucene-bundle-version>
     <lucene-version>3.6.1</lucene-version>
-    <lightcouch-version>0.0.5</lightcouch-version>
+    <lightcouch-version>0.0.6</lightcouch-version>
     <lightcouch-bundle-version>0.0.5_1</lightcouch-bundle-version>
     <!-- needed from tooling/archetypes -->
     <maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
@@ -311,7 +312,7 @@
     <pojosr-version>0.2.1</pojosr-version>
     <protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version>
     <protobuf-version>2.3.0</protobuf-version>
-    <qpid-bundle-version>0.18_1</qpid-bundle-version>
+    <qpid-bundle-version>0.20_1</qpid-bundle-version>
     <qpid-version>0.20</qpid-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>
@@ -322,7 +323,7 @@
     <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
     <rome-version>1.0</rome-version>
-    <rxjava-version>0.6.3</rxjava-version>
+    <rxjava-version>0.9.1</rxjava-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>
     <saxon-bundle-version>9.5.0.2_1</saxon-bundle-version>
     <saxon-version>9.5.0.2</saxon-version>
@@ -343,7 +344,7 @@
     <snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
     <snmp4j-version>2.1.0_1</snmp4j-version>
     <solr-bundle-version>3.6.0_1</solr-bundle-version> <!-- FIXME cmueller:
not in sync! -->
-    <solr-version>3.6.1</solr-version>
+    <solr-version>3.6.2</solr-version>
     <spring-batch-version>2.1.9.RELEASE</spring-batch-version>
     <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
     <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
@@ -390,8 +391,8 @@
     <xalan-bundle-version>2.7.1_5</xalan-bundle-version>
     <xalan-version>2.7.1</xalan-version>
     <xbean-spring-version>3.13</xbean-spring-version>
-    <xerces-bundle-version>2.10.0_1</xerces-bundle-version>
-    <xerces-version>2.10.0</xerces-version>
+    <xerces-bundle-version>2.11.0_1</xerces-bundle-version>
+    <xerces-version>2.11.0</xerces-version>
     <!-- needed to manage the xml-apis version in camel-xmljson -->
     <xml-apis-version>1.4.01</xml-apis-version>
     <xml-resolver-version>1.2</xml-resolver-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/11644925/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 5031e2e..fd218a3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -94,6 +94,7 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
   </feature>
   <feature name='camel-aws' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -368,6 +369,7 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
     <bundle dependency='true'>mvn:commons-daemon/commons-daemon/${commons-daemon-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.commons/commons-math/${commons-math-version}</bundle>
     <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>


Mime
View raw message