SLING-7935 - Consolidate all 'launchpad-testing' modules into a single git repository
authorRobert Munteanu <rombert@apache.org>
Fri, 19 Oct 2018 21:10:47 +0000 (23:10 +0200)
committerRobert Munteanu <rombert@apache.org>
Fri, 19 Oct 2018 21:10:47 +0000 (23:10 +0200)
pom.xml
src/main/provisioning/model.txt

diff --git a/pom.xml b/pom.xml
index 3ea178f..6ce06d1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <dependency>
              <groupId>org.apache.sling</groupId>
              <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
-             <version>1.0.8</version>
+             <version>${project.version}</version>
              <scope>test</scope>
              <exclusions>
                  <exclusion>
              </exclusions>
         </dependency>
 
+        <!-- depend on the exact same Slingstart version -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.starter</artifactId>
+            <type>slingfeature</type>
+            <classifier>slingfeature</classifier>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
+            <version>${project.version}</version>
+            <type>slingfeature</type>
+            <scope>provided</scope>
+        </dependency>
+
+
         <!-- Dependencies for the Test Build and Run -->
          <dependency>
             <groupId>commons-io</groupId>
index a453fec..f992672 100644 (file)
@@ -19,8 +19,8 @@
 [feature name=launchpad-testing]
 # Dependencies
 [artifacts]
-  org.apache.sling/org.apache.sling.starter/12-SNAPSHOT/slingstart
-  org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.6/slingfeature
+  org.apache.sling/org.apache.sling.starter//slingstart
+  org.apache.sling/org.apache.sling.launchpad.test-bundles//slingfeature
   javax.servlet.jsp/javax.servlet.jsp-api/2.2.1
   javax.el/javax.el-api/2.2.1