You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/07/24 10:39:01 UTC
svn commit: r1753899 - in /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests: pom.xml src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Author: olli
Date: Sun Jul 24 10:39:01 2016
New Revision: 1753899

URL: http://svn.apache.org/viewvc?rev=1753899&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf

* use latest and upcoming releases
* exclude ExportedPackagesTest (unreleased fragment)

Modified:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1753899&r1=1753898&r2=1753899&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml Sun Jul 24 10:39:01 2016
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.servlets.compat</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.2</version>
       <scope>test</scope>
     </dependency>
     <!-- bnd -->
@@ -131,13 +131,13 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.junit.core</artifactId>
-      <version>1.0.15-SNAPSHOT</version>
+      <version>1.0.16</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -155,15 +155,17 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.launchpad.test-services</artifactId>
-      <version>2.0.9-SNAPSHOT</version>
+      <version>2.0.10</version>
       <scope>test</scope>
     </dependency>
+    <!-- TODO no release
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.launchpad.test-fragment</artifactId>
       <version>2.0.9-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    -->
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.tools</artifactId>
@@ -296,6 +298,8 @@
                 <!-- TODO repoinit -->
                 <exclude>**/RepoinitPathTest.*</exclude>
                 <exclude>**/SystemUsersTest.*</exclude>
+                <!-- TODO no release of org.apache.sling.launchpad.test-fragment -->
+                <exclude>**/ExportedPackagesTest.*</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1753899&r1=1753898&r2=1753899&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java Sun Jul 24 10:39:01 2016
@@ -67,7 +67,7 @@ public class SlingLaunchpadOakTarConfigu
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.remote").versionAsInProject(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.scriptable").versionAsInProject(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-services").versionAsInProject(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
+            // TODO no release mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
             mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(),
             mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(),