You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2015/06/01 15:27:30 UTC
svn commit: r1682896 -
/sling/trunk/bundles/extensions/models/integration-tests/pom.xml
Author: kwin
Date: Mon Jun 1 13:27:30 2015
New Revision: 1682896
URL: http://svn.apache.org/r1682896
Log:
SLING-4710 rely again on latest release version of the launchpad (7) to make integration-tests more stable
Modified:
sling/trunk/bundles/extensions/models/integration-tests/pom.xml
Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1682896&r1=1682895&r2=1682896&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Mon Jun 1 13:27:30 2015
@@ -237,6 +237,7 @@
All bundles must be listed as dependencies in this pom, or they won't be installed.
-->
<sling.additional.bundle.1>org.apache.sling.junit.core</sling.additional.bundle.1>
+ <sling.additional.bundle.2>geronimo-atinject_1.0_spec</sling.additional.bundle.2>
<sling.additional.bundle.10>org.apache.sling.models.api</sling.additional.bundle.10>
<sling.additional.bundle.11>org.apache.sling.models.impl</sling.additional.bundle.11>
<sling.additional.bundle.12>${project.build.finalName}.jar</sling.additional.bundle.12>
@@ -278,6 +279,13 @@
<version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <!-- not part of launchpad 7 (see SLING-4710) -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
<!-- sling testing tools bundles requires httpclient -->
<dependency>
@@ -304,12 +312,6 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.2.0</version>
@@ -329,7 +331,8 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
- <version>8-SNAPSHOT</version>
+ <classifier>standalone</classifier>
+ <version>7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>