SLING-2947 : Merge installer api back into core
authorCarsten Ziegeler <cziegeler@apache.org>
Mon, 8 Jul 2013 13:24:43 +0000 (13:24 +0000)
committerCarsten Ziegeler <cziegeler@apache.org>
Mon, 8 Jul 2013 13:24:43 +0000 (13:24 +0000)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1500713 13f79535-47bb-0310-9956-ffa450edef68

pom.xml
src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java

diff --git a/pom.xml b/pom.xml
index 9b99450..b42bb92 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
         <exam.version>3.0.3</exam.version>
         <url.version>1.5.2</url.version>
         <pax.exam.log.level>INFO</pax.exam.log.level>
-        <installer.api.version>1.0.1-SNAPSHOT</installer.api.version>
         <installer.configuration.version>1.0.11-SNAPSHOT</installer.configuration.version>
 
         <!-- BundleInstallStressTest parameters -->
                             <value>${project.version}</value>
                         </property>
                         <property>
-                            <name>installer.api.version</name>
-                            <value>${installer.api.version}</value>
-                        </property>
-                        <property>
                             <name>installer.configuration.version</name>
                             <value>${installer.configuration.version}</value>
                         </property>
     <dependencies>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.api</artifactId>
-            <version>${installer.api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.installer.factory.configuration</artifactId>
             <version>${installer.configuration.version}</version>
             <scope>provided</scope>
index 61b9de9..a52f50c 100644 (file)
@@ -63,7 +63,6 @@ import org.osgi.util.tracker.ServiceTracker;
 class OsgiInstallerTestBase implements FrameworkListener {
        private final static String POM_VERSION = System.getProperty("osgi.installer.pom.version");
     private final static String CONFIG_VERSION = System.getProperty("installer.configuration.version");
-    private final static String API_VERSION = System.getProperty("installer.api.version");
 
        public final static String JAR_EXT = ".jar";
        private int packageRefreshEventsCount;
@@ -405,7 +404,6 @@ class OsgiInstallerTestBase implements FrameworkListener {
                            mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"),
                         mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.2"),
                            mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "2.1.2"),
-                               mavenBundle("org.apache.sling", "org.apache.sling.installer.api", API_VERSION),
                                mavenBundle("org.apache.sling", "org.apache.sling.installer.core", POM_VERSION),
                         mavenBundle("org.apache.sling", "org.apache.sling.installer.factory.configuration", CONFIG_VERSION)
                        )