This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.25.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9f0fb9617daade99741f89b688cdbf064272639e Author: Claus Ibsen <[email protected]> AuthorDate: Tue May 18 09:57:41 2021 +0200 Upgrade 3rd party dependencies for various most use libraries. --- .../camel/component/jetty/JettyHttpComponent.java | 3 +- parent/pom.xml | 2 +- .../components-starter/camel-ahc-starter/pom.xml | 12 +++++ .../camel-ahc-ws-starter/pom.xml | 12 +++++ .../components-starter/camel-hl7-starter/pom.xml | 12 +++++ .../camel-netty4-http-starter/pom.xml | 12 +++++ .../camel-netty4-starter/pom.xml | 12 +++++ .../camel-syslog-starter/pom.xml | 12 +++++ .../camel-spring-boot-dependencies/pom.xml | 56 +++++++++++----------- 9 files changed, 103 insertions(+), 30 deletions(-) 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 9b5932e..35d7ae2 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; @@ -1469,7 +1470,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); if (response instanceof Response) { diff --git a/parent/pom.xml b/parent/pom.xml index a3c86ac..35602a3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -382,7 +382,7 @@ <jedis-client-bundle-version>2.9.0_1</jedis-client-bundle-version> <jersey-version>2.11</jersey-version> <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> - <jetty9-version>9.4.41.v20210516</jetty9-version> + <jetty9-version>9.4.33.v20201020</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> diff --git a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml index 5cc2406..fc38a35 100644 --- a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-ahc</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml index c8987cf..0e50029 100644 --- a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-ahc-ws</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml index 8c817b6..8795e66 100644 --- a/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-hl7</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml index f436887..3058f85 100644 --- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-netty4-http</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!-- Test dependencies --> <dependency> diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml index 12fd2b4..b3455e7 100644 --- a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-netty4</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml b/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml index 17e6b5f..01f15e2 100644 --- a/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-syslog</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index f29f400..2dcea61 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3226,142 +3226,142 @@ <dependency> <groupId>org.apache.cxf.services.sts</groupId> <artifactId>cxf-services-sts-core</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf.services.ws-discovery</groupId> <artifactId>cxf-services-ws-discovery-api</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-core</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-xml</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-features-clustering</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-features-logging</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-simple</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-management</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-oauth2</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-service-description-swagger</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-jms</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-local</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-addr</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-mex</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security-oauth2</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-wsdl</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-testutils</artifactId> - <version>3.3.6</version> + <version>3.3.10</version> </dependency> <dependency> <groupId>org.apache.ftpserver</groupId>
