This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-testing-war.git
The following commit(s) were added to refs/heads/master by this push:
new 35e71a3 SLING-7935 - Consolidate all 'launchpad-testing' modules into
a single git repository
35e71a3 is described below
commit 35e71a341986244a2f88dcbb6c276a8276fa45e9
Author: Robert Munteanu <[email protected]>
AuthorDate: Fri Oct 19 23:10:47 2018 +0200
SLING-7935 - Consolidate all 'launchpad-testing' modules into a single git
repository
---
pom.xml | 20 +++++++++++++++++++-
src/main/provisioning/model.txt | 4 ++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3ea178f..6ce06d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
<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>
@@ -218,6 +218,24 @@
</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>
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
index a453fec..f992672 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/model.txt
@@ -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
