This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c1d1f0e CAMEL-14950: Align to use same servlet api as the other Camel
components.
c1d1f0e is described below
commit c1d1f0ebe0f88a8c7fcd5410bc9ca6d3da8ea107
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Apr 28 09:34:54 2020 +0200
CAMEL-14950: Align to use same servlet api as the other Camel components.
---
components/camel-undertow/pom.xml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/components/camel-undertow/pom.xml
b/components/camel-undertow/pom.xml
index ddc87ed..b783222 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -59,8 +59,23 @@
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>${undertow-version}</version>
- </dependency>
-
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax-servlet-api-version}</version>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
