svn commit: r1416713 - in /openejb/trunk/openejb: pom.xml server/openejb-cxf-rs/pom.xml

[rm...@apache.org]

Author: rmannibucau
Date: Mon Dec  3 22:43:18 2012
New Revision: 1416713

URL: http://svn.apache.org/viewvc?rev=1416713&view=rev
Log:
TOMEE-457 reverting cxf upgrade to stock to jaxrs 1 since jaxrs 2 is not released

Modified:
    openejb/trunk/openejb/pom.xml
    openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1416713&r1=1416712&r2=1416713&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Mon Dec  3 22:43:18 2012
@@ -123,7 +123,7 @@
     <tomcat.version>7.0.33</tomcat.version>
 
     <!-- used mainly by jetty modules -->
-    <cxf.version>2.7.0</cxf.version>
+    <cxf.version>2.6.3</cxf.version>
     <ehcache.version>2.6.0</ehcache.version> <!-- used by cxf for security (replay attack) -->
     <jetty.version>7.5.3.v20111011</jetty.version>
     <pax-url.version>1.3.5</pax-url.version>

Modified: openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml?rev=1416713&r1=1416712&r2=1416713&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml Mon Dec  3 22:43:18 2012
@@ -60,6 +60,10 @@
           <artifactId>jsr311-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>javax.ws.rs-api</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.codehaus.woodstox</groupId>
           <artifactId>woodstox-core-asl</artifactId>
         </exclusion>