felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1203101 - /felix/trunk/scr/pom.xml
Date Thu, 17 Nov 2011 08:24:49 GMT
Author: fmeschbe
Date: Thu Nov 17 08:24:49 2011
New Revision: 1203101

URL: http://svn.apache.org/viewvc?rev=1203101&view=rev
Log:
FELIX-3232 Re-Import SCR service API for different embeddings

Modified:
    felix/trunk/scr/pom.xml

Modified: felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1203101&r1=1203100&r2=1203101&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Thu Nov 17 08:24:49 2011
@@ -181,7 +181,7 @@
                             <!--
                                 The Felix Shell support is optional 
                             -->
-                            org.apache.felix.shell; resolution:=optional,
+                            org.apache.felix.shell;provide:=true;resolution:=optional,
                             
                             <!--
                                 Framework version 1.4 (from R4.1) is required
@@ -199,19 +199,29 @@
 
                             <!--
                                 PackageAdmin is used to find reference types if
-                                the any component's bundle does not import it.
-                                See BindMethod.getParameterClass(Class) for details 
+                                the component's bundle does not import it.
+                                See BindMethod.getParameterClass(Class) for details.
+                                R4.0 version 1.2 is sufficient. 
                             -->
                             org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional,
                             
                             <!--
                                 SCR API is required (we also export it) and must
-                                be of any 1.1 version, because we implement that
-                                exact version. This import is only used if the
-                                framework decides to wire the bundle to another
-                                API provider. 
+                                be of the same minor version as we export, because
+                                we implement that exact version. This import is
+                                only used if the framework decides to wire the
+                                bundle to another API provider. 
                             -->
-                            org.osgi.service.component;version="[1.1,1.2)"
+                            org.osgi.service.component;provide:=true,
+
+                            <!--
+                                SCR Admin API is required (we also export it) and
+                                must be of the same minor version as we export,
+                                because we implement that exact version. This
+                                import is only used if the framework decides to
+                                wire the bundle to another API provider. 
+                            -->
+                            org.apache.felix.scr;provide:=true
                         </Import-Package>
                         <DynamicImport-Package>
                             <!--



Mime
View raw message