You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/04/16 22:13:21 UTC
svn commit: r1674144 - in /directory/shared/trunk: ./ dsml/engine/
dsml/parser/ ldap/client/api/ ldap/codec/core/ ldap/extras/codec/
ldap/extras/trigger/ ldap/extras/util/ ldap/model/ ldap/net/mina/
ldap/schema/converter/ util/
Author: seelmann
Date: Thu Apr 16 20:13:20 2015
New Revision: 1674144
URL: http://svn.apache.org/r1674144
Log:
Import package range for slf4j (DIRAPI-233)
Modified:
directory/shared/trunk/dsml/engine/pom.xml
directory/shared/trunk/dsml/parser/pom.xml
directory/shared/trunk/ldap/client/api/pom.xml
directory/shared/trunk/ldap/codec/core/pom.xml
directory/shared/trunk/ldap/extras/codec/pom.xml
directory/shared/trunk/ldap/extras/trigger/pom.xml
directory/shared/trunk/ldap/extras/util/pom.xml
directory/shared/trunk/ldap/model/pom.xml
directory/shared/trunk/ldap/net/mina/pom.xml
directory/shared/trunk/ldap/schema/converter/pom.xml
directory/shared/trunk/pom.xml
directory/shared/trunk/util/pom.xml
Modified: directory/shared/trunk/dsml/engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/pom.xml (original)
+++ directory/shared/trunk/dsml/engine/pom.xml Thu Apr 16 20:13:20 2015
@@ -93,7 +93,7 @@
org.apache.directory.api.util;version=${project.version},
org.apache.directory.ldap.client.api;version=${project.version},
org.dom4j;version=${dom4j.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
org.xmlpull.v1;version=${xpp3.version}
</Import-Package>
</instructions>
Modified: directory/shared/trunk/dsml/parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/pom.xml (original)
+++ directory/shared/trunk/dsml/parser/pom.xml Thu Apr 16 20:13:20 2015
@@ -131,7 +131,7 @@
org.dom4j;version=${dom4j.version},
org.dom4j.io;version=${dom4j.version},
org.dom4j.tree;version=${dom4j.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
org.xmlpull.v1;version=${xpp3.version},
javax.xml.transform,
javax.xml.transform.stream
Modified: directory/shared/trunk/ldap/client/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/pom.xml (original)
+++ directory/shared/trunk/ldap/client/api/pom.xml Thu Apr 16 20:13:20 2015
@@ -174,7 +174,7 @@
org.apache.mina.filter.ssl;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},
javax.security.auth.login,
javax.security.auth.callback,
javax.security.sasl,
Modified: directory/shared/trunk/ldap/codec/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/core/pom.xml Thu Apr 16 20:13:20 2015
@@ -151,7 +151,7 @@
org.apache.directory.api.util.exception;version=${project.version},
org.apache.mina.filter.codec;version=${mina.core.version},
org.apache.mina.util;version=${mina.core.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
org.osgi.framework;version="[1.0.0,2.0.0)",
javax.naming,
javax.naming.directory,
Modified: directory/shared/trunk/ldap/extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec/pom.xml Thu Apr 16 20:13:20 2015
@@ -147,7 +147,7 @@
org.apache.directory.api.ldap.model.name;version=${project.version},
org.apache.directory.api.ldap.model.url;version=${project.version},
org.apache.directory.api.util;version=${project.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
org.osgi.framework;version="[1.0.0,2.0.0)",
org.osgi.util.tracker;version="[1.0.0,2.0.0)",
</Import-Package>
Modified: directory/shared/trunk/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/trigger/pom.xml Thu Apr 16 20:13:20 2015
@@ -111,7 +111,7 @@
org.apache.directory.api.ldap.model.message;version=${project.version},
org.apache.directory.api.ldap.model.name;version=${project.version},
org.apache.directory.api.ldap.model.schema;version=${project.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
javax.naming,
javax.naming.directory,
javax.naming.ldap
Modified: directory/shared/trunk/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/util/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/util/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/util/pom.xml Thu Apr 16 20:13:20 2015
@@ -74,7 +74,7 @@
org.apache.directory.api.ldap.model.exception;version=${project.version},
org.apache.directory.api.ldap.model.message;version=${project.version},
org.apache.directory.api.ldap.model.name;version=${project.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
javax.naming,
javax.naming.directory,
javax.naming.ldap
Modified: directory/shared/trunk/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/pom.xml (original)
+++ directory/shared/trunk/ldap/model/pom.xml Thu Apr 16 20:13:20 2015
@@ -190,7 +190,7 @@
org.apache.directory.api.i18n;version=${project.version},
org.apache.directory.api.util;version=${project.version},
org.apache.directory.api.util.exception;version=${project.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
javax.naming,
javax.naming.directory,
javax.naming.ldap
Modified: directory/shared/trunk/ldap/net/mina/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/pom.xml (original)
+++ directory/shared/trunk/ldap/net/mina/pom.xml Thu Apr 16 20:13:20 2015
@@ -75,7 +75,7 @@
org.apache.mina.core.buffer;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},
org.osgi.framework;version="[1.0.0,2.0.0)",
org.osgi.util.tracker;version="[1.0.0,2.0.0)"
</Import-Package>
Modified: directory/shared/trunk/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/converter/pom.xml Thu Apr 16 20:13:20 2015
@@ -134,7 +134,7 @@
org.apache.directory.api.ldap.model.name;version=${project.version},
org.apache.directory.api.ldap.model.schema;version=${project.version},
org.apache.directory.api.util;version=${project.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
antlr;version=${antlr.version},
*
]]>
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Thu Apr 16 20:13:20 2015
@@ -54,6 +54,7 @@
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<org.apache.felix.version>4.4.1</org.apache.felix.version>
<slf4j.api.version>1.7.10</slf4j.api.version>
+ <slf4j.api.bundleversion>"$«range;[==,=+)»"</slf4j.api.bundleversion>
<slf4j.log4j12.version>1.7.10</slf4j.log4j12.version>
<xml.apis.version>2.0.2</xml.apis.version>
<xpp3.version>1.1.4c</xpp3.version>
Modified: directory/shared/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/pom.xml?rev=1674144&r1=1674143&r2=1674144&view=diff
==============================================================================
--- directory/shared/trunk/util/pom.xml (original)
+++ directory/shared/trunk/util/pom.xml Thu Apr 16 20:13:20 2015
@@ -72,7 +72,7 @@
</Export-Package>
<Import-Package>
org.apache.directory.api.i18n;version=${project.version},
- org.slf4j;version=${slf4j.api.version},
+ org.slf4j;version=${slf4j.api.bundleversion},
javax.naming,
javax.naming.directory,
javax.naming.ldap