[2/3] cxf git commit: [CXF-6675] - Update commons-collections from 3.2.1 to 3.2.2

[coheigea]

[CXF-6675] - Update commons-collections from 3.2.1 to 3.2.2

Conflicts:
        parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d86c39b5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d86c39b5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d86c39b5

Branch: refs/heads/3.0.x-fixes
Commit: d86c39b540aad953b687fdcb5370c6ec99776ddc
Parents: b0caef7
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Mon Nov 16 16:15:21 2015 +0000
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Mon Nov 16 16:29:34 2015 +0000

----------------------------------------------------------------------
 parent/pom.xml            |  4 ++++
 tools/common/pom.xml      | 11 +++++++++++
 tools/validator/pom.xml   |  4 ----
 tools/wsdlto/core/pom.xml |  4 ----
 tools/wsdlto/misc/pom.xml |  4 ----
 5 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d86c39b5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 74c467b..0eba423 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,7 +83,11 @@
         <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
         <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
         <cxf.commons-codec.version>1.10</cxf.commons-codec.version>
+<<<<<<< HEAD
         
<cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
+=======
+        
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
+>>>>>>> d2b5baa... [CXF-6675] - Update commons-collections from 3.2.1 to 3.2.2
         <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
         <cxf.commons-lang3.version>3.4</cxf.commons-lang3.version>
         <cxf.derby.version>10.2.2.0</cxf.derby.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d86c39b5/tools/common/pom.xml
----------------------------------------------------------------------
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index a1e3fe1..1337c53 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -45,6 +45,17 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${cxf.commons-collections.version}</version>
         </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d86c39b5/tools/validator/pom.xml
----------------------------------------------------------------------
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index 25f373b..90e6b18 100644
--- a/tools/validator/pom.xml
+++ b/tools/validator/pom.xml
@@ -53,10 +53,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d86c39b5/tools/wsdlto/core/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index 1310d94..b2a758b 100644
--- a/tools/wsdlto/core/pom.xml
+++ b/tools/wsdlto/core/pom.xml
@@ -62,10 +62,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d86c39b5/tools/wsdlto/misc/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml
index 17c9ed8..e0ca6ac 100644
--- a/tools/wsdlto/misc/pom.xml
+++ b/tools/wsdlto/misc/pom.xml
@@ -42,10 +42,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>