Fix spring / spring-dm features, use pax-web instead of felix http service for web console
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@786288 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 76c60f3..aba3279 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -95,7 +95,7 @@
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<gshell.version>1.0-alpha-2</gshell.version>
<jaxp.ri.version>1.4.2_2</jaxp.ri.version>
- <jetty.version>6.1.14</jetty.version>
+ <jetty.bundle.version>6.1.14_1</jetty.bundle.version>
<junit.version>3.8.2_1</junit.version>
<jline.version>0.9.94_1</jline.version>
<log4j.version>1.2.14</log4j.version>
@@ -105,11 +105,12 @@
<pax.exam.version>0.5.0</pax.exam.version>
<pax.logging.version>1.3.1-SNAPSHOT</pax.logging.version>
<pax.url.version>0.3.3</pax.url.version>
+ <pax.web.version>0.6.0</pax.web.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.4-SNAPSHOT</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
- <spring.osgi.version>1.2.0-rc1</spring.osgi.version>
- <spring.version>2.5.6</spring.version>
+ <spring.osgi.version>1.2.0</spring.osgi.version>
+ <spring.version>2.5.6.SEC01</spring.version>
<sshd.version>1.0-SNAPSHOT</sshd.version>
<woodstox.version>3.2.7_1</woodstox.version>
<osgi.jmx.version>1.0-r6125-patched</osgi.jmx.version>