Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/activemq/browse/AMQ-2570 - use spring 3.0.x 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960485 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-07-05 08:33:53 +00:00
parent 6a5030b9f5
commit 412730b899
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-karaf/src/main/resources/features.xml
View File

@ -5,6 +5,27 @@
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle> <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle>
</feature> </feature>
<feature name="spring" version="${spring-version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_3</bundle>
<bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-asm/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-expression/${spring-version}</bundle>
</feature>
<feature name="spring-dm" version="1.2.1">
<feature version="${spring-version}">spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-io/1.2.0</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-core/1.2.0</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/1.2.0</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/1.2.0</bundle>
<bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/1.7.0-SNAPSHOT</bundle>
</feature>
<feature name="activemq" version="${activemq-version}"> <feature name="activemq" version="${activemq-version}">
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
@ -23,7 +44,7 @@
</feature> </feature>
<feature name="activemq-spring" version="${activemq-version}"> <feature name="activemq-spring" version="${activemq-version}">
<feature version="1.2.0">spring-dm</feature> <feature version="1.2.1">spring-dm</feature>
<feature version="${activemq-version}">activemq</feature> <feature version="${activemq-version}">activemq</feature>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle> <bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
</feature> </feature>

2
pom.xml
View File

@ -36,7 +36,7 @@
<projectName>Apache ActiveMQ</projectName> <projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging --> <!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL> <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<spring-version>3.0.1.RELEASE</spring-version> <spring-version>3.0.3.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version> <spring-osgi-version>1.2.1</spring-osgi-version>
<activesoap-version>1.3</activesoap-version> <activesoap-version>1.3</activesoap-version>
<annogen-version>0.1.0</annogen-version> <annogen-version>0.1.0</annogen-version>