This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 7dc48c4 Fix #3496 Ban javax.servlet:javax.servlet-api in favor of
jakarta.servlet:jakarta.servlet-api
7dc48c4 is described below
commit 7dc48c42ecfed4562e4eb2e4aa4f3a812af7f409
Author: Amos Feng <[email protected]>
AuthorDate: Sat Jan 29 13:43:34 2022 +0800
Fix #3496 Ban javax.servlet:javax.servlet-api in favor of
jakarta.servlet:jakarta.servlet-api
---
extensions-jvm/cometd/runtime/pom.xml | 10 ++++++++++
extensions-jvm/hdfs/runtime/pom.xml | 8 ++++++++
extensions-jvm/spark/runtime/pom.xml | 8 ++++++++
extensions/avro-rpc/runtime/pom.xml | 10 ++++++++++
integration-tests-support/wiremock/pom.xml | 8 ++++++++
integration-tests/avro-rpc/pom.xml | 6 ++++++
integration-tests/oaipmh/pom.xml | 11 ++++++++++-
pom.xml | 2 ++
8 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/extensions-jvm/cometd/runtime/pom.xml
b/extensions-jvm/cometd/runtime/pom.xml
index 10176ec..411522c 100644
--- a/extensions-jvm/cometd/runtime/pom.xml
+++ b/extensions-jvm/cometd/runtime/pom.xml
@@ -54,6 +54,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cometd</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/extensions-jvm/hdfs/runtime/pom.xml
b/extensions-jvm/hdfs/runtime/pom.xml
index 150c57d..bc821e4 100644
--- a/extensions-jvm/hdfs/runtime/pom.xml
+++ b/extensions-jvm/hdfs/runtime/pom.xml
@@ -63,9 +63,17 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-netty</artifactId>
</dependency>
diff --git a/extensions-jvm/spark/runtime/pom.xml
b/extensions-jvm/spark/runtime/pom.xml
index 73d90ab..fa897cc 100644
--- a/extensions-jvm/spark/runtime/pom.xml
+++ b/extensions-jvm/spark/runtime/pom.xml
@@ -88,6 +88,10 @@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -98,6 +102,10 @@
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/avro-rpc/runtime/pom.xml
b/extensions/avro-rpc/runtime/pom.xml
index 2bb21ae..15df61a 100644
--- a/extensions/avro-rpc/runtime/pom.xml
+++ b/extensions/avro-rpc/runtime/pom.xml
@@ -69,6 +69,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-avro-rpc-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<artifactId>quarkus-avro</artifactId>
diff --git a/integration-tests-support/wiremock/pom.xml
b/integration-tests-support/wiremock/pom.xml
index 5eb9cf6..77d8056 100644
--- a/integration-tests-support/wiremock/pom.xml
+++ b/integration-tests-support/wiremock/pom.xml
@@ -46,6 +46,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -56,5 +60,9 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/integration-tests/avro-rpc/pom.xml
b/integration-tests/avro-rpc/pom.xml
index a03d9af..6a2aff7 100644
--- a/integration-tests/avro-rpc/pom.xml
+++ b/integration-tests/avro-rpc/pom.xml
@@ -58,6 +58,12 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-jetty</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/oaipmh/pom.xml b/integration-tests/oaipmh/pom.xml
index c432af6..7204756 100644
--- a/integration-tests/oaipmh/pom.xml
+++ b/integration-tests/oaipmh/pom.xml
@@ -85,9 +85,18 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
</dependencies>
<profiles>
diff --git a/pom.xml b/pom.xml
index 9db28ec..6207e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -663,6 +663,8 @@
<exclude>io.netty:netty-all</exclude><!-- Use more fine grained netty artifacts
or even io.quarkus:quarkus-netty instead -->
<exclude>javax.activation:activation</exclude><!-- use
com.sun.activation:jakarta.activation instead -->
<exclude>javax.enterprise:cdi-api</exclude><!-- use
jakarta.enterprise:jakarta.enterprise.cdi-api instead -->
+
<exclude>javax.servlet:servlet-api</exclude><!-- use
jakarta.servlet:jakarta.servlet-api instead -->
+
<exclude>javax.servlet:javax.servlet-api</exclude><!-- use
jakarta.servlet:jakarta.servlet-api instead -->
<exclude>log4j:log4j</exclude><!-- use
org.jboss.logmanager:log4j-jboss-logmanager instead -->
<exclude>org.apache.geronimo.specs:geronimo-jms_1.1_spec</exclude><!-- use
jakarta.jms:jakarta.jms-api instead -->
<exclude>org.apache.geronimo.specs:geronimo-jms_2.0_spec</exclude><!-- use
jakarta.jms:jakarta.jms-api instead -->
