Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 873fe82e2 -> c318782ad
[KARAF-3191] Upgrade to Pax Web 3.1.2-SNAPSHOT and renable some features itests Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c318782a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c318782a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c318782a Branch: refs/heads/karaf-3.0.x Commit: c318782ad98dedd85d4142ec2ff193be8d012f3d Parents: 873fe82 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Aug 27 18:20:20 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Aug 27 18:20:20 2014 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/itests/features/SpringFeaturesTest.java | 6 ------ pom.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c318782a/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java index 24b36c6..d9eea8e 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java @@ -60,10 +60,6 @@ public class SpringFeaturesTest extends KarafTestSupport { installAssertAndUninstallFeature("spring-jms"); } - /** - * Ignore this itest waiting for KARAF-3178 - */ - @Ignore @Test public void installSpringStrutsFeature() throws Exception { installAssertAndUninstallFeature("spring-struts"); @@ -95,7 +91,6 @@ public class SpringFeaturesTest extends KarafTestSupport { } @Test - @Ignore public void installSpringWebPortletFeature() throws Exception { installAssertAndUninstallFeature("spring-web-portlet"); } @@ -106,7 +101,6 @@ public class SpringFeaturesTest extends KarafTestSupport { } @Test - @Ignore public void installGeminiBlueprintFeature() throws Exception { installAssertAndUninstallFeature("gemini-blueprint"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/c318782a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e16f342..43f4ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ <pax.logging.version>1.7.3</pax.logging.version> <pax.base.version>1.4.0</pax.base.version> <pax.url.version>1.6.0</pax.url.version> - <pax.web.version>3.1.1</pax.web.version> + <pax.web.version>3.1.2-SNAPSHOT</pax.web.version> <pax.swissbox.version>1.7.0</pax.swissbox.version> <pax.tinybundle.version>2.0.0</pax.tinybundle.version> <portlet-api.version>2.0</portlet-api.version>
