Author: cziegeler
Date: Mon Jul  8 11:48:43 2013
New Revision: 1500674

URL: http://svn.apache.org/r1500674
Log:
SLING-2947 :  Merge installer api back into core

Added:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/
      - copied from r1500671, 
sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/
Modified:
    sling/trunk/installer/core/pom.xml

Modified: sling/trunk/installer/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=1500674&r1=1500673&r2=1500674&view=diff
==============================================================================
--- sling/trunk/installer/core/pom.xml (original)
+++ sling/trunk/installer/core/pom.xml Mon Jul  8 11:48:43 2013
@@ -57,6 +57,12 @@
                                                <Private-Package>
                                                    
org.apache.sling.installer.core.impl.*
                                                </Private-Package>
+                        <Export-Package>
+                            org.apache.sling.installer.api;version=3.1.0,
+                            org.apache.sling.installer.api.info;version=1.0.0,
+                            org.apache.sling.installer.api.event;version=1.0.0,
+                            org.apache.sling.installer.api.tasks;version=1.3.0
+                        </Export-Package>
                                     <!-- 
                                        As we make use of optional features 
from 4.3 if they
                                        are available, we have to add the 
framework imports 
@@ -67,7 +73,6 @@
                                            
org.osgi.framework.wiring;resolution:=optional,
                                            *
                                        </Import-Package>
-                                       <Export-Package>!*</Export-Package>
                         <Embed-Dependency>
                             
org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*",
                             
org.osgi.compendium;inline="org/osgi/util/tracker/*",
@@ -150,12 +155,6 @@
             <version>1.2.8</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.api</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
-        </dependency>
       <!-- Basic dependencies for Unit Tests -->
         <dependency>
             <groupId>junit</groupId>


Reply via email to