[directory-server] branch master updated: Overriding commons collections version inherited from Mavibot

[co...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 99cbac8  Overriding commons collections version inherited from Mavibot
99cbac8 is described below

commit 99cbac8dea9c893a05ef330199a742b2df7ef119
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 8 11:21:35 2020 +0100

    Overriding commons collections version inherited from Mavibot
---
 core-annotations/pom.xml  |  6 ++++++
 ldap-client-test/pom.xml  |  6 ++++++
 mavibot-partition/pom.xml |  6 ++++++
 pom.xml                   | 14 ++++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index 33ec89e..da5150f 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -77,6 +77,12 @@
       <groupId>org.apache.directory.mavibot</groupId>
       <artifactId>mavibot</artifactId>
     </dependency>
+    
+    <!-- Override the default version bundled with Mavibot -->
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/ldap-client-test/pom.xml b/ldap-client-test/pom.xml
index ac48d74..682bccd 100644
--- a/ldap-client-test/pom.xml
+++ b/ldap-client-test/pom.xml
@@ -98,6 +98,12 @@
       <groupId>org.apache.directory.mavibot</groupId>
       <artifactId>mavibot</artifactId>
     </dependency>
+    
+    <!-- Override the default version bundled with Mavibot -->
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.directory.api</groupId>
diff --git a/mavibot-partition/pom.xml b/mavibot-partition/pom.xml
index 44d1d7d..f508979 100644
--- a/mavibot-partition/pom.xml
+++ b/mavibot-partition/pom.xml
@@ -38,6 +38,12 @@
       <artifactId>mavibot</artifactId>
     </dependency>
 
+    <!-- Override the default version bundled with Mavibot -->
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+    </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
diff --git a/pom.xml b/pom.xml
index b44cd0f..1d7d684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1061,6 +1061,13 @@
         <groupId>org.apache.directory.mavibot</groupId>
         <artifactId>mavibot</artifactId>
         <version>${org.apache.directory.mavibot.version}</version>
+        <!-- Can be removed once we pick up the next Mavibot version -->
+        <exclusions>
+            <exclusion>
+              <groupId>commons-collections</groupId>
+              <artifactId>commons-collections</artifactId>
+            </exclusion>
+        </exclusions>
       </dependency>
       
       <!-- Mina dependencies -->
@@ -1078,6 +1085,13 @@
         <artifactId>commons-codec</artifactId>
         <version>${commons.codec.version}</version>
       </dependency>
+
+      <!-- Can be removed once we pick up the next Mavibot version -->
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+      </dependency>
       
       <dependency>
         <groupId>org.apache.commons</groupId>