From 35683c1c1c68dc5160c574af78878b74eaf1d719 Mon Sep 17 00:00:00 2001
From: Dejan Bosanac <dejan@nighttale.net>
Date: Wed, 11 Feb 2015 11:40:37 +0100
Subject: [PATCH] Upgrade dependencies

---
 activemq-karaf/pom.xml                              | 2 +-
 activemq-karaf/src/main/resources/features-core.xml | 6 +++---
 pom.xml                                             | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 064b69c67f..3406b7d21b 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -36,7 +36,7 @@
     <jdom-bundle-version>1.1_4</jdom-bundle-version>
     <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
     <xstream-bundle-version>1.4.7_1</xstream-bundle-version>
-    <servicemix.specs.version>1.9.0</servicemix.specs.version>
+    <servicemix.specs.version>2.4.0</servicemix.specs.version>
   </properties>
 
   <dependencies>
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 6a688b69c0..c402684348 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -46,14 +46,14 @@
       <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
       <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
       <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-      <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
+      <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6</bundle>
-      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.1_1</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
       <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
-      <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-transaction-version}</bundle>
       <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
       <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
       <bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 792117bd06..6c83f01082 100755
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,8 @@
     <ant-version>1.8.4</ant-version>
     <ant-bundle-version>1.7.0_6</ant-bundle-version>
     <aopalliance-version>1.0</aopalliance-version>
-    <aries-version>1.0.0</aries-version>
+    <aries-version>1.1.0</aries-version>
+    <aries-transaction-version>1.1.1</aries-transaction-version>
     <axion-version>1.0-M3-dev</axion-version>
     <camel-version>2.14.1</camel-version>
     <camel-version-range>[2.14,3)</camel-version-range>
@@ -72,7 +73,7 @@
     <insight-version>1.2.0.Beta4</insight-version>
     <jackson-version>2.4.1</jackson-version>
     <jasypt-version>1.9.2</jasypt-version>
-    <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
+    <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
     <jdom-version>1.0</jdom-version>
     <jetty9-version>9.2.6.v20141205</jetty9-version>
     <jetty8-version>8.1.16.v20140903</jetty8-version>
@@ -80,7 +81,7 @@
     <jmdns-version>3.4.1</jmdns-version>
     <jsp-version>2.1.v20100127</jsp-version>
     <jstl-version>1.1.2</jstl-version>
-    <jettison-version>1.3.5</jettison-version>
+    <jettison-version>1.3.7</jettison-version>
     <jmock-version>2.5.1</jmock-version>
     <jolokia-version>1.2.2</jolokia-version>
     <josql-version>1.5_5</josql-version>