Author: rmannibucau
Date: Wed Apr 3 06:31:20 2013
New Revision: 1463835
URL: http://svn.apache.org/r1463835
Log:
TOMEE-882 TOMEE-883 myfaces 2.1.11 and cxf 2.6.7 (+woodstox 4.2.0)
Modified:
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1463835&r1=1463834&r2=1463835&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed Apr 3 06:31:20 2013
@@ -121,7 +121,7 @@
<tomcat.version>7.0.39</tomcat.version>
<!-- used mainly by jetty modules -->
- <cxf.version>2.6.6</cxf.version> <!--2.6.4 requires wss4j 1.6.8-->
+ <cxf.version>2.6.7</cxf.version> <!--2.6.4 requires wss4j 1.6.8-->
<ehcache.version>2.6.3</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>
@@ -147,7 +147,7 @@
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
- <myfaces.version>2.1.10</myfaces.version>
+ <myfaces.version>2.1.11</myfaces.version>
<slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<osgi.framework.version>4.2.0</osgi.framework.version>
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml?rev=1463835&r1=1463834&r2=1463835&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml Wed Apr 3 06:31:20 2013
@@ -64,10 +64,6 @@
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- </exclusion>
- <exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
