You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/04 10:31:20 UTC
[camel] branch master updated: CAMEL-14640: Upgrade Tomcat
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 995069f CAMEL-14640: Upgrade Tomcat
995069f is described below
commit 995069ff21e88ff52777555110b1583ac4092383
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 11:30:51 2020 +0100
CAMEL-14640: Upgrade Tomcat
---
components/camel-servlet/pom.xml | 45 +++-------------------------------------
1 file changed, 3 insertions(+), 42 deletions(-)
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index dec1934..e5f2daf 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -39,7 +39,7 @@
</camel.osgi.import.before.defaults>
<!-- used for testing -->
- <tomcat.version>8.5.0</tomcat.version>
+ <tomcat.version>9.0.31</tomcat.version>
</properties>
<dependencyManagement>
@@ -160,38 +160,11 @@
<version>${arquillian-version}</version>
<scope>test</scope>
</dependency>
- <!--jetty-->
- <!--https://github.com/GoogleCloudPlatform/appengine-java-vm-runtime/issues/23-->
- <!--Still not fixed in 9.3.8.v20160314 and 9.3.9.M1, produce 404 NOT FOUND or a 500 if we remove the async-supported flag :-(-->
- <!--<dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-9</artifactId>
- <version>1.0.0.CR3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-deploy</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
- </dependency>-->
<!--tomcat-->
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-tomcat-embedded-8</artifactId>
- <version>1.0.0.CR7</version>
+ <artifactId>arquillian-tomcat-embedded-9</artifactId>
+ <version>1.1.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -200,17 +173,5 @@
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>${tomcat.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>