Archetypes should use junit6

Author: cunningt

archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml

@@ -85,7 +85,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring-junit5</artifactId>
+      <artifactId>camel-test-spring-junit6</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/test/java/MySpringBootApplicationTest.java

@@ -20,7 +20,7 @@
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.AdviceWith;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.apache.camel.test.spring.junit6.CamelSpringBootTest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;

components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/customizer/UndertowAccessLogConfiguration.java

@@ -20,14 +20,14 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+//import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
-import io.undertow.server.handlers.accesslog.AccessLogHandler;
-import io.undertow.server.handlers.accesslog.JBossLoggingAccessLogReceiver;
+//import io.undertow.server.handlers.accesslog.AccessLogHandler;
+//import io.undertow.server.handlers.accesslog.JBossLoggingAccessLogReceiver;
 
 /**
  * Undertow specific configuration to use camel logging for HTTP access log.
@@ -40,22 +40,4 @@
     @ConditionalOnProperty(name = "camel.component.platform-http.server.accesslog.undertow.use-camel-logging", havingValue = "true"),
 })
 public class UndertowAccessLogConfiguration {
-
-    @Bean
-    WebServerFactoryCustomizer<UndertowServletWebServerFactory> undertowManagementAccessLogCustomizer(Environment env) {
-        return new WebServerFactoryCustomizer<UndertowServletWebServerFactory>() {
-            @Override
-            public void customize(UndertowServletWebServerFactory factory) {
-                factory.addDeploymentInfoCustomizers(deploymentInfo -> {
-                    deploymentInfo.addInitialHandlerChainWrapper(handler -> {
-                        JBossLoggingAccessLogReceiver jbossLogReceiver = new JBossLoggingAccessLogReceiver();
-                        // undertow specific HTTP log message pattern
-                        // https://github.com/undertow-io/undertow/blob/2.3.22.Final/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogHandler.java
-                        String pattern = env.getProperty("server.undertow.accesslog.pattern", "common");
-                        return new AccessLogHandler(handler, jbossLogReceiver, pattern, getClass().getClassLoader());
-                    });
-                });
-            }
-        };
-    }
 }

tooling/camel-spring-boot-dependencies/pom.xml

@@ -225,37 +225,37 @@
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-commons</artifactId>
-        <version>1.15.6</version>
+        <version>1.16.2</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-observation</artifactId>
-        <version>1.15.6</version>
+        <version>1.16.2</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-registry-jmx</artifactId>
-        <version>1.15.6</version>
+        <version>1.16.2</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-registry-prometheus</artifactId>
-        <version>1.15.6</version>
+        <version>1.16.2</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-tracing</artifactId>
-        <version>1.5.5</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-tracing-bridge-otel</artifactId>
-        <version>1.5.5</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-tracing-test</artifactId>
-        <version>1.5.5</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>net.bytebuddy</groupId>
@@ -4644,6 +4644,11 @@
         <artifactId>camel-tensorflow-serving</artifactId>
         <version>4.18.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-test</artifactId>
+        <version>4.18.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-test-junit5</artifactId>