You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/02/28 20:08:49 UTC
[cxf] branch master updated: Update to tomcat 8.5.51
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 972a275 Update to tomcat 8.5.51
972a275 is described below
commit 972a2755ca85ba86f473b0ce46f23bf6193ced62
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Feb 28 23:08:07 2020 +0300
Update to tomcat 8.5.51
---
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 30f308e..75ffbcb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -206,7 +206,7 @@
<cxf.swagger2.version>1.6.0</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 8fcea5c..56d90cd 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 d52a47e..6ab25a0 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-core</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.glassfish</groupId>