Author: davsclaus
Date: Wed Sep 12 11:21:28 2012
New Revision: 1383884
URL: http://svn.apache.org/viewvc?rev=1383884&view=rev
Log:
AMQ-4041: Upgraded JARs in feature. As well fixing it.
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1383884&r1=1383883&r2=1383884&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Wed Sep 12
11:21:28 2012
@@ -26,10 +26,11 @@
<bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_3</bundle>
+ <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_4</bundle>
+ <!-- TODO: oro is not really needed, but we need a new velocity bundle
to fix this: https://issues.apache.org/jira/browse/SMX4-1244 -->
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_1</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_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>
@@ -47,7 +48,7 @@
</feature>
<feature name="activemq-spring" version="${activemq-version}"
resolver="(obr)">
- <feature version="[1,2)">spring-dm</feature>
+ <feature version="[1.2,2)">spring-dm</feature>
<feature version="${activemq-version}">activemq</feature>
<bundle
dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-spring/${activemq-version}</bundle>
@@ -63,7 +64,7 @@
<feature name="activemq-optional" version="${activemq-version}"
resolver="(obr)">
<feature version="${activemq-version}">activemq-blueprint</feature>
- <feature version="[7.0,8.0)">jetty</feature>
+ <feature version="[7.5,8.0)">jetty</feature>
<bundle>mvn:org.apache.activemq/activemq-optional/${activemq-version}</bundle>
</feature>
Modified: activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1383884&r1=1383883&r2=1383884&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Sep 12 11:21:28 2012
@@ -48,7 +48,7 @@
<axion-version>1.0-M3-dev</axion-version>
<axis-version>1.4</axis-version>
<camel-version>2.10.1</camel-version>
- <camel-version-range>2.10,3</camel-version-range>
+ <camel-version-range>[2.10,3)</camel-version-range>
<cglib-version>2.0</cglib-version>
<commons-beanutils-version>1.8.3</commons-beanutils-version>
<commons-collections-version>3.2.1</commons-collections-version>
