From 05382ac06804de08fac4a4cf0a41fcc27c868f78 Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@apache.org>
Date: Wed, 9 Dec 2015 09:56:05 -0600
Subject: [PATCH] ARTEMIS-309 upgrade commons-collections

---
 artemis-features/src/main/resources/features.xml | 14 +++++++-------
 pom.xml                                          |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index 3458bda822..5011245c9f 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -18,7 +18,7 @@
 <features name="artemis-${pom.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
 	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">
-	
+
 	<feature name="netty-core" version="${netty.version}">
 		<bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
 		<bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
@@ -33,12 +33,12 @@
 		<feature>scr</feature>
 		<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>
-		
+
 		<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:io.netty/netty-codec-http/${netty.version}</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.jgroups/jgroups/3.6.0.Final</bundle>
@@ -47,7 +47,7 @@
 		<bundle>mvn:org.apache.activemq/artemis-server-osgi/${pom.version}</bundle>
 
 	</feature>
-	
+
 	<feature name="artemis-amqp" version="${pom.version}">
 		<feature>artemis-core</feature>
 		<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-amqp-protocol/${pom.version}</bundle>
 	</feature>
-	
+
 	<feature name="artemis-stomp" version="${pom.version}">
 		<feature>artemis-core</feature>
 		<bundle>mvn:org.apache.activemq/artemis-stomp-protocol/${pom.version}</bundle>
 	</feature>
-	
+
 
 	<feature name="artemis-mqtt" version="${pom.version}">
 		<feature>artemis-core</feature>
 		<bundle>mvn:org.apache.activemq/artemis-mqtt-protocol/${pom.version}</bundle>
 	</feature>
-	
+
 	<feature name="artemis-hornetq" version="${pom.version}">
 		<feature>artemis-core</feature>
 		<bundle>mvn:org.apache.activemq/artemis-hqclient-protocol/${pom.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 5b95c28bb6..61dabdad21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
          <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections-testframework</artifactId>
-            <version>3.2.1</version>
+            <version>3.2.2</version>
             <!-- License: Apache 2.0 -->
          </dependency>
          <!-- ## End Test Dependencies ## -->
@@ -301,7 +301,7 @@
          <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
+            <version>3.2.2</version>
             <!-- License: Apache 2.0 -->
          </dependency>