You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/08/14 22:53:27 UTC

svn commit: r1805042 - in /directory/apacheds/branches/apacheds-value: ./ core-annotations/ core-api/ core-avl/ core-integ/ core-jndi/ core-shared/ core/ http-integration/ interceptor-kerberos/ interceptors/admin/ interceptors/authn/ interceptors/authz...

Author: elecharny
Date: Mon Aug 14 22:53:27 2017
New Revision: 1805042

URL: http://svn.apache.org/viewvc?rev=1805042&view=rev
Log:
o Declare a range for slf4j
o Used the slf4j bundleversion to please Eclipse which expect an older version than the one we declare
o Fixed a wrong export for the pool jar

Modified:
    directory/apacheds/branches/apacheds-value/core-annotations/pom.xml
    directory/apacheds/branches/apacheds-value/core-api/pom.xml
    directory/apacheds/branches/apacheds-value/core-avl/pom.xml
    directory/apacheds/branches/apacheds-value/core-integ/pom.xml
    directory/apacheds/branches/apacheds-value/core-jndi/pom.xml
    directory/apacheds/branches/apacheds-value/core-shared/pom.xml
    directory/apacheds/branches/apacheds-value/core/pom.xml
    directory/apacheds/branches/apacheds-value/http-integration/pom.xml
    directory/apacheds/branches/apacheds-value/interceptor-kerberos/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/admin/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/authn/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/authz/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/changelog/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/collective/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/event/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/journal/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/logger/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/normalization/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/number/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/operational/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/referral/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml
    directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml
    directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml
    directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml
    directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml
    directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml
    directory/apacheds/branches/apacheds-value/pom.xml
    directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml
    directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml
    directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml
    directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml
    directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml
    directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml
    directory/apacheds/branches/apacheds-value/server-config/pom.xml
    directory/apacheds/branches/apacheds-value/server-integ/pom.xml
    directory/apacheds/branches/apacheds-value/server-jndi/pom.xml
    directory/apacheds/branches/apacheds-value/service-builder/pom.xml
    directory/apacheds/branches/apacheds-value/test-framework/pom.xml
    directory/apacheds/branches/apacheds-value/xdbm-partition/pom.xml

Modified: directory/apacheds/branches/apacheds-value/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-annotations/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core-annotations/pom.xml Mon Aug 14 22:53:27 2017
@@ -190,7 +190,7 @@
                 org.apache.directory.server.xdbm;version=${project.version},
                 org.apache.directory.server.xdbm.impl.avl;version=${project.version},
                 org.junit.runner;version=${junit.version},
-                org.slf4j;version=${slf4j.log4j12.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-api/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-api/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core-api/pom.xml Mon Aug 14 22:53:27 2017
@@ -205,7 +205,7 @@
                 org.apache.directory.server.constants;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.mina.core.session;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version},
+                org.slf4j;version=${slf4j.api.bundleversion},
                 javax.naming,
                 javax.naming.directory
             </Import-Package>

