This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 11bf67acec302d73414330a32fe89ef03df5c9a6 Author: Croway <[email protected]> AuthorDate: Mon Feb 2 12:20:19 2026 +0100 Remove jetty optional dependency since it was breaking tests, jetty was used instead of tomcat by mistake --- core/camel-spring-boot/pom.xml | 7 ---- .../src/main/docs/spring-boot.adoc | 12 ------- .../JettyManagementAccessLogCustomizer.java | 40 ---------------------- .../ManagementAccessLogConfiguration.java | 13 ------- 4 files changed, 72 deletions(-) diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml index 722faa8b40a..9a5e37ab9db 100644 --- a/core/camel-spring-boot/pom.xml +++ b/core/camel-spring-boot/pom.xml @@ -75,13 +75,6 @@ <version>${spring-boot-version}</version> <optional>true</optional> </dependency> - <!-- Optional Jetty support for management access log configuration --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-jetty</artifactId> - <version>${spring-boot-version}</version> - <optional>true</optional> - </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.adoc b/core/camel-spring-boot/src/main/docs/spring-boot.adoc index 8e812b0e9dd..d73c825ce68 100644 --- a/core/camel-spring-boot/src/main/docs/spring-boot.adoc +++ b/core/camel-spring-boot/src/main/docs/spring-boot.adoc @@ -487,18 +487,6 @@ management.server.accesslog.enabled=false Result: Main app logs to `logs/access_log.log`, actuator has no access logs. -=== Jetty - -[source,properties] ----- -server.jetty.accesslog.enabled=true -server.jetty.accesslog.filename=./target/logs/jetty_access.log -management.server.port=9090 -management.server.accesslog.enabled=false ----- - -Result: Main app logs to `./target/logs/jetty_access.log`, actuator has no access logs. - == Virtual Threads Support Camel Spring Boot provides comprehensive support for JDK 21+ Virtual Threads, offering significant performance improvements for I/O-intensive applications. Virtual threads are lightweight threads that can dramatically reduce memory overhead and improve scalability compared to traditional platform threads. diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/JettyManagementAccessLogCustomizer.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/JettyManagementAccessLogCustomizer.java deleted file mode 100644 index 4b4f97cc1d8..00000000000 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/JettyManagementAccessLogCustomizer.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.spring.boot.actuate.accesslog; - -import org.eclipse.jetty.server.Server; -import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; - -/** - * Jetty-specific customizer to disable access logging in the management context. - * <p> - * This class is separated from the main configuration to avoid class loading issues when Jetty is not on the classpath. - * It is only instantiated when Jetty classes are available. - * </p> - */ -public class JettyManagementAccessLogCustomizer implements WebServerFactoryCustomizer<JettyServletWebServerFactory> { - - @Override - public void customize(JettyServletWebServerFactory factory) { - factory.addServerCustomizers(this::disableAccessLog); - } - - private void disableAccessLog(Server server) { - server.setRequestLog(null); - } -} diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/ManagementAccessLogConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/ManagementAccessLogConfiguration.java index 31ad35f8f41..8cf6231a380 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/ManagementAccessLogConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/accesslog/ManagementAccessLogConfiguration.java @@ -68,17 +68,4 @@ public class ManagementAccessLogConfiguration { } } - /** - * Jetty-specific configuration to disable access logging in the management context. - */ - @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(name = "org.eclipse.jetty.server.Server") - @ConditionalOnProperty(name = "management.server.accesslog.enabled", havingValue = "false") - static class JettyAccessLogCustomizerConfiguration { - - @Bean - JettyManagementAccessLogCustomizer jettyManagementAccessLogCustomizer() { - return new JettyManagementAccessLogCustomizer(); - } - } }
