svn commit: r615628 - in /felix/trunk: framework/pom.xml framework/src/main/java/org/osgi/util/ main/pom.xml

[ri...@apache.org]

Author: rickhall
Date: Sun Jan 27 10:42:15 2008
New Revision: 615628

URL: http://svn.apache.org/viewvc?rev=615628&view=rev
Log:
Now that compendium has been released, we no longer need to embed service
tracker source into the framework subproject.

Removed:
    felix/trunk/framework/src/main/java/org/osgi/util/
Modified:
    felix/trunk/framework/pom.xml
    felix/trunk/main/pom.xml

Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=615628&r1=615627&r2=615628&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Sun Jan 27 10:42:15 2008
@@ -34,14 +34,11 @@
       <artifactId>org.osgi.core</artifactId>
       <version>1.0.0</version>
     </dependency>
-    <!--dependency>
-      We include ServiceTracker source code directly to avoid some
-      packaging issues. Will need to edit main pom to exclude this
-      dependency once it is added back in.
+    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-    </dependency-->
+      <version>1.0.0</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=615628&r1=615627&r2=615628&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Sun Jan 27 10:42:15 2008
@@ -38,12 +38,10 @@
           <groupId>${pom.groupId}</groupId>
           <artifactId>org.osgi.core</artifactId>
         </exclusion>
-        <!--exclusion>
-          For now framework doesn't have this dependency, but it
-          will once the compendium bundle is released.
+        <exclusion>
           <groupId>${pom.groupId}</groupId>
           <artifactId>org.osgi.compendium</artifactId>
-        </exclusion-->
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -76,6 +74,10 @@
         <exclusion>
           <groupId>${pom.groupId}</groupId>
           <artifactId>org.osgi.core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>org.osgi.service.obr</artifactId>
         </exclusion>
         <exclusion>
           <groupId>net.sf.kxml</groupId>