[jboss-cvs] JBossAS SVN: r95199 - in projects/jboss-osgi/trunk: testsuite and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-10-20 16:21:50 -0400 (Tue, 20 Oct 2009)
New Revision: 95199

Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Update felix + pax-web

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-10-20 20:16:44 UTC (rev 95198)
+++ projects/jboss-osgi/trunk/pom.xml	2009-10-20 20:21:50 UTC (rev 95199)
@@ -69,8 +69,7 @@
     <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
-    <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base>
-    <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
+    <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web>
     <version.osgi>r4v42</version.osgi>
   </properties>
 
@@ -222,17 +221,8 @@
         <version>${version.jboss.osgi.framework}</version>
       </dependency>
 
-      <!-- Ops4j -->
+      <!-- OPS4J -->
       <dependency>
-        <!-- 
-          [TODO] Invalid maven dependency on pax base
-          http://issues.ops4j.org/browse/PAXWEB-177 
-        -->
-        <groupId>org.ops4j.base</groupId>
-        <artifactId>ops4j-base-util-xml</artifactId>
-        <version>${version.ops4j.pax.base}</version>
-      </dependency>
-      <dependency>
         <groupId>org.ops4j.pax.web</groupId>
         <artifactId>pax-web-extender-war</artifactId>
         <version>${version.ops4j.pax.web}</version>

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-10-20 20:16:44 UTC (rev 95198)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-10-20 20:21:50 UTC (rev 95199)
@@ -131,11 +131,6 @@
     
     <!-- Ops4J -->
     <dependency>
-      <groupId>org.ops4j.base</groupId>
-      <artifactId>ops4j-base-util-xml</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ops4j.pax.web</groupId>
       <artifactId>pax-web-jetty-bundle</artifactId>
       <scope>provided</scope>