This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f85a097e78b2aa15568c9ee2bbe7d5200c5e572d Author: Alexey Markevich <[email protected]> AuthorDate: Fri Feb 28 23:08:07 2020 +0300 Update to tomcat 8.5.51 (cherry picked from commit 972a2755ca85ba86f473b0ce46f23bf6193ced62) --- parent/pom.xml | 2 +- systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 6 ++++++ systests/cdi/cdi-weld/pom.xml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 701b085..3b49f72 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -202,7 +202,7 @@ <cxf.swagger2.version>1.5.24</cxf.swagger2.version> <cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version> <cxf.tika.version>1.23</cxf.tika.version> - <cxf.tomcat.version>8.5.50</cxf.tomcat.version> + <cxf.tomcat.version>8.5.51</cxf.tomcat.version> <cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version> <cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version> <cxf.undertow.version>2.0.28.Final</cxf.undertow.version> diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml index 584aa1c..6bd5bd2 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml @@ -54,6 +54,12 @@ <artifactId>weld-se-core</artifactId> <version>${cxf.jboss.weld.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_3.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml index 2fe7c9e..9bd2bef 100644 --- a/systests/cdi/cdi-weld/pom.xml +++ b/systests/cdi/cdi-weld/pom.xml @@ -50,6 +50,12 @@ <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet</artifactId> <version>${cxf.jboss.weld.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_3.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.weld</groupId>
