You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/01/21 06:58:27 UTC
svn commit: r901541 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/filtered-resources/ examples/itests/tests/
examples/itests/tests/src/test/java/org/apache/servicemix/examples/
Author: ffang
Date: Thu Jan 21 05:58:07 2010
New Revision: 901541
URL: http://svn.apache.org/viewvc?rev=901541&view=rev
Log:
[SMX4-442]keep save pax version between features and karaf
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=901541&r1=901540&r2=901541&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Jan 21 05:58:07 2010
@@ -593,7 +593,22 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-bundle</artifactId>
+ <artifactId>pax-web-api</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-spi</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-runtime</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty</artifactId>
<version>${pax.web.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=901541&r1=901540&r2=901541&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Thu Jan 21 05:58:07 2010
@@ -32,7 +32,10 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-bundle/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
</feature>
<feature name="web" version="${version}">
<feature version="${version}">web-core</feature>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=901541&r1=901540&r2=901541&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Thu Jan 21 05:58:07 2010
@@ -352,7 +352,22 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-bundle</artifactId>
+ <artifactId>pax-web-api</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-spi</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-runtime</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty</artifactId>
<version>${pax.web.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=901541&r1=901540&r2=901541&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Thu Jan 21 05:58:07 2010
@@ -108,7 +108,10 @@
getBundle("org.codehaus.jettison", "jettison"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jsr311-api-1.0"),
- getBundle("org.ops4j.pax.web", "pax-web-bundle"),
+ getBundle("org.ops4j.pax.web", "pax-web-api"),
+ getBundle("org.ops4j.pax.web", "pax-web-spi"),
+ getBundle("org.ops4j.pax.web", "pax-web-runtime"),
+ getBundle("org.ops4j.pax.web", "pax-web-jetty"),
getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=901541&r1=901540&r2=901541&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Thu Jan 21 05:58:07 2010
@@ -132,7 +132,10 @@
getBundle("org.codehaus.jettison", "jettison"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jsr311-api-1.0"),
- getBundle("org.ops4j.pax.web", "pax-web-bundle"),
+ getBundle("org.ops4j.pax.web", "pax-web-api"),
+ getBundle("org.ops4j.pax.web", "pax-web-spi"),
+ getBundle("org.ops4j.pax.web", "pax-web-runtime"),
+ getBundle("org.ops4j.pax.web", "pax-web-jetty"),
getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=901541&r1=901540&r2=901541&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Jan 21 05:58:07 2010
@@ -168,11 +168,11 @@
<oro.version>2.0.8_1</oro.version>
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.bundle.version>1.2.1_2</openjpa.bundle.version>
- <pax.exam.version>1.0.0</pax.exam.version>
- <pax.runner.version>1.1.1</pax.runner.version>
+ <pax.exam.version>1.1.0</pax.exam.version>
+ <pax.runner.version>1.2.1</pax.runner.version>
<pax.logging.version>1.4</pax.logging.version>
- <pax.url.version>1.0.0</pax.url.version>
- <pax.web.version>0.6.0</pax.web.version>
+ <pax.url.version>1.1.2</pax.url.version>
+ <pax.web.version>0.7.1</pax.web.version>
<pax.web.extender.version>0.5.0</pax.web.extender.version>
<propertyset.version>1.3_3</propertyset.version>
<qpid.version>1.0-incubating-M2.1_1</qpid.version>