4:40 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-10-21 05:40:01 -0400 (Wed, 21 Oct 2009)
New Revision: 95272
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Revert back to pax-web-0.7.0
http://issues.ops4j.org/browse/PAXWEB-182
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-21 08:56:14 UTC (rev 95271)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 09:40:01 UTC (rev 95272)
@@ -67,9 +67,11 @@
<version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
+ <version.jboss.osgi.webapp>0.7.0-SNAPSHOT</version.jboss.osgi.webapp>
<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.web>0.7.1</version.ops4j.pax.web>
+ <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base>
+ <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -149,6 +151,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.webapp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
<version>${version.jboss.osgi.webconsole}</version>
</dependency>
@@ -223,6 +230,15 @@
<!-- 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/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21
08:56:14 UTC (rev 95271)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21
09:40:01 UTC (rev 95272)
@@ -26,6 +26,7 @@
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
+ <include>*:jboss-osgi-webapp:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-10-21
08:56:14 UTC (rev 95271)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-10-21
09:40:01 UTC (rev 95272)
@@ -26,6 +26,7 @@
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
+ <include>*:jboss-osgi-webapp:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 08:56:14 UTC (rev 95271)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 09:40:01 UTC (rev 95272)
@@ -128,9 +128,19 @@
<artifactId>jboss-osgi-jaxb</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- 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>