You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2012/04/24 08:46:50 UTC
svn commit: r1329566 - in /ace/trunk: ace-target-devserver/pom.xml
pom/pom.xml
Author: marrs
Date: Tue Apr 24 06:46:49 2012
New Revision: 1329566
URL: http://svn.apache.org/viewvc?rev=1329566&view=rev
Log:
ACE-266 upgraded to Felix Jetty 2.2.0
Modified:
ace/trunk/ace-target-devserver/pom.xml
ace/trunk/pom/pom.xml
Modified: ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/pom.xml?rev=1329566&r1=1329565&r2=1329566&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/pom.xml (original)
+++ ace/trunk/ace-target-devserver/pom.xml Tue Apr 24 06:46:49 2012
@@ -147,15 +147,10 @@
<artifactId>org.apache.felix.prefs</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- TODO validate if these are the right artifacts -->
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- </dependency>
<dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jetty-bundle</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/pom/pom.xml?rev=1329566&r1=1329565&r2=1329566&view=diff
==============================================================================
--- ace/trunk/pom/pom.xml (original)
+++ ace/trunk/pom/pom.xml Tue Apr 24 06:46:49 2012
@@ -148,6 +148,7 @@
<felix.metatype.version>1.0.4</felix.metatype.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
<felix.shell.version>1.4.2</felix.shell.version>
+ <felix.http.version>2.2.0</felix.http.version>
<junit.version>4.4</junit.version>
<knopflerfish.version>2.0.2</knopflerfish.version>
<kxml2.version>2.3.0</kxml2.version>
@@ -858,6 +859,11 @@
<artifactId>org.apache.felix.prefs</artifactId>
<version>${felix.prefs.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${felix.http.version}</version>
+ </dependency>
<!-- Knopflerfish -->
<dependency>