incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1392221 - in /sling/trunk/installer/it: pom.xml src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Date Mon, 01 Oct 2012 06:55:57 GMT
Author: cziegeler
Date: Mon Oct  1 06:55:57 2012
New Revision: 1392221

URL: http://svn.apache.org/viewvc?rev=1392221&view=rev
Log:
SLING-2527 : Make api version configurable and use correct version

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=1392221&r1=1392220&r2=1392221&view=diff
==============================================================================
--- sling/trunk/installer/it/pom.xml (original)
+++ sling/trunk/installer/it/pom.xml Mon Oct  1 06:55:57 2012
@@ -87,6 +87,10 @@
                             <value>${project.version}</value>
                         </property>
                         <property>
+                            <name>installer.api.version</name>
+                            <value>1.0-SNAPSHOT</value>
+                        </property>
+                        <property>
                             <name>installer.configuration.version</name>
                             <value>1.0.9-SNAPSHOT</value>
                         </property>

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=1392221&r1=1392220&r2=1392221&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 Oct  1 06:55:57 2012
@@ -59,6 +59,7 @@ 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;
@@ -385,7 +386,7 @@ 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", "3.3.9-SNAPSHOT"),
// TODO: Switch to released version when released.
+        	        	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)
         		)



Mime
View raw message