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/05/03 07:17:17 UTC
svn commit: r1742060 - in /sling/trunk/bundles/scripting/core: pom.xml
src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
Author: olli
Date: Tue May 3 05:17:17 2016
New Revision: 1742060
URL: http://svn.apache.org/viewvc?rev=1742060&view=rev
Log:
straighten BindingsValuesProvidersByContextIT and update some test related dependencies
Modified:
sling/trunk/bundles/scripting/core/pom.xml
sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
Modified: sling/trunk/bundles/scripting/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1742060&r1=1742059&r2=1742060&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue May 3 05:17:17 2016
@@ -125,7 +125,9 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -252,7 +254,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.4.1</version>
+ <version>5.4.0</version>
<scope>test</scope>
</dependency>
@@ -276,5 +278,18 @@
<version>1.6.0</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.4.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java?rev=1742060&r1=1742059&r2=1742060&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java (original)
+++ sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java Tue May 3 05:17:17 2016
@@ -86,20 +86,20 @@ public class BindingsValuesProvidersByCo
),
provision(
bundle(bundleFile.toURI().toString()),
- mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
- mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.3.2"),
- mavenBundle(maven().groupId(FELIX_GID).artifactId("org.apache.felix.webconsole").versionAsInProject()),
+ mavenBundle().groupId(FELIX_GID).artifactId("org.apache.felix.scr").versionAsInProject(),
+ mavenBundle().groupId(FELIX_GID).artifactId("org.apache.felix.eventadmin").versionAsInProject(),
+ mavenBundle().groupId(FELIX_GID).artifactId("org.apache.felix.webconsole").versionAsInProject(),
- mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.scripting.api").versionAsInProject()),
+ mavenBundle().groupId(SLING_GID).artifactId("org.apache.sling.scripting.api").versionAsInProject(),
- mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.commons.threads").versionAsInProject()),
- mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.api").versionAsInProject()),
- mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.commons.mime").versionAsInProject()),
- mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.commons.osgi").versionAsInProject()),
+ mavenBundle().groupId(SLING_GID).artifactId("org.apache.sling.commons.threads").versionAsInProject(),
+ mavenBundle().groupId(SLING_GID).artifactId("org.apache.sling.api").versionAsInProject(),
+ mavenBundle().groupId(SLING_GID).artifactId("org.apache.sling.commons.mime").versionAsInProject(),
+ mavenBundle().groupId(SLING_GID).artifactId("org.apache.sling.commons.osgi").versionAsInProject(),
- mavenBundle("org.mortbay.jetty", "servlet-api-2.5", "6.1.14"),
- mavenBundle(maven().groupId("commons-io").artifactId("commons-io").versionAsInProject()),
- mavenBundle(maven().groupId("commons-lang").artifactId("commons-lang").versionAsInProject())
+ mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject(),
+ mavenBundle().groupId("commons-io").artifactId("commons-io").versionAsInProject(),
+ mavenBundle().groupId("commons-lang").artifactId("commons-lang").versionAsInProject()
),
junitBundles()
);