incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r980700 - in /sling/trunk/bundles: extensions/bundleresource/pom.xml extensions/fsresource/pom.xml jcr/resource/pom.xml servlets/resolver/pom.xml
Date Fri, 30 Jul 2010 09:22:06 GMT
Author: fmeschbe
Date: Fri Jul 30 09:22:06 2010
New Revision: 980700

URL: http://svn.apache.org/viewvc?rev=980700&view=rev
Log:
SLING-1193 Have the bundle plugin set the correct import version range for the resource API
implemented by the bundles

Modified:
    sling/trunk/bundles/extensions/bundleresource/pom.xml
    sling/trunk/bundles/extensions/fsresource/pom.xml
    sling/trunk/bundles/jcr/resource/pom.xml
    sling/trunk/bundles/servlets/resolver/pom.xml

Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=980700&r1=980699&r2=980700&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/bundleresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/bundleresource/pom.xml Fri Jul 30 09:22:06 2010
@@ -63,6 +63,10 @@
                             org.apache.sling.bundleresource.*,
                             org.osgi.util.tracker
                         </Private-Package>
+                        <Import-Package>
+                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            *
+                        </Import-Package>
                         <DynamicImport-Package>
                             org.apache.felix.webconsole
                         </DynamicImport-Package>

Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=980700&r1=980699&r2=980700&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Fri Jul 30 09:22:06 2010
@@ -60,6 +60,10 @@
                         <Private-Package>
                             org.apache.sling.fsprovider.internal
                         </Private-Package>
+                        <Import-Package>
+                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=980700&r1=980699&r2=980700&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Fri Jul 30 09:22:06 2010
@@ -70,6 +70,7 @@
                         <Import-Package>
                             javax.script.*;
                             org.apache.sling.scripting.api.*;resolution:=optional,
+                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
                             org.apache.felix.webconsole;resolution:=optional,
                             *
                         </Import-Package>

Modified: sling/trunk/bundles/servlets/resolver/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=980700&r1=980699&r2=980700&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ sling/trunk/bundles/servlets/resolver/pom.xml Fri Jul 30 09:22:06 2010
@@ -55,7 +55,9 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.jcr;resolution:=optional,*
+                            javax.jcr;resolution:=optional,
+                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            *
                         </Import-Package>
                         <Private-Package>
                             org.apache.sling.servlets.resolver.*



Mime
View raw message