directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1646565 - in /directory/shared/trunk: ldap/codec/core/pom.xml ldap/net/mina/pom.xml pom.xml
Date Thu, 18 Dec 2014 23:00:58 GMT
Author: seelmann
Date: Thu Dec 18 23:00:57 2014
New Revision: 1646565

URL: http://svn.apache.org/r1646565
Log:
Remove old OSGi 3 dependency, use only latest org.osgi.core R6

Modified:
    directory/shared/trunk/ldap/codec/core/pom.xml
    directory/shared/trunk/ldap/net/mina/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/shared/trunk/ldap/codec/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/pom.xml?rev=1646565&r1=1646564&r2=1646565&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/core/pom.xml Thu Dec 18 23:00:57 2014
@@ -79,7 +79,7 @@
     
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: directory/shared/trunk/ldap/net/mina/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/pom.xml?rev=1646565&r1=1646564&r2=1646565&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/pom.xml (original)
+++ directory/shared/trunk/ldap/net/mina/pom.xml Thu Dec 18 23:00:57 2014
@@ -43,7 +43,7 @@
     
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi</artifactId>
+      <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -76,7 +76,8 @@
               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.osgi.framework;version="[1.0.0,2.0.0)"
+              org.osgi.framework;version="[1.0.0,2.0.0)",
+              org.osgi.util.tracker;version="[1.0.0,2.0.0)"
             </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1646565&r1=1646564&r2=1646565&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Thu Dec 18 23:00:57 2014
@@ -50,7 +50,6 @@
     <junit.version>4.11</junit.version>
     <log4j.version>1.2.17</log4j.version>
     <mina.core.version>2.0.9</mina.core.version>
-    <org.osgi.version>3.0.0</org.osgi.version>
     <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.7</slf4j.api.version>
@@ -602,12 +601,6 @@
 
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi</artifactId>
-        <version>${org.osgi.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>${org.osgi.core.version}</version>
       </dependency>



Mime
View raw message