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 @@ 1.1_4 1.6.1_2 1.4.7_1 - 1.9.0 + 2.4.0 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 @@ mvn:org.apache.xbean/xbean-spring/${xbean-version} mvn:commons-collections/commons-collections/${commons-collections-version} mvn:commons-lang/commons-lang/${commons-lang-version} - mvn:commons-codec/commons-codec/1.4 + mvn:commons-codec/commons-codec/1.9 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.1_1 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version} mvn:joda-time/joda-time/${jodatime-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version} - mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version} + mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-transaction-version} mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0 mvn:org.apache.aries/org.apache.aries.util/${aries-version} mvn:org.apache.activemq/activeio-core/${activeio-version} diff --git a/pom.xml b/pom.xml index 792117bd06..6c83f01082 100755 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,8 @@ 1.8.4 1.7.0_6 1.0 - 1.0.0 + 1.1.0 + 1.1.1 1.0-M3-dev 2.14.1 [2.14,3) @@ -72,7 +73,7 @@ 1.2.0.Beta4 2.4.1 1.9.2 - 2.2.1.1_2 + 2.2.11_1 1.0 9.2.6.v20141205 8.1.16.v20140903 @@ -80,7 +81,7 @@ 3.4.1 2.1.v20100127 1.1.2 - 1.3.5 + 1.3.7 2.5.1 1.2.2 1.5_5