You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2012/05/17 23:02:03 UTC

svn commit: r1339861 - in /sling/trunk/bundles: commons/logservice/pom.xml extensions/bundleresource/pom.xml extensions/framework-extension-ws/pom.xml extensions/fsresource/pom.xml jcr/resource/pom.xml servlets/resolver/pom.xml

Author: fmeschbe
Date: Thu May 17 21:02:03 2012
New Revision: 1339861

URL: http://svn.apache.org/viewvc?rev=1339861&view=rev
Log:
SLING-2483 Use provide:=true instead of version macros to define
the proper import version range. Also fix a small glitch in the parent pom relativePath of the
framework-extension-ws bundle

Modified:
    sling/trunk/bundles/commons/logservice/pom.xml
    sling/trunk/bundles/extensions/bundleresource/pom.xml
    sling/trunk/bundles/extensions/framework-extension-ws/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/commons/logservice/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/logservice/pom.xml?rev=1339861&r1=1339860&r2=1339861&view=diff
==============================================================================
--- sling/trunk/bundles/commons/logservice/pom.xml (original)
+++ sling/trunk/bundles/commons/logservice/pom.xml Thu May 17 21:02:03 2012
@@ -64,7 +64,7 @@
                             org.apache.sling.commons.logservice.*,
                         </Private-Package>
                         <Import-Package>
-                            org.osgi.service.log;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            org.osgi.service.log;provide:=true,
                             *
                         </Import-Package>
                     </instructions>

Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=1339861&r1=1339860&r2=1339861&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/bundleresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/bundleresource/pom.xml Thu May 17 21:02:03 2012
@@ -64,7 +64,7 @@
                             org.osgi.util.tracker
                         </Private-Package>
                         <Import-Package>
-                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            org.apache.sling.api.resource;provide:=true,
                             *
                         </Import-Package>
                     </instructions>

Modified: sling/trunk/bundles/extensions/framework-extension-ws/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-ws/pom.xml?rev=1339861&r1=1339860&r2=1339861&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-ws/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-ws/pom.xml Thu May 17 21:02:03 2012
@@ -24,7 +24,7 @@
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
         <version>13-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.sling.fragment.ws</artifactId>

Modified: sling/trunk/bundles/extensions/fsresource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1339861&r1=1339860&r2=1339861&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/fsresource/pom.xml Thu May 17 21:02:03 2012
@@ -75,7 +75,7 @@
                             org.apache.sling.fsprovider.internal
                         </Private-Package>
                         <Import-Package>
-                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            org.apache.sling.api.resource;provide:=true,
                             *
                         </Import-Package>
                     </instructions>

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1339861&r1=1339860&r2=1339861&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Thu May 17 21:02:03 2012
@@ -82,7 +82,7 @@
                             javax.script.*;
                             javax.annotation;resolution:=optional,
                             org.apache.sling.scripting.api.*;resolution:=optional,
-                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            org.apache.sling.api.resource;provide:=true,
                             org.apache.sling.commons.osgi;version="$(@)",
                             *
                         </Import-Package>

Modified: sling/trunk/bundles/servlets/resolver/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=1339861&r1=1339860&r2=1339861&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ sling/trunk/bundles/servlets/resolver/pom.xml Thu May 17 21:02:03 2012
@@ -60,7 +60,7 @@
                     <instructions>
                         <Import-Package>
                             javax.jcr;resolution:=optional,
-                            org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+                            org.apache.sling.api.resource;provide:=true,
                             *
                         </Import-Package>
                         <Private-Package>