cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: [CXF-6675] - Update commons-collections from 3.2.1 to 3.2.2
Date Mon, 16 Nov 2015 16:15:43 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 06f99f508 -> f2beeac77


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


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

Branch: refs/heads/master
Commit: f2beeac77f63852e4e8eca0164d3da6bbe85a1f5
Parents: 06f99f5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Nov 16 16:15:21 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Nov 16 16:15:38 2015 +0000

----------------------------------------------------------------------
 parent/pom.xml            |  1 +
 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, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f2beeac7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2171f98..9a67180 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,6 +76,7 @@
         <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>
+        <cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
         <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/f2beeac7/tools/common/pom.xml
----------------------------------------------------------------------
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index 24757a4..bb32c1f 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/f2beeac7/tools/validator/pom.xml
----------------------------------------------------------------------
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index fa49056..9d795d1 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/f2beeac7/tools/wsdlto/core/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index 6dc4f1f..34a0f9a 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/f2beeac7/tools/wsdlto/misc/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml
index 44af76a..58810ba 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>


Mime
View raw message