You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2011/06/16 15:26:20 UTC

svn commit: r1136426 - in /felix/trunk/eventadmin/impl: changelog.txt obr.xml pom.xml

Author: gnodet
Date: Thu Jun 16 13:26:20 2011
New Revision: 1136426

URL: http://svn.apache.org/viewvc?rev=1136426&view=rev
Log:
[FELIX-3002] Embed the OBR specific information for the EventAdmin bundle in the manifest

Removed:
    felix/trunk/eventadmin/impl/obr.xml
Modified:
    felix/trunk/eventadmin/impl/changelog.txt
    felix/trunk/eventadmin/impl/pom.xml

Modified: felix/trunk/eventadmin/impl/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/changelog.txt?rev=1136426&r1=1136425&r2=1136426&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/changelog.txt (original)
+++ felix/trunk/eventadmin/impl/changelog.txt Thu Jun 16 13:26:20 2011
@@ -1,3 +1,10 @@
+Changes from 1.2.12 to 1.2.14
+-----------------------------
+
+** Bug
+    * [FELIX-3002] - Embed the OBR specific information for the EventAdmin bundle in the manifest
+
+
 Changes from 1.2.10 to 1.2.12
 -----------------------------
 

Modified: felix/trunk/eventadmin/impl/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/pom.xml?rev=1136426&r1=1136425&r2=1136426&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/pom.xml (original)
+++ felix/trunk/eventadmin/impl/pom.xml Thu Jun 16 13:26:20 2011
@@ -75,7 +75,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.4</version>
+                <version>2.3.5-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -108,7 +108,9 @@
                         <Export-Package>org.osgi.service.event</Export-Package>
                         <Private-Package>org.apache.felix.eventadmin.impl.*</Private-Package>
                         <Import-Service>
-            	            org.osgi.service.event.EventHandler, org.osgi.service.log.LogService, org.osgi.service.log.LogReaderService
+                            org.osgi.service.event.EventHandler;availability:=optional;multiple:=true,
+                            org.osgi.service.log.LogService;availability:=optional;multiple:=false,
+                            org.osgi.service.log.LogReaderService;availability:=optional;multiple:=false
                         </Import-Service>
                         <Export-Service>
             	            org.osgi.service.event.EventAdmin