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/06/10 08:09:30 UTC
[camel] branch master updated: CAMEL-15096: Upgrade to Jetty 9.4.29
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 770bcbd CAMEL-15096: Upgrade to Jetty 9.4.29
770bcbd is described below
commit 770bcbdb1942f5fa7ae58998f0c20c7920744481
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 10 10:04:10 2020 +0200
CAMEL-15096: Upgrade to Jetty 9.4.29
---
camel-dependencies/pom.xml | 2 +-
.../main/java/org/apache/camel/component/jetty/JettyHttpComponent.java | 3 ++-
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 2799a47..0d359ae 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -333,7 +333,7 @@
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jetty-version>${jetty9-version}</jetty-version>
- <jetty9-version>9.4.22.v20191022</jetty9-version>
+ <jetty9-version>9.4.29.v20200521</jetty9-version>
<jgit-version>5.7.0.202003110725-r</jgit-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 4e209f0..1e148c1 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -34,6 +34,7 @@ import javax.management.MBeanServer;
import javax.servlet.Filter;
import javax.servlet.MultipartConfigElement;
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -1236,7 +1237,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
ErrorHandler eh = new ErrorHandler() {
public void handle(String target, Request baseRequest,
HttpServletRequest request, HttpServletResponse response)
- throws IOException {
+ throws IOException, ServletException {
String msg = HttpStatus.getMessage(response.getStatus());
request.setAttribute(RequestDispatcher.ERROR_MESSAGE, msg);
super.handle(target, baseRequest, request, response);
diff --git a/parent/pom.xml b/parent/pom.xml
index e76cb071..ade56a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -312,7 +312,7 @@
<jcr-version>2.0</jcr-version>
<jedis-client-version>3.1.0</jedis-client-version>
<jersey-version>2.28</jersey-version>
- <jetty9-version>9.4.22.v20191022</jetty9-version>
+ <jetty9-version>9.4.29.v20200521</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>