Author: olli
Date: Sat Dec 6 12:34:21 2014
New Revision: 1643529
URL: http://svn.apache.org/r1643529
Log:
SLING-3821 update Pax Exam to 4.4.0 (re-enable 2 ITs disabled in r1639995)
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1643529&r1=1643528&r2=1643529&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Sat Dec 6 12:34:21 2014
@@ -85,17 +85,17 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -158,12 +158,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <excludes>
- <exclude>**/SlingExtensionModelsIT.*</exclude>
- <exclude>**/SlingScriptingJavaIT.*</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml?rev=1643529&r1=1643528&r2=1643529&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/pom.xml
Sat Dec 6 12:34:21 2014
@@ -60,19 +60,19 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -114,7 +114,7 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.4.0</version>
<configuration>
<configClass>org.apache.sling.launchpad.karaf.tests.configuration.SlingLaunchpadConfiguration</configClass>
</configuration>