Modified: directory/apacheds/branches/apacheds-value/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-avl/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-avl/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core-avl/pom.xml Mon Aug 14 22:53:27 2017
@@ -88,7 +88,7 @@
                 org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
                 org.apache.directory.api.util;version=${org.apache.directory.api.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-integ/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core-integ/pom.xml Mon Aug 14 22:53:27 2017
@@ -188,7 +188,7 @@
                 org.apache.directory.server.core.jndi;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.directory.server.ldap;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-jndi/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core-jndi/pom.xml Mon Aug 14 22:53:27 2017
@@ -170,7 +170,7 @@
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.core.shared;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-shared/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core-shared/pom.xml Mon Aug 14 22:53:27 2017
@@ -175,7 +175,7 @@
                 org.apache.directory.server.core.api.partition;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.mina.core.session;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/core/pom.xml Mon Aug 14 22:53:27 2017
@@ -264,7 +264,7 @@
                 org.apache.directory.server.i18n;version=${project.version},
                 org.bouncycastle.jce.provider;version=${bcprov.version},
                 org.bouncycastle.x509;version=${bcprov.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/http-integration/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/http-integration/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/http-integration/pom.xml Mon Aug 14 22:53:27 2017
@@ -134,7 +134,7 @@
                 org.eclipse.jetty.util.ssl;version=${jetty.bundle.version},
                 org.eclipse.jetty.webapp;version=${jetty.bundle.version},
                 org.eclipse.jetty.xml;version=${jetty.bundle.version}
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptor-kerberos/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptor-kerberos/pom.xml Mon Aug 14 22:53:27 2017
@@ -135,7 +135,7 @@
                 org.apache.directory.shared.kerberos.codec.types;version=${project.version},
                 org.apache.directory.shared.kerberos.components;version=${project.version},
                 org.apache.directory.shared.kerberos.exceptions;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/admin/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/admin/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/admin/pom.xml Mon Aug 14 22:53:27 2017
@@ -131,7 +131,7 @@
                 org.apache.directory.server.core.api.interceptor;version=${project.version},
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.core.api.partition;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Packaged>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/authn/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/authn/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/authn/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/authn/pom.xml Mon Aug 14 22:53:27 2017
@@ -177,7 +177,7 @@
                 org.apache.directory.server.core.shared;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.mina.core.session;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/authz/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/authz/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/authz/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/authz/pom.xml Mon Aug 14 22:53:27 2017
@@ -153,7 +153,7 @@
                 org.apache.directory.server.core.api.subtree;version=${project.version},
                 org.apache.directory.server.core.authz.support;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/changelog/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/changelog/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/changelog/pom.xml Mon Aug 14 22:53:27 2017
@@ -142,7 +142,7 @@
                 org.apache.directory.server.core.api.partition;version=${project.version},
                 org.apache.directory.server.core.shared;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/collective/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/collective/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/collective/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/collective/pom.xml Mon Aug 14 22:53:27 2017
@@ -114,7 +114,7 @@
                 org.apache.directory.server.core.api.interceptor;version=${project.version},
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/event/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/event/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/event/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/event/pom.xml Mon Aug 14 22:53:27 2017
@@ -111,7 +111,7 @@
                 org.apache.directory.server.core.api.interceptor;version=${project.version},
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.core.api.normalization;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/journal/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/journal/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/journal/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/journal/pom.xml Mon Aug 14 22:53:27 2017
@@ -105,7 +105,7 @@
                 org.apache.directory.server.core.api.interceptor;version=${project.version},
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.core.api.journal;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/logger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/logger/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/logger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/logger/pom.xml Mon Aug 14 22:53:27 2017
@@ -184,7 +184,7 @@
                 org.apache.directory.server.core.api.filtering;version=${project.version},
                 org.apache.directory.server.core.api.interceptor;version=${project.version},
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/normalization/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/normalization/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/normalization/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/normalization/pom.xml Mon Aug 14 22:53:27 2017
@@ -132,7 +132,7 @@
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.core.api.normalization;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/number/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/number/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/number/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/number/pom.xml Mon Aug 14 22:53:27 2017
@@ -124,7 +124,7 @@
                 org.apache.directory.server.core.api.interceptor;version=${project.version},
                 org.apache.directory.server.core.api.interceptor.context;version=${project.version},
                 org.apache.directory.server.core.api.partition;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/operational/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/operational/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/operational/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/operational/pom.xml Mon Aug 14 22:53:27 2017
@@ -127,7 +127,7 @@
                 org.apache.directory.server.core.api.partition;version=${project.version},
                 org.apache.directory.server.core.shared;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/referral/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/referral/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/referral/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/referral/pom.xml Mon Aug 14 22:53:27 2017
@@ -126,7 +126,7 @@
                 org.apache.directory.server.core.api.partition;version=${project.version},
                 org.apache.directory.server.core.shared;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml Mon Aug 14 22:53:27 2017
@@ -155,7 +155,7 @@
                 org.apache.directory.server.core.api.schema;version=${project.version},
                 org.apache.directory.server.core.shared;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml Mon Aug 14 22:53:27 2017
@@ -153,7 +153,7 @@
                 org.apache.directory.server.core.api.partition;version=${project.version},
                 org.apache.directory.server.core.api.subtree;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml Mon Aug 14 22:53:27 2017
@@ -133,7 +133,7 @@
                 org.apache.directory.server.core.api.sp.java;version=${project.version},
                 org.apache.directory.server.core.api.subtree;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml Mon Aug 14 22:53:27 2017
@@ -172,7 +172,7 @@
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.directory.server.xdbm;version=${project.version},
                 org.apache.directory.server.xdbm.search.impl;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml Mon Aug 14 22:53:27 2017
@@ -148,7 +148,7 @@
                 org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
                 org.apache.directory.api.util;version=${org.apache.directory.api.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml Mon Aug 14 22:53:27 2017
@@ -132,7 +132,7 @@
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.directory.server.xdbm;version=${project.version},
                 org.apache.directory.server.xdbm.search.cursor;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml Mon Aug 14 22:53:27 2017
@@ -163,7 +163,7 @@
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.directory.server.xdbm;version=${project.version},
                 org.apache.directory.server.xdbm.search.impl;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/pom.xml Mon Aug 14 22:53:27 2017
@@ -82,6 +82,7 @@
     <pax-url.version>2.5.2</pax-url.version>
     <plexus.utils.version>3.0.24</plexus.utils.version>
     <slf4j.api.version>1.7.25</slf4j.api.version>
+    <slf4j.api.bundleversion>"$«range;[==,=+)»"</slf4j.api.bundleversion>
     <slf4j.log4j12.version>1.7.25</slf4j.log4j12.version>
     <wrapper.version>3.2.3</wrapper.version>
   </properties>

Modified: directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml Mon Aug 14 22:53:27 2017
@@ -101,7 +101,7 @@
                 org.apache.mina.core.service;version=${mina.core.version},
                 org.apache.mina.core.session;version=${mina.core.version},
                 org.apache.mina.filter.codec;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml Mon Aug 14 22:53:27 2017
@@ -144,7 +144,7 @@
                 org.apache.mina.handler.chain;version=${mina.core.version},
                 org.apache.mina.transport.socket;version=${mina.core.version},
                 org.apache.mina.transport.socket.nio;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml Mon Aug 14 22:53:27 2017
@@ -180,7 +180,7 @@
                 org.apache.mina.filter.codec;version=${mina.core.version},
                 org.apache.mina.transport.socket;version=${mina.core.version},
                 org.apache.mina.transport.socket.nio;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml Mon Aug 14 22:53:27 2017
@@ -278,7 +278,7 @@
                 org.apache.mina.handler.demux;version=${mina.core.version},
                 org.apache.mina.transport.socket;version=${mina.core.version},
                 org.bouncycastle.jce.provider;version=${bcprov.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml Mon Aug 14 22:53:27 2017
@@ -101,7 +101,7 @@
                 org.apache.mina.core.session;version=${mina.core.version},
                 org.apache.mina.filter.codec;version=${mina.core.version},
                 org.apache.mina.transport.socket;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml Mon Aug 14 22:53:27 2017
@@ -125,7 +125,7 @@
                 org.apache.mina.core.service;version=${mina.core.version},
                 org.apache.mina.transport.socket;version=${mina.core.version},
                 org.apache.mina.transport.socket.nio;version=${mina.core.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-config/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-config/pom.xml Mon Aug 14 22:53:27 2017
@@ -126,7 +126,7 @@
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.directory.server.xdbm;version=${project.version},
                 org.apache.directory.server.xdbm.search;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-integ/pom.xml Mon Aug 14 22:53:27 2017
@@ -247,7 +247,7 @@
                 org.apache.directory.server.constants;version=${project.version},
                 org.apache.directory.server.core.integ;version=${project.version},
                 org.apache.directory.server.ldap;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-jndi/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-jndi/pom.xml Mon Aug 14 22:53:27 2017
@@ -164,7 +164,7 @@
                 org.apache.directory.server.i18n;version=${project.version},
                 org.apache.directory.server.ldap;version=${project.version},
                 org.apache.directory.server.protocol.shared.store;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/service-builder/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/service-builder/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/service-builder/pom.xml Mon Aug 14 22:53:27 2017
@@ -208,7 +208,7 @@
                 org.apache.directory.server.protocol.shared.transport;version=${project.version},
                 org.apache.directory.server.xdbm;version=${project.version},
                 org.apache.directory.shared.kerberos.codec.types;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/test-framework/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/test-framework/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/test-framework/pom.xml Mon Aug 14 22:53:27 2017
@@ -120,7 +120,7 @@
             </Export-Package>
             <Import-Package>
                 org.apache.commons.pool;version=${commons.pool.version},
-                org.apache.commons.pool.impl.GenericObjectPool;version=${commons.pool.version},
+                org.apache.commons.pool.impl;version=${commons.pool.version},
                 org.apache.directory.api.ldap.codec.api;version=${org.apache.directory.api.version},
                 org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
                 org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
@@ -148,7 +148,7 @@
                 org.junit.runner.notification;version=${junit.version},
                 org.junit.runners;version=${junit.version},
                 org.junit.runners.model;version=${junit.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/apacheds/branches/apacheds-value/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/xdbm-partition/pom.xml?rev=1805042&r1=1805041&r2=1805042&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/xdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/xdbm-partition/pom.xml Mon Aug 14 22:53:27 2017
@@ -151,7 +151,7 @@
                 org.apache.directory.server.core.avltree;version=${project.version},
                 org.apache.directory.server.core.partition.impl.btree;version=${project.version},
                 org.apache.directory.server.i18n;version=${project.version},
-                org.slf4j;version=${slf4j.api.version}
+                org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
           </instructions>
         </configuration>