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

ARTEMIS-309 upgrade commons-collections

This commit is contained in:
jbertram 2015-12-09 09:56:05 -06:00
parent 8b09e6eb36
commit 05382ac068
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-features/src/main/resources/features.xml
View File

@ -18,7 +18,7 @@
<features name="artemis-${pom.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" <features name="artemis-${pom.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0"> xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<feature name="netty-core" version="${netty.version}"> <feature name="netty-core" version="${netty.version}">
<bundle>mvn:io.netty/netty-common/${netty.version}</bundle> <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-transport/${netty.version}</bundle> <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
@ -33,12 +33,12 @@
<feature>scr</feature> <feature>scr</feature>
<configfile finalname="etc/org.apache.activemq.artemis.cfg">mvn:org.apache.activemq/artemis-features/${pom.version}/cfg</configfile> <configfile finalname="etc/org.apache.activemq.artemis.cfg">mvn:org.apache.activemq/artemis-features/${pom.version}/cfg</configfile>
<configfile finalname="etc/artemis.xml">mvn:org.apache.activemq/artemis-features/${pom.version}/xml/artemis</configfile> <configfile finalname="etc/artemis.xml">mvn:org.apache.activemq/artemis-features/${pom.version}/xml/artemis</configfile>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${geronimo.jms.2.spec.version}</bundle> <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${geronimo.jms.2.spec.version}</bundle>
<bundle>mvn:com.google.guava/guava/18.0</bundle> <bundle>mvn:com.google.guava/guava/18.0</bundle>
<bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle> <bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
<bundle>mvn:commons-beanutils/commons-beanutils/1.9.2</bundle> <bundle>mvn:commons-beanutils/commons-beanutils/1.9.2</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle> <bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle> <bundle>mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle>
<bundle>mvn:org.jgroups/jgroups/3.6.0.Final</bundle> <bundle>mvn:org.jgroups/jgroups/3.6.0.Final</bundle>
@ -47,7 +47,7 @@
<bundle>mvn:org.apache.activemq/artemis-server-osgi/${pom.version}</bundle> <bundle>mvn:org.apache.activemq/artemis-server-osgi/${pom.version}</bundle>
</feature> </feature>
<feature name="artemis-amqp" version="${pom.version}"> <feature name="artemis-amqp" version="${pom.version}">
<feature>artemis-core</feature> <feature>artemis-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/0.32_1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/0.32_1</bundle>
@ -56,18 +56,18 @@
<bundle>mvn:org.apache.activemq/artemis-proton-plug/${pom.version}</bundle> <bundle>mvn:org.apache.activemq/artemis-proton-plug/${pom.version}</bundle>
<bundle>mvn:org.apache.activemq/artemis-amqp-protocol/${pom.version}</bundle> <bundle>mvn:org.apache.activemq/artemis-amqp-protocol/${pom.version}</bundle>
</feature> </feature>
<feature name="artemis-stomp" version="${pom.version}"> <feature name="artemis-stomp" version="${pom.version}">
<feature>artemis-core</feature> <feature>artemis-core</feature>
<bundle>mvn:org.apache.activemq/artemis-stomp-protocol/${pom.version}</bundle> <bundle>mvn:org.apache.activemq/artemis-stomp-protocol/${pom.version}</bundle>
</feature> </feature>
<feature name="artemis-mqtt" version="${pom.version}"> <feature name="artemis-mqtt" version="${pom.version}">
<feature>artemis-core</feature> <feature>artemis-core</feature>
<bundle>mvn:org.apache.activemq/artemis-mqtt-protocol/${pom.version}</bundle> <bundle>mvn:org.apache.activemq/artemis-mqtt-protocol/${pom.version}</bundle>
</feature> </feature>
<feature name="artemis-hornetq" version="${pom.version}"> <feature name="artemis-hornetq" version="${pom.version}">
<feature>artemis-core</feature> <feature>artemis-core</feature>
<bundle>mvn:org.apache.activemq/artemis-hqclient-protocol/${pom.version}</bundle> <bundle>mvn:org.apache.activemq/artemis-hqclient-protocol/${pom.version}</bundle>

4
pom.xml
View File

@ -210,7 +210,7 @@
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections-testframework</artifactId> <artifactId>commons-collections-testframework</artifactId>
<version>3.2.1</version> <version>3.2.2</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<!-- ## End Test Dependencies ## --> <!-- ## End Test Dependencies ## -->
@ -301,7 +301,7 @@
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>3.2.1</version> <version>3.2.2</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>