This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 04fc852476ce8e68e64ef7fdcfa584bf86e6716e Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jan 16 09:58:18 2023 +0100 Migrate to Camel v4 --- .../camel/spring/boot/CamelSpringBootApplicationController.java | 3 +-- .../boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java | 3 +-- .../spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java | 3 +-- .../boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java | 3 +-- .../java/org/apache/camel/spring/boot/issues/RestDslPostTest.java | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java index 060006d383b..a912b42bdab 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java @@ -16,8 +16,7 @@ */ package org.apache.camel.spring.boot; -import javax.annotation.PreDestroy; - +import jakarta.annotation.PreDestroy; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.main.Main; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java index e931b6ee826..733ec4163b9 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java @@ -19,8 +19,7 @@ package org.apache.camel.spring.boot.cloud; import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; - +import jakarta.annotation.PostConstruct; import org.apache.camel.CamelContext; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.cloud.ServiceDiscovery; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java index 04fdd63f6a8..a1380d2cd1b 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java @@ -20,8 +20,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; - +import jakarta.annotation.PostConstruct; import org.apache.camel.CamelContext; import org.apache.camel.impl.cloud.BlacklistServiceFilter; import org.apache.camel.impl.cloud.DefaultServiceDefinition; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java index 0f833adfb6d..fe8ac0c718d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java @@ -16,8 +16,7 @@ */ package org.apache.camel.spring.boot; -import javax.annotation.PostConstruct; - +import jakarta.annotation.PostConstruct; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java index 18e3799db0b..84c516a1ab2 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java @@ -24,6 +24,7 @@ import org.apache.camel.builder.ExchangeBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.rest.RestBindingMode; +import org.apache.camel.test.AvailablePortFinder; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -33,14 +34,13 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.springframework.util.SocketUtils; @CamelSpringBootTest @EnableAutoConfiguration @SpringBootTest public class RestDslPostTest { - static final int PORT = SocketUtils.findAvailableTcpPort(20000); + static final int PORT = AvailablePortFinder.getNextAvailable(20000, 30000); @EndpointInject("mock:user") protected MockEndpoint resultEndpointUser;
