Author: cziegeler
Date: Mon Jul 8 13:24:43 2013
New Revision: 1500713
URL: http://svn.apache.org/r1500713
Log:
SLING-2947 : Merge installer api back into core
Modified:
sling/trunk/installer/it/pom.xml
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Modified: sling/trunk/installer/it/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/it/pom.xml?rev=1500713&r1=1500712&r2=1500713&view=diff
==============================================================================
--- sling/trunk/installer/it/pom.xml (original)
+++ sling/trunk/installer/it/pom.xml Mon Jul 8 13:24:43 2013
@@ -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 -->
@@ -68,10 +67,6 @@
<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>
@@ -439,12 +434,6 @@
<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>
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1500713&r1=1500712&r2=1500713&view=diff
==============================================================================
---
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
(original)
+++
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Mon Jul 8 13:24:43 2013
@@ -63,7 +63,6 @@ import org.osgi.util.tracker.ServiceTrac
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 F
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)
)
