Author: janstey
Date: Thu Dec 1 20:20:35 2011
New Revision: 1209223
URL: http://svn.apache.org/viewvc?rev=1209223&view=rev
Log:
SMX4-995 - use same version of jsr311 as cxf 2.4.4
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/itests/tests/pom.xml
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml?rev=1209223&r1=1209222&r2=1209223&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml Thu Dec 1
20:20:35 2011
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/features/trunk/itests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/pom.xml?rev=1209223&r1=1209222&r2=1209223&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/itests/tests/pom.xml Thu Dec 1 20:20:35 2011
@@ -430,7 +430,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified:
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1209223&r1=1209222&r2=1209223&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Thu Dec 1 20:20:35 2011
@@ -102,7 +102,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.abdera"),
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.1"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jsr311-api-1.1.1"),
getBundle("org.ops4j.pax.web", "pax-web-api"),
getBundle("org.ops4j.pax.web", "pax-web-spi"),
getBundle("org.ops4j.pax.web", "pax-web-runtime"),
Modified:
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1209223&r1=1209222&r2=1209223&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Thu Dec 1 20:20:35 2011
@@ -138,7 +138,7 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.abdera"),
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.1"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jsr311-api-1.1.1"),
getBundle("org.ops4j.pax.web", "pax-web-api"),
getBundle("org.ops4j.pax.web", "pax-web-spi"),
getBundle("org.ops4j.pax.web", "pax-web-runtime"),
