You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2014/07/31 21:28:31 UTC

svn commit: r1614966 - in /felix/trunk/scr: ./ src/main/java/org/osgi/annotation/versioning/ src/main/java/org/osgi/dto/ src/main/java/org/osgi/framework/ src/main/java/org/osgi/framework/dto/

Author: djencks
Date: Thu Jul 31 19:28:30 2014
New Revision: 1614966

URL: http://svn.apache.org/r1614966
Log:
FELIX-4401 use released R6 framework classes for base DTO support

Removed:
    felix/trunk/scr/src/main/java/org/osgi/annotation/versioning/ConsumerType.java
    felix/trunk/scr/src/main/java/org/osgi/annotation/versioning/ProviderType.java
    felix/trunk/scr/src/main/java/org/osgi/annotation/versioning/Version.java
    felix/trunk/scr/src/main/java/org/osgi/annotation/versioning/package-info.java
    felix/trunk/scr/src/main/java/org/osgi/dto/DTO.java
    felix/trunk/scr/src/main/java/org/osgi/dto/package-info.java
    felix/trunk/scr/src/main/java/org/osgi/framework/PrototypeServiceFactory.java
    felix/trunk/scr/src/main/java/org/osgi/framework/ServiceObjects.java
    felix/trunk/scr/src/main/java/org/osgi/framework/dto/BundleDTO.java
    felix/trunk/scr/src/main/java/org/osgi/framework/dto/FrameworkDTO.java
    felix/trunk/scr/src/main/java/org/osgi/framework/dto/ServiceReferenceDTO.java
    felix/trunk/scr/src/main/java/org/osgi/framework/dto/package-info.java
Modified:
    felix/trunk/scr/pom.xml

Modified: felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1614966&r1=1614965&r2=1614966&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Thu Jul 31 19:28:30 2014
@@ -78,14 +78,14 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>5.0.0</version>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.compendium</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>