felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r556674 - in /felix/trunk: framework/pom.xml framework/src/main/java/org/osgi/util/ framework/src/main/java/org/osgi/util/tracker/ main/pom.xml
Date Mon, 16 Jul 2007 17:29:19 GMT
Author: rickhall
Date: Mon Jul 16 10:29:17 2007
New Revision: 556674

URL: http://svn.apache.org/viewvc?view=rev&rev=556674
Log:
Embedded the service tracker source code directly into the framework
project in order to avoid having to release the compendium bundle for the
1.0 release. This was necessary since compendium has some ugly dependencies.

Added:
    felix/trunk/framework/src/main/java/org/osgi/util/
    felix/trunk/framework/src/main/java/org/osgi/util/tracker/
      - copied from r556626, felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/tracker/
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?view=diff&rev=556674&r1=556673&r2=556674
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Mon Jul 16 10:29:17 2007
@@ -34,11 +34,14 @@
       <artifactId>org.osgi.core</artifactId>
       <version>1.1.0-SNAPSHOT</version>
     </dependency>
-    <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.
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>0.9.0-SNAPSHOT</version>
-    </dependency>
+    </dependency-->
   </dependencies>
   <build>
     <plugins>

Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?view=diff&rev=556674&r1=556673&r2=556674
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Mon Jul 16 10:29:17 2007
@@ -38,10 +38,12 @@
           <groupId>${pom.groupId}</groupId>
           <artifactId>org.osgi.core</artifactId>
         </exclusion>
-        <exclusion>
+        <!--exclusion>
+          For now framework doesn't have this dependency, but it
+          will once the compendium bundle is released.
           <groupId>${pom.groupId}</groupId>
           <artifactId>org.osgi.compendium</artifactId>
-        </exclusion>
+        </exclusion-->
       </exclusions>
     </dependency>
     <dependency>



Mime
View raw message