diff --git a/activemq/pom.xml b/activemq/pom.xml index c1fcea3d1..2ad94ad71 100644 --- a/activemq/pom.xml +++ b/activemq/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-activemq @@ -68,7 +68,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -92,7 +92,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/activemq/readme.adoc b/activemq/readme.adoc index 73a978e75..240044441 100644 --- a/activemq/readme.adoc +++ b/activemq/readme.adoc @@ -4,19 +4,11 @@ This example shows how to work with a simple Apache Camel application using Spri In contrast to the amqp example in this repo, it uses ActiveMQs openwire protocol and the camel-activemq component. -=== Preparing ActiveMQ brokers - -From Apache ActiveMQ you can download the broker as a `.zip` or `.tar.gz` file. - -Unzip/tar the archive, and start a terminal. - -Change directory to the unzipped directory and start the broker. - - bin/activemq console +=== How to run the example -Which runs the broker in the foreground and logs to the console. +You need a running ActiveMQ broker. You can use the Camel CLI to start an Artemis broker: -=== How to run the example + camel infra run artemis You can run this example using diff --git a/activemq/src/main/java/sample/camel/SampleAmqApplication.java b/activemq/src/main/java/sample/camel/SampleAmqApplication.java index b1f0676ff..796f3f57b 100644 --- a/activemq/src/main/java/sample/camel/SampleAmqApplication.java +++ b/activemq/src/main/java/sample/camel/SampleAmqApplication.java @@ -17,17 +17,15 @@ package sample.camel; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration; +import org.springframework.boot.activemq.autoconfigure.ActiveMQAutoConfiguration; /* Disable ActiveMQAutoConfiguration to prevent Spring Boot from creating a default ConnectionFactory. This allows us to configure our own ConnectionFactory via camel.component.activemq properties in application.properties. */ -@SpringBootApplication -@EnableAutoConfiguration(exclude = {ActiveMQAutoConfiguration.class}) +@SpringBootApplication(exclude = {ActiveMQAutoConfiguration.class}) public class SampleAmqApplication { public static void main(String[] args) { diff --git a/activemq/src/main/resources/application.properties b/activemq/src/main/resources/application.properties index a66be4a32..208a7668f 100644 --- a/activemq/src/main/resources/application.properties +++ b/activemq/src/main/resources/application.properties @@ -28,8 +28,8 @@ camel.main.run-controller = true # camel-activemq config camel.component.activemq.broker-url=tcp://localhost:61616 -camel.component.activemq.username=admin -camel.component.activemq.password=admin +camel.component.activemq.username=artemis +camel.component.activemq.password=artemis camel.component.activemq.use-pooled-connection=true camel.component.activemq.use-single-connection=false camel.component.activemq.cache-level-name=CACHE_CONSUMER diff --git a/activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java b/activemq/src/test/java/sample/camel/SampleAmqApplicationTest.java similarity index 93% rename from activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java rename to activemq/src/test/java/sample/camel/SampleAmqApplicationTest.java index 6200ce13f..e114fd020 100644 --- a/activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java +++ b/activemq/src/test/java/sample/camel/SampleAmqApplicationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Disabled; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = SampleAmqApplication.class) -public class SampleAmqApplicationTests { +public class SampleAmqApplicationTest { @Autowired private CamelContext camelContext; diff --git a/actuator-http-metrics/pom.xml b/actuator-http-metrics/pom.xml index 58a21e723..eef6070f1 100644 --- a/actuator-http-metrics/pom.xml +++ b/actuator-http-metrics/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-actuator-http-metrics @@ -62,7 +62,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/actuator-http-metrics/src/main/resources/application.properties b/actuator-http-metrics/src/main/resources/application.properties index 5c375a03a..4fb5d7bb4 100644 --- a/actuator-http-metrics/src/main/resources/application.properties +++ b/actuator-http-metrics/src/main/resources/application.properties @@ -24,7 +24,7 @@ logging.level.org.apache.camel.impl.health = DEBUG logging.level.sample.camel = DEBUG # enable the shutdown endpoint -management.endpoint.shutdown.enabled=true +management.endpoint.shutdown.access=read-only # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=mappings,metrics,shutdown diff --git a/ai-agent/pom.xml b/ai-agent/pom.xml index 9d8bd36ce..1bc93f9bd 100644 --- a/ai-agent/pom.xml +++ b/ai-agent/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-ai-agent @@ -36,7 +36,7 @@ UTF-8 UTF-8 - 1.1.0 + 2.0.0-M2 @@ -120,7 +120,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/amqp/pom.xml b/amqp/pom.xml index 68fc0db46..0a4536c65 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-amqp @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -91,7 +91,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/amqp/readme.adoc b/amqp/readme.adoc index 50fba311d..66938fb61 100644 --- a/amqp/readme.adoc +++ b/amqp/readme.adoc @@ -2,19 +2,11 @@ This example shows how to work with a simple Apache Camel application using Spring Boot and Apache ActiveMQ. -=== Preparing ActiveMQ brokers - -From Apache ActiveMQ you can download the broker as a `.zip` or `.tar.gz` file. - -Unzip/tar the archive, and start a terminal. - -Change directory to the unzipped directory and start the broker. - - bin/activemq console +=== How to run the example -Which runs the broker in the foreground and logs to the console. +You need a running ActiveMQ broker. You can use the Camel CLI to start an Artemis broker: -=== How to run the example + camel infra run artemis You can run this example using diff --git a/amqp/src/main/resources/application.properties b/amqp/src/main/resources/application.properties index 52951b7b2..a8f7287ba 100644 --- a/amqp/src/main/resources/application.properties +++ b/amqp/src/main/resources/application.properties @@ -19,14 +19,14 @@ camel.main.run-controller = true # JMS ConnectionFactory configuration AMQP_REMOTE_URI=amqp://localhost:5672 -AMQP_SERVICE_USERNAME=admin -AMQP_SERVICE_PASSWORD=admin +AMQP_SERVICE_USERNAME=artemis +AMQP_SERVICE_PASSWORD=artemis # Camel AMQP config # username and password configured here will overwrite the ones # configured directly on the JMS ConnectionFactory -camel.component.amqp.password=admin -camel.component.amqp.username=admin +camel.component.amqp.password=artemis +camel.component.amqp.username=artemis camel.component.amqp.cache-level-name = CACHE_CONSUMER camel.component.amqp.connection-pooling=true camel.component.amqp.jms-max-connections=1 diff --git a/amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java b/amqp/src/test/java/sample/camel/SampleAmqApplicationTest.java similarity index 93% rename from amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java rename to amqp/src/test/java/sample/camel/SampleAmqApplicationTest.java index 56b5a8046..f52c94163 100644 --- a/amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java +++ b/amqp/src/test/java/sample/camel/SampleAmqApplicationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Disabled; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = SampleAmqApplication.class) -public class SampleAmqApplicationTests { +public class SampleAmqApplicationTest { @Autowired private CamelContext camelContext; diff --git a/aot-basic/pom.xml b/aot-basic/pom.xml index f5d177f86..0fe2d2d1e 100644 --- a/aot-basic/pom.xml +++ b/aot-basic/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-aot-basic diff --git a/aot-basic/src/main/java/sample/camel/MyBean.java b/aot-basic/src/main/java/sample/camel/MyBean.java index 063063040..42872ef21 100644 --- a/aot-basic/src/main/java/sample/camel/MyBean.java +++ b/aot-basic/src/main/java/sample/camel/MyBean.java @@ -36,7 +36,7 @@ public class MyBean { @Reflective public String saySomething() { - return String.format("%s I am invoked %d times", say, ++counter); + return "%s I am invoked %d times".formatted(say, ++counter); } } diff --git a/arangodb/README.adoc b/arangodb/README.adoc index bc709722d..acf7b8cec 100644 --- a/arangodb/README.adoc +++ b/arangodb/README.adoc @@ -15,29 +15,15 @@ You can build this example using: You can run this example following these steps using: -Run an instance of ArangoDB with the root and password given in application.properties file. Example using the docker image : +Start an ArangoDB instance using the Camel CLI: - $ docker run -p 8529:8529 -e ARANGO_ROOT_PASSWORD=openSesame arangodb:latest - -Execute arangosh in your server. Example with the docker image ( set "openSesame" as password) - - $ docker exec -it arangosh --server.username "root" - -Create the database "myDb" - - $ db._createDatabase("myDb") - -Create the collection "foo" - - $ db._useDatabase("myDb") - - $ db._create("foo") + $ camel infra run arangodb Run the app $ mvn spring-boot:run -And you should see output in the console. You can also see the document created in the foo collection. +And you should see output in the console. You can also see the document created in the myCollection collection. === Help and contributions diff --git a/arangodb/pom.xml b/arangodb/pom.xml index caebebb78..363d12072 100644 --- a/arangodb/pom.xml +++ b/arangodb/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-arangodb diff --git a/arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java b/arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java index ed58b37be..a6933b088 100644 --- a/arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java +++ b/arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java @@ -28,10 +28,10 @@ public void configure() throws Exception { from("timer://foo?period=10000&repeatCount=1") .bean(MyBeanService.class, "createDocument") - .to("arangodb:myDb?operation=SAVE_DOCUMENT") + .to("arangodb:myDatabase?operation=SAVE_DOCUMENT") .bean(MyBeanService.class, "readDocument") .setHeader(ArangoDbConstants.RESULT_CLASS_TYPE).constant(String.class) - .to("arangodb:myDb?operation=FIND_DOCUMENT_BY_KEY") + .to("arangodb:myDatabase?operation=FIND_DOCUMENT_BY_KEY") .log("Received body: ${body}"); } } diff --git a/arangodb/src/main/resources/application.properties b/arangodb/src/main/resources/application.properties index 3330a94bd..b20fe70e9 100644 --- a/arangodb/src/main/resources/application.properties +++ b/arangodb/src/main/resources/application.properties @@ -16,8 +16,8 @@ ## --------------------------------------------------------------------------- camel.main.name=ArangoDB camel.main.run-controller=true -camel.component.arangodb.documentCollection=foo +camel.component.arangodb.documentCollection=myCollection camel.component.arangodb.user=root -camel.component.arangodb.password=openSesame +camel.component.arangodb.password=password diff --git a/artemis/pom.xml b/artemis/pom.xml index 33fd8a692..5b2f48fb6 100644 --- a/artemis/pom.xml +++ b/artemis/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-artemis @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -104,7 +104,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/artemis/readme.adoc b/artemis/readme.adoc index 21fb33ca3..f73dffe12 100644 --- a/artemis/readme.adoc +++ b/artemis/readme.adoc @@ -4,6 +4,10 @@ This example shows how to work with a simple Apache Camel application using Spri === How to run the example +This example uses an embedded Artemis broker by default. Alternatively, you can start an external Artemis broker using the Camel CLI: + + camel infra run artemis + You can run this example using mvn spring-boot:run diff --git a/artemis/src/main/resources/application.properties b/artemis/src/main/resources/application.properties index 3858b7fde..0eef41034 100644 --- a/artemis/src/main/resources/application.properties +++ b/artemis/src/main/resources/application.properties @@ -19,7 +19,7 @@ camel.main.run-controller = true #spring.artemis.mode=native spring.artemis.mode=embedded -spring.artemis.host=localhost +spring.artemis.broker-url=localhost spring.artemis.port=61616 spring.artemis.user=test spring.artemis.password=test diff --git a/artemis/src/test/java/sample/camel/SampleAmqApplicationTests.java b/artemis/src/test/java/sample/camel/SampleAmqApplicationTest.java similarity index 93% rename from artemis/src/test/java/sample/camel/SampleAmqApplicationTests.java rename to artemis/src/test/java/sample/camel/SampleAmqApplicationTest.java index 968929207..e5f043280 100644 --- a/artemis/src/test/java/sample/camel/SampleAmqApplicationTests.java +++ b/artemis/src/test/java/sample/camel/SampleAmqApplicationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; @@ -28,7 +28,7 @@ @CamelSpringBootTest @SpringBootTest(classes = SampleAmqApplication.class) -public class SampleAmqApplicationTests { +public class SampleAmqApplicationTest { @Autowired private CamelContext camelContext; diff --git a/aws-secrets-manager/pom.xml b/aws-secrets-manager/pom.xml index ed788fc42..358061d2d 100644 --- a/aws-secrets-manager/pom.xml +++ b/aws-secrets-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-aws-secrets-manager diff --git a/aws2-s3/pom.xml b/aws2-s3/pom.xml index 1f811602d..0436926a4 100644 --- a/aws2-s3/pom.xml +++ b/aws2-s3/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-aws2-s3 diff --git a/azure/camel-example-spring-boot-azure-eventhubs/pom.xml b/azure/camel-example-spring-boot-azure-eventhubs/pom.xml index 50d4d7875..cde62c051 100644 --- a/azure/camel-example-spring-boot-azure-eventhubs/pom.xml +++ b/azure/camel-example-spring-boot-azure-eventhubs/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-azure - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-azure-eventhubs diff --git a/azure/camel-example-spring-boot-azure-servicebus/pom.xml b/azure/camel-example-spring-boot-azure-servicebus/pom.xml index 8eac9bf05..d99b4eb32 100644 --- a/azure/camel-example-spring-boot-azure-servicebus/pom.xml +++ b/azure/camel-example-spring-boot-azure-servicebus/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-azure - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-azure-servicebus diff --git a/azure/pom.xml b/azure/pom.xml index 760f36b89..89aa9eefe 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-azure diff --git a/docling/pom.xml b/docling/pom.xml index 1494a2421..c9f0309dd 100644 --- a/docling/pom.xml +++ b/docling/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-docling @@ -88,7 +88,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/endpointdsl/pom.xml b/endpointdsl/pom.xml index ee6cd1f8e..8a940f0e4 100644 --- a/endpointdsl/pom.xml +++ b/endpointdsl/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-endpointdsl @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -93,7 +93,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/endpointdsl/src/main/java/sample/camel/MyBean.java b/endpointdsl/src/main/java/sample/camel/MyBean.java index 45b9aa8f9..6acb553f6 100644 --- a/endpointdsl/src/main/java/sample/camel/MyBean.java +++ b/endpointdsl/src/main/java/sample/camel/MyBean.java @@ -34,7 +34,7 @@ public class MyBean { private String say; public String saySomething(String body) { - return String.format("%s I am invoked %d times", say, ++counter); + return "%s I am invoked %d times".formatted(say, ++counter); } } diff --git a/routes-configuration/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/endpointdsl/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 93% rename from routes-configuration/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to endpointdsl/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 21c7a2a71..356fbbf5f 100644 --- a/routes-configuration/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/endpointdsl/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/fhir-auth-tx/pom.xml b/fhir-auth-tx/pom.xml index 3aabe36e1..7c7a8aff6 100644 --- a/fhir-auth-tx/pom.xml +++ b/fhir-auth-tx/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-fhir-auth-tx @@ -70,7 +70,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -82,9 +82,19 @@ org.apache.camel.springboot camel-spring-boot-starter + + org.apache.httpcomponents.client5 + httpclient5 + org.apache.camel.springboot camel-fhir-starter + + + junit + junit + + org.apache.camel.springboot @@ -104,7 +114,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -112,11 +122,6 @@ camel-management-starter test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java b/fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java index 84568b217..c3965bbe1 100644 --- a/fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java +++ b/fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java @@ -21,7 +21,7 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; -import org.apache.http.ProtocolException; +import org.apache.hc.core5.http.ProtocolException; import org.hl7.fhir.dstu3.model.Bundle; import org.hl7.fhir.dstu3.model.Identifier; diff --git a/fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java b/fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java index e3726be1b..666297107 100644 --- a/fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java +++ b/fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java @@ -20,8 +20,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.MockEndpointsAndSkip; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.MockEndpointsAndSkip; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/fhir/pom.xml b/fhir/pom.xml index baab77c92..f614c3b68 100644 --- a/fhir/pom.xml +++ b/fhir/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-fhir @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -76,9 +76,19 @@ org.apache.camel.springboot camel-spring-boot-starter + + org.apache.httpcomponents.client5 + httpclient5 + org.apache.camel.springboot camel-fhir-starter + + + junit + junit + + org.apache.camel.springboot @@ -98,7 +108,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -106,11 +116,6 @@ camel-management-starter test - - org.junit.vintage - junit-vintage-engine - test - org.apache.camel diff --git a/fhir/src/main/java/sample/camel/MyCamelRouter.java b/fhir/src/main/java/sample/camel/MyCamelRouter.java index 35af825a0..126716db0 100644 --- a/fhir/src/main/java/sample/camel/MyCamelRouter.java +++ b/fhir/src/main/java/sample/camel/MyCamelRouter.java @@ -21,7 +21,7 @@ import ca.uhn.hl7v2.model.v24.segment.PID; import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; -import org.apache.http.ProtocolException; +import org.apache.hc.core5.http.ProtocolException; import org.hl7.fhir.r4.model.Patient; import org.springframework.stereotype.Component; diff --git a/fhir/src/test/java/sample/camel/MyCamelApplicationTest.java b/fhir/src/test/java/sample/camel/MyCamelApplicationTest.java index ae63fde85..856c3cac3 100644 --- a/fhir/src/test/java/sample/camel/MyCamelApplicationTest.java +++ b/fhir/src/test/java/sample/camel/MyCamelApplicationTest.java @@ -25,7 +25,7 @@ import org.apache.camel.spring.boot.CamelContextConfiguration; import org.apache.camel.test.infra.fhir.services.FhirService; import org.apache.camel.test.infra.fhir.services.FhirServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.commons.io.FileUtils; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Assertions; @@ -34,10 +34,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; @CamelSpringBootTest +@Configuration @SpringBootTest(classes = {MyCamelApplication.class, MyCamelApplicationTest.class}, - properties = "input = target/work/fhir/testinput") + properties = "input = target/work/fhir/testinput") public class MyCamelApplicationTest { @RegisterExtension diff --git a/fhir/src/test/java/sample/camel/MyCamelTestRouter.java b/fhir/src/test/java/sample/camel/MyCamelTestRouter.java index 227482a71..90edd0082 100644 --- a/fhir/src/test/java/sample/camel/MyCamelTestRouter.java +++ b/fhir/src/test/java/sample/camel/MyCamelTestRouter.java @@ -17,6 +17,7 @@ package sample.camel; import org.apache.camel.builder.RouteBuilder; +import org.hl7.fhir.r4.model.Bundle; import org.springframework.stereotype.Component; @@ -26,7 +27,11 @@ public class MyCamelTestRouter extends RouteBuilder { @Override public void configure() throws Exception { from("direct:start") - .to("fhir://read/resourceById?resourceClass=Patient&stringId=1&serverUrl={{serverUrl}}&fhirVersion={{fhirVersion}}") + .to("fhir://search/searchByUrl?url=Patient&serverUrl={{serverUrl}}&fhirVersion={{fhirVersion}}") + .process(exchange -> { + Bundle bundle = exchange.getIn().getBody(Bundle.class); + exchange.getIn().setBody(bundle.getEntry().get(0).getResource()); + }) .to("mock:result"); } } diff --git a/groovy/pom.xml b/groovy/pom.xml index 28a65ad9f..20024cb43 100644 --- a/groovy/pom.xml +++ b/groovy/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-groovy diff --git a/health-checks/pom.xml b/health-checks/pom.xml index f9ffd6770..a28623aad 100644 --- a/health-checks/pom.xml +++ b/health-checks/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-health-checks @@ -63,7 +63,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/health-checks/src/main/resources/application.properties b/health-checks/src/main/resources/application.properties index 056681340..a25726ef5 100644 --- a/health-checks/src/main/resources/application.properties +++ b/health-checks/src/main/resources/application.properties @@ -26,7 +26,7 @@ logging.level.sample.camel = DEBUG # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=health # expose liveness/readiness probes -management.health.probes.enabled=true +management.endpoint.health.probes.enabled=true management.health.livenessState.enabled=true management.health.readinessState.enabled=true diff --git a/http-ssl/pom.xml b/http-ssl/pom.xml index 838cc715e..e6cf00d1a 100644 --- a/http-ssl/pom.xml +++ b/http-ssl/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-http-ssl diff --git a/http-ssl/ssl-camel-server/pom.xml b/http-ssl/ssl-camel-server/pom.xml index 4b0b57ef2..6cd5b326d 100644 --- a/http-ssl/ssl-camel-server/pom.xml +++ b/http-ssl/ssl-camel-server/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-ssl - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-http-ssl-camel-server diff --git a/http-ssl/ssl-client/pom.xml b/http-ssl/ssl-client/pom.xml index 584084b18..e2da672d3 100644 --- a/http-ssl/ssl-client/pom.xml +++ b/http-ssl/ssl-client/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-ssl - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-http-ssl-client @@ -44,7 +44,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/http-ssl/ssl-client/src/main/resources/application.properties b/http-ssl/ssl-client/src/main/resources/application.properties index 1555b93c1..4b3958346 100644 --- a/http-ssl/ssl-client/src/main/resources/application.properties +++ b/http-ssl/ssl-client/src/main/resources/application.properties @@ -20,7 +20,7 @@ camel.main.name=ssl-client camel.component.http.use-global-ssl-context-parameters=true management.endpoint.camelroutes.enabled=true management.endpoint.camelroutes.read-only=true -management.endpoint.health.enabled=true +management.endpoint.health.access=read-only management.endpoints.web.exposure.include=info,health,camelroutes keystore-password=pass123 logging.level.org.apache.camel.support.jsse=TRACE diff --git a/http-ssl/ssl-server/pom.xml b/http-ssl/ssl-server/pom.xml index 451c9d581..ae4a2ba8a 100644 --- a/http-ssl/ssl-server/pom.xml +++ b/http-ssl/ssl-server/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-ssl - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-http-ssl-server @@ -44,7 +44,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/http-ssl/ssl-server/src/main/resources/application.properties b/http-ssl/ssl-server/src/main/resources/application.properties index fa6fa7f6e..dcb3886d4 100644 --- a/http-ssl/ssl-server/src/main/resources/application.properties +++ b/http-ssl/ssl-server/src/main/resources/application.properties @@ -19,7 +19,7 @@ spring.profiles.active = ${sbProfile} camel.main.name=ssl-server management.endpoint.camelroutes.enabled=true management.endpoint.camelroutes.read-only=true -management.endpoint.health.enabled=true +management.endpoint.health.access=read-only management.endpoints.web.exposure.include=info,health,camelroutes server.port=8443 server.ssl.bundle=server diff --git a/http-streaming/download/backend-server/pom.xml b/http-streaming/download/backend-server/pom.xml index 389055d35..60e029b20 100644 --- a/http-streaming/download/backend-server/pom.xml +++ b/http-streaming/download/backend-server/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-streaming - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT ../../pom.xml diff --git a/http-streaming/download/proxy-server/pom.xml b/http-streaming/download/proxy-server/pom.xml index 91f85abfe..3df26c8e6 100644 --- a/http-streaming/download/proxy-server/pom.xml +++ b/http-streaming/download/proxy-server/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-streaming - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT ../../pom.xml diff --git a/http-streaming/pom.xml b/http-streaming/pom.xml index 8c5875b8d..1274b0cc1 100644 --- a/http-streaming/pom.xml +++ b/http-streaming/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-http-streaming diff --git a/http-streaming/upload/backend-server/pom.xml b/http-streaming/upload/backend-server/pom.xml index d7d4c2c24..823ae4f48 100644 --- a/http-streaming/upload/backend-server/pom.xml +++ b/http-streaming/upload/backend-server/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-streaming - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT ../../pom.xml diff --git a/http-streaming/upload/proxy-server/pom.xml b/http-streaming/upload/proxy-server/pom.xml index dab3bf0f7..7d4f56a04 100644 --- a/http-streaming/upload/proxy-server/pom.xml +++ b/http-streaming/upload/proxy-server/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-http-streaming - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT ../../pom.xml diff --git a/infinispan/README.adoc b/infinispan/README.adoc index 54f2e7143..acd5b34ff 100644 --- a/infinispan/README.adoc +++ b/infinispan/README.adoc @@ -13,9 +13,9 @@ You can build this example using: === Run -Start Infinispan container in a separate terminal: +Start an Infinispan server using the Camel CLI: - $ docker run --rm -e USER=admin -e PASS=password -p 11222:11222 -v $PWD/src/test/resources:/user-config/ quay.io/infinispan/server:15.0.5.Final -c /user-config/infinispan.xml + $ camel infra run infinispan You can run this example using: diff --git a/infinispan/pom.xml b/infinispan/pom.xml index cc7212dc9..dd8e3bd88 100644 --- a/infinispan/pom.xml +++ b/infinispan/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-infinispan @@ -80,13 +80,7 @@ org.apache.camel - camel-test-junit5 - ${camel-version} - test - - - org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/infinispan/src/test/java/org/apache/camel/example/springboot/infinispan/ApplicationTest.java b/infinispan/src/test/java/org/apache/camel/example/springboot/infinispan/ApplicationTest.java index 465cefeb7..01a6a7531 100644 --- a/infinispan/src/test/java/org/apache/camel/example/springboot/infinispan/ApplicationTest.java +++ b/infinispan/src/test/java/org/apache/camel/example/springboot/infinispan/ApplicationTest.java @@ -3,7 +3,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; 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.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/jira/pom.xml b/jira/pom.xml index feb180480..a78719072 100644 --- a/jira/pom.xml +++ b/jira/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-jira @@ -60,7 +60,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/jolokia/pom.xml b/jolokia/pom.xml index 00dd48db5..c32e28a95 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -24,7 +24,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-jolokia @@ -63,7 +63,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/jolokia/src/main/resources/application.properties b/jolokia/src/main/resources/application.properties index f4d859e11..c59ba015c 100644 --- a/jolokia/src/main/resources/application.properties +++ b/jolokia/src/main/resources/application.properties @@ -35,7 +35,7 @@ timer.period = 2000 management.endpoints.web.exposure.include=info,health,camelroutes # turn on actuator health check -management.endpoint.health.enabled = true +management.endpoint.health.access = read-only # allow to obtain basic information about camel routes (read only mode) management.endpoint.camelroutes.enabled = true diff --git a/kafka-avro/README.adoc b/kafka-avro/README.adoc index 71c007978..e7cbded29 100644 --- a/kafka-avro/README.adoc +++ b/kafka-avro/README.adoc @@ -33,18 +33,9 @@ $ curl -X DELETE http://localhost:8081/subjects/topic-value/versions/version-no This example requires that Kafka Server is up and running. - $ ${KAFKA}/bin/zookeeper-server-start.sh ${KAFKA}/config/zookeeper.properties - $ ${KAFKA}/bin/kafka-server-start.sh ${KAFKA}/config/server.properties +You can use the Camel CLI to start a Kafka broker: -You will need to create following topics before you run the examples. - -On windows run - - $ ${KAFKA}/bin/kafka-topics.bat --create --zookeeper : --replication-factor 1 --partitions 1 --topic employees-avro - -On linux run - - $ ${KAFKA}/bin/kafka-topics.sh --create --zookeeper : --replication-factor 1 --partitions 1 --topic employees-avro + $ camel infra run kafka === Build diff --git a/kafka-avro/pom.xml b/kafka-avro/pom.xml index e63941146..f180668a0 100644 --- a/kafka-avro/pom.xml +++ b/kafka-avro/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-kafka-avro @@ -77,7 +77,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/kafka-oauth/pom.xml b/kafka-oauth/pom.xml index 523b26aa2..98ec0dbee 100644 --- a/kafka-oauth/pom.xml +++ b/kafka-oauth/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-kafka-oauth @@ -63,7 +63,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/kafka-offsetrepository/README.adoc b/kafka-offsetrepository/README.adoc index d31fbdc71..223e499ee 100644 --- a/kafka-offsetrepository/README.adoc +++ b/kafka-offsetrepository/README.adoc @@ -13,19 +13,9 @@ This project consists of the following examples: This example requires that Kafka Server is up and running. - $ ${KAFKA}/bin/zookeeper-server-start.sh ${KAFKA}/config/zookeeper.properties +You can use the Camel CLI to start a Kafka broker: - $ ${KAFKA}/bin/kafka-server-start.sh ${KAFKA}/config/server.properties - -You will need to create following topics before you run the examples. - -On windows run - - $ ${KAFKA}/bin/kafka-topics.bat --create --zookeeper : --replication-factor 1 --partitions 1 --topic my-topic - -On linux run - - $ ${KAFKA}/bin/kafka-topics.sh --create --zookeeper : --replication-factor 1 --partitions 1 --topic my-topic + $ camel infra run kafka === Build diff --git a/kafka-offsetrepository/pom.xml b/kafka-offsetrepository/pom.xml index c4b96a0e9..9b56b45c3 100644 --- a/kafka-offsetrepository/pom.xml +++ b/kafka-offsetrepository/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-kafka-offsetrepository @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/kafka-offsetrepository/src/main/resources/offsetStateRepo.dat b/kafka-offsetrepository/src/main/resources/offsetStateRepo.dat index 8b1378917..48c0860f0 100644 --- a/kafka-offsetrepository/src/main/resources/offsetStateRepo.dat +++ b/kafka-offsetrepository/src/main/resources/offsetStateRepo.dat @@ -1 +1 @@ - +my-topic/0=41 diff --git a/kafka-sql-transaction/pom.xml b/kafka-sql-transaction/pom.xml index 912926174..3dd67175c 100644 --- a/kafka-sql-transaction/pom.xml +++ b/kafka-sql-transaction/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-kafka-sql-transaction @@ -59,7 +59,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml index 2d184a1f6..44a61a489 100644 --- a/kamelet-chucknorris/pom.xml +++ b/kamelet-chucknorris/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-kamelet-chucknorris @@ -103,7 +103,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/kamelet-chucknorris/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 93% rename from routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to kamelet-chucknorris/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 21c7a2a71..356fbbf5f 100644 --- a/routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/kamelet-chucknorris/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/load-balancer-eip/pom.xml b/load-balancer-eip/pom.xml index e23994378..2b86da78f 100644 --- a/load-balancer-eip/pom.xml +++ b/load-balancer-eip/pom.xml @@ -5,7 +5,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 @@ -66,7 +66,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java b/load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java index 541a86984..a2dcd3fbe 100644 --- a/load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java +++ b/load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; 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.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/mail-ms-exchange-oauth2/pom.xml b/mail-ms-exchange-oauth2/pom.xml index 209600f0b..cd7fe44a2 100644 --- a/mail-ms-exchange-oauth2/pom.xml +++ b/mail-ms-exchange-oauth2/pom.xml @@ -5,7 +5,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 diff --git a/mail-ms-exchange-oauth2/src/main/resources/application.properties b/mail-ms-exchange-oauth2/src/main/resources/application.properties index 785c8c617..a41e5ef80 100644 --- a/mail-ms-exchange-oauth2/src/main/resources/application.properties +++ b/mail-ms-exchange-oauth2/src/main/resources/application.properties @@ -36,7 +36,7 @@ exchange.user= # Milliseconds between two poll. exchange.pollInterval=60000 -# Enable javax.mail verbose output +# Enable jakarta.mail verbose output exchange.debug=false # Delete message after consuming it diff --git a/master/pom.xml b/master/pom.xml index 45352b94b..4776a4afc 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-master @@ -126,7 +126,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/master/src/main/resources/application-file.properties b/master/src/main/resources/application-file.properties index cdb6575c7..d94d699fb 100644 --- a/master/src/main/resources/application-file.properties +++ b/master/src/main/resources/application-file.properties @@ -18,9 +18,9 @@ camel.cluster.file.id = ${node.id} camel.cluster.file.root = ${java.io.tmpdir} -management.endpoints.enabled-by-default = false +management.endpoints.access.default = none management.endpoints.jmx.enabled = false -management.endpoint.health.enabled = true +management.endpoint.health.access = read-only camel.main.jmx-enabled = false diff --git a/metrics/pom.xml b/metrics/pom.xml index ec5b4c128..a6aae44bc 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-metrics @@ -70,7 +70,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc diff --git a/multi-datasource-2pc/pom.xml b/multi-datasource-2pc/pom.xml index f7ad5c73e..703de0da8 100644 --- a/multi-datasource-2pc/pom.xml +++ b/multi-datasource-2pc/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-muti-datasources-2pc @@ -80,10 +80,6 @@ org.apache.camel.springboot camel-spring-boot-starter - - org.apache.camel.springboot - camel-stream-starter - org.apache.camel.springboot camel-spring-jdbc-starter @@ -93,12 +89,12 @@ dev.snowdrop narayana-spring-boot-starter - 3.2.0 + 4.0.0 io.agroal agroal-spring-boot-starter - 2.5 + 3.0 org.postgresql @@ -113,7 +109,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -123,12 +119,14 @@ org.testcontainers - postgresql + testcontainers-postgresql + ${testcontainers-version} test org.testcontainers - junit-jupiter + testcontainers-junit-jupiter + ${testcontainers-version} test diff --git a/multi-datasource-2pc/src/main/java/sample/camel/DataSourcesConfig.java b/multi-datasource-2pc/src/main/java/sample/camel/DataSourcesConfig.java index 7d9a465c0..5e80d1920 100644 --- a/multi-datasource-2pc/src/main/java/sample/camel/DataSourcesConfig.java +++ b/multi-datasource-2pc/src/main/java/sample/camel/DataSourcesConfig.java @@ -1,30 +1,62 @@ +/* + * 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 sample.camel; +import io.agroal.api.security.AgroalSecurityProvider; import io.agroal.springframework.boot.AgroalDataSource; import io.agroal.springframework.boot.AgroalDataSourceAutoConfiguration; import io.agroal.springframework.boot.jndi.AgroalDataSourceJndiBinder; import org.jboss.tm.XAResourceRecoveryRegistry; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.autoconfigure.sql.init.SqlDataSourceScriptDatabaseInitializer; -import org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration; -import org.springframework.boot.autoconfigure.sql.init.SqlInitializationProperties; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.sql.init.DatabaseInitializationSettings; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; import org.springframework.transaction.jta.JtaTransactionManager; import javax.sql.DataSource; +import java.util.Collections; @Configuration public class DataSourcesConfig { + private final ObjectProvider jtaPlatform; + private final ObjectProvider xaResourceRecoveryRegistry; + private final ObjectProvider jndiBinder; + private final ObjectProvider securityProvider; + + public DataSourcesConfig( + ObjectProvider jtaPlatform, + ObjectProvider xaResourceRecoveryRegistry, + ObjectProvider jndiBinder, + ObjectProvider securityProvider) { + this.jtaPlatform = jtaPlatform; + this.xaResourceRecoveryRegistry = xaResourceRecoveryRegistry; + this.jndiBinder = jndiBinder; + this.securityProvider = securityProvider; + } + + private AgroalDataSource createDataSource(DataSourceProperties properties) { + return new AgroalDataSourceAutoConfiguration(jtaPlatform, xaResourceRecoveryRegistry, jndiBinder, securityProvider) + .dataSource(properties, true, false, false, Collections.emptyList(), Collections.emptyList()); + } + // -- first data source config @Bean("ds1properties") @@ -35,14 +67,8 @@ public DataSourceProperties firstDataSourceProperties() { @Bean("ds1") @ConfigurationProperties("app.datasource.ds1.agroal") - public AgroalDataSource firstDataSource( - @Qualifier("ds1properties") DataSourceProperties properties, - JtaTransactionManager jtaPlatform, - XAResourceRecoveryRegistry xaResourceRecoveryRegistry, - ObjectProvider jndiBinder) { - - return new AgroalDataSourceAutoConfiguration(jtaPlatform, xaResourceRecoveryRegistry) - .dataSource(properties, false, false, jndiBinder); + public AgroalDataSource firstDataSource(@Qualifier("ds1properties") DataSourceProperties properties) { + return createDataSource(properties); } @Bean("ds1jdbc") @@ -58,22 +84,10 @@ public DataSourceProperties secondDataSourceProperties() { return new DataSourceProperties(); } - @Bean("ds2init") - @ConfigurationProperties("app.datasource.ds2.sql.init") - public SqlInitializationProperties secondDataSourceInit() { - return new SqlInitializationProperties(); - } - @Bean("ds2") @ConfigurationProperties("app.datasource.ds2.agroal") - public AgroalDataSource secondDataSource( - @Qualifier("ds2properties") DataSourceProperties properties, - JtaTransactionManager jtaPlatform, - XAResourceRecoveryRegistry xaResourceRecoveryRegistry, - ObjectProvider jndiBinder) { - - return new AgroalDataSourceAutoConfiguration(jtaPlatform, xaResourceRecoveryRegistry) - .dataSource(properties, false, false, jndiBinder); + public AgroalDataSource secondDataSource(@Qualifier("ds2properties") DataSourceProperties properties) { + return createDataSource(properties); } @Bean("ds2jdbc") diff --git a/multi-datasource-2pc/src/main/java/sample/camel/MyCamelRouter.java b/multi-datasource-2pc/src/main/java/sample/camel/MyCamelRouter.java index f716392fb..415312f0c 100644 --- a/multi-datasource-2pc/src/main/java/sample/camel/MyCamelRouter.java +++ b/multi-datasource-2pc/src/main/java/sample/camel/MyCamelRouter.java @@ -17,15 +17,8 @@ package sample.camel; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.spring.spi.TransactionErrorHandler; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.print.attribute.standard.MediaSize; -import java.security.SecureRandom; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -61,12 +54,12 @@ public void configure() throws Exception { .delay(simple("{{myPeriod}}")) .to("log:info?showAll=true") .setHeader("name", body()) - // prepare the insert SQL - .setBody(simple("insert into names(name) values('${header.name}')")) + // prepare the insert SQL using named parameters + .setBody(constant("insert into names(name) values(:?name)")) .log("insert into the first database (non-unique)") - .to("spring-jdbc:ds1?resetAutoCommit=false") + .to("spring-jdbc:ds1?resetAutoCommit=false&useHeadersAsParameters=true") .log("insert into the second database (unique)") - .to("spring-jdbc:ds2?resetAutoCommit=false"); + .to("spring-jdbc:ds2?resetAutoCommit=false&useHeadersAsParameters=true"); // route to print inserted names from("timer:query?period={{myPeriod}}") diff --git a/multi-datasource-2pc/src/main/resources/application.properties b/multi-datasource-2pc/src/main/resources/application.properties index 5073f8603..77b39278f 100644 --- a/multi-datasource-2pc/src/main/resources/application.properties +++ b/multi-datasource-2pc/src/main/resources/application.properties @@ -21,9 +21,7 @@ camel.main.name = My2PcCamel myPeriod = 3000 # remove datasource autoconfiguration -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,io.agroal.springframework.boot.AgroalDataSourceAutoConfiguration - -spring.jta=true +spring.autoconfigure.exclude=org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration,io.agroal.springframework.boot.AgroalDataSourceAutoConfiguration # first datasource general configuration app.datasource.ds1.generate-unique-name=false diff --git a/multi-datasource-2pc/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/multi-datasource-2pc/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 83% rename from multi-datasource-2pc/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to multi-datasource-2pc/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 89d417028..54d42962a 100644 --- a/multi-datasource-2pc/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/multi-datasource-2pc/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -22,47 +22,37 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import net.bytebuddy.utility.dispatcher.JavaDispatcher; import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.EnableRouteCoverage; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.EnableRouteCoverage; import org.apache.camel.util.FileUtil; -import org.junit.After; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.testcontainers.context.ImportTestcontainers; import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.jdbc.SqlConfig; -import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; @Testcontainers @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) @EnableRouteCoverage @ActiveProfiles("test") -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Container - static PostgreSQLContainer db1 = new PostgreSQLContainer<>() + static PostgreSQLContainer db1 = new PostgreSQLContainer<>("postgres:16") .withInitScript("schema-ds1.sql") .withDatabaseName("postgres") .withUsername("postgres") @@ -70,7 +60,7 @@ public class MyCamelApplicationJUnit5Test { .withCommand("postgres -c max_prepared_transactions=10"); @Container - static PostgreSQLContainer db2 = new PostgreSQLContainer<>() + static PostgreSQLContainer db2 = new PostgreSQLContainer<>("postgres:16") .withInitScript("schema-ds2.sql") .withDatabaseName("postgres") .withUsername("postgres") diff --git a/observability-services/pom.xml b/observability-services/pom.xml index 9bd840dfc..6fba72133 100644 --- a/observability-services/pom.xml +++ b/observability-services/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-observability-services @@ -67,7 +67,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/observation/README.adoc b/observation/README.adoc index 29a377845..520baa7cc 100644 --- a/observation/README.adoc +++ b/observation/README.adoc @@ -49,7 +49,7 @@ indicate that the service should be traced. $ mvn -f service2/ compile spring-boot:run ---- -When service1 is ready then start service2 +When service2 is ready then start service1 [source,sh] ---- diff --git a/observation/client/pom.xml b/observation/client/pom.xml index 986fb85b8..c3fb7f435 100644 --- a/observation/client/pom.xml +++ b/observation/client/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-observation - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-observation-client diff --git a/observation/client/src/main/resources/META-INF/beans.xml b/observation/client/src/main/resources/META-INF/beans.xml index 4d1f3ebd0..893e57c69 100644 --- a/observation/client/src/main/resources/META-INF/beans.xml +++ b/observation/client/src/main/resources/META-INF/beans.xml @@ -17,4 +17,4 @@ limitations under the License. --> - \ No newline at end of file + \ No newline at end of file diff --git a/observation/loggingtracer/pom.xml b/observation/loggingtracer/pom.xml index 69836fee4..25b19f562 100644 --- a/observation/loggingtracer/pom.xml +++ b/observation/loggingtracer/pom.xml @@ -23,13 +23,14 @@ org.apache.camel.springboot.example camel-example-spring-boot-observation-loggingtracer - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT Camel SB Examples :: Observation :: LoggingTracer An example Observation Tracer 6.0.3 - 1.5.0 + 17 + 1.13.15 diff --git a/observation/pom.xml b/observation/pom.xml index e40f95c91..569b4a100 100644 --- a/observation/pom.xml +++ b/observation/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-observation @@ -110,7 +110,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc io.micrometer diff --git a/observation/service1/pom.xml b/observation/service1/pom.xml index 1e7864315..fd7ae51a7 100644 --- a/observation/service1/pom.xml +++ b/observation/service1/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-observation - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-observation-service1 diff --git a/observation/service2/pom.xml b/observation/service2/pom.xml index a089e8050..c55c8deed 100644 --- a/observation/service2/pom.xml +++ b/observation/service2/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-observation - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-observation-service2 diff --git a/openapi-contract-first/pom.xml b/openapi-contract-first/pom.xml index cfbc252a9..7c600e5dd 100644 --- a/openapi-contract-first/pom.xml +++ b/openapi-contract-first/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-openapi-contract-first @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -120,7 +120,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/opentelemetry/CarBooking/pom.xml b/opentelemetry/CarBooking/pom.xml index b824021e1..2e0fce301 100644 --- a/opentelemetry/CarBooking/pom.xml +++ b/opentelemetry/CarBooking/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-opentelemetry-carbooking @@ -60,7 +60,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/opentelemetry/CarBooking/src/main/resources/application.properties b/opentelemetry/CarBooking/src/main/resources/application.properties index 19706d1b4..48dd1c025 100644 --- a/opentelemetry/CarBooking/src/main/resources/application.properties +++ b/opentelemetry/CarBooking/src/main/resources/application.properties @@ -19,7 +19,7 @@ camel.main.use-mdc-logging = true camel.component.micrometer.enabled=true camel.component.metrics.metric-registry=prometheusMeterRegistry camel.metrics.enable-message-history=true -management.endpoint.metrics.enabled=true +management.endpoint.metrics.access=read-only management.endpoints.web.exposure.include=* spring.application.name=CarBooking server.port=8081 \ No newline at end of file diff --git a/opentelemetry/FlightBooking/src/test/java/com/example/demo/DemoApplicationTests.java b/opentelemetry/CarBooking/src/test/java/com/example/demo/DemoApplicationTest.java similarity index 94% rename from opentelemetry/FlightBooking/src/test/java/com/example/demo/DemoApplicationTests.java rename to opentelemetry/CarBooking/src/test/java/com/example/demo/DemoApplicationTest.java index 9fa3f6603..8c38eb5d0 100644 --- a/opentelemetry/FlightBooking/src/test/java/com/example/demo/DemoApplicationTests.java +++ b/opentelemetry/CarBooking/src/test/java/com/example/demo/DemoApplicationTest.java @@ -20,7 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class DemoApplicationTests { +class DemoApplicationTest { @Test void contextLoads() { diff --git a/opentelemetry/FlightBooking/pom.xml b/opentelemetry/FlightBooking/pom.xml index 5907bf18d..8c1d756c1 100644 --- a/opentelemetry/FlightBooking/pom.xml +++ b/opentelemetry/FlightBooking/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-opentelemetry-flightbooking @@ -62,7 +62,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/opentelemetry/FlightBooking/src/main/resources/application.properties b/opentelemetry/FlightBooking/src/main/resources/application.properties index e593653b6..b23c3ed22 100644 --- a/opentelemetry/FlightBooking/src/main/resources/application.properties +++ b/opentelemetry/FlightBooking/src/main/resources/application.properties @@ -19,7 +19,7 @@ camel.main.use-mdc-logging = true camel.component.micrometer.enabled=true camel.component.metrics.metric-registry=prometheusMeterRegistry camel.metrics.enable-message-history=true -management.endpoint.metrics.enabled=true +management.endpoint.metrics.access=read-only management.endpoints.web.exposure.include=* spring.application.name=FlightBooking server.port=8082 \ No newline at end of file diff --git a/opentelemetry/HotelBooking/src/test/java/com/example/demo/DemoApplicationTests.java b/opentelemetry/FlightBooking/src/test/java/com/example/demo/DemoApplicationTest.java similarity index 94% rename from opentelemetry/HotelBooking/src/test/java/com/example/demo/DemoApplicationTests.java rename to opentelemetry/FlightBooking/src/test/java/com/example/demo/DemoApplicationTest.java index 9fa3f6603..8c38eb5d0 100644 --- a/opentelemetry/HotelBooking/src/test/java/com/example/demo/DemoApplicationTests.java +++ b/opentelemetry/FlightBooking/src/test/java/com/example/demo/DemoApplicationTest.java @@ -20,7 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class DemoApplicationTests { +class DemoApplicationTest { @Test void contextLoads() { diff --git a/opentelemetry/HotelBooking/pom.xml b/opentelemetry/HotelBooking/pom.xml index f6989ddde..deb596b15 100644 --- a/opentelemetry/HotelBooking/pom.xml +++ b/opentelemetry/HotelBooking/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-opentelemetry-hotelbooking @@ -60,7 +60,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/opentelemetry/HotelBooking/src/main/resources/application.properties b/opentelemetry/HotelBooking/src/main/resources/application.properties index 8dab5f414..d23363258 100644 --- a/opentelemetry/HotelBooking/src/main/resources/application.properties +++ b/opentelemetry/HotelBooking/src/main/resources/application.properties @@ -19,7 +19,7 @@ camel.main.use-mdc-logging = true camel.component.micrometer.enabled=true camel.component.metrics.metric-registry=prometheusMeterRegistry camel.metrics.enable-message-history=true -management.endpoint.metrics.enabled=true +management.endpoint.metrics.access=read-only management.endpoints.web.exposure.include=* spring.application.name=HotelBooking server.port=8083 \ No newline at end of file diff --git a/opentelemetry/CarBooking/src/test/java/com/example/demo/DemoApplicationTests.java b/opentelemetry/HotelBooking/src/test/java/com/example/demo/DemoApplicationTest.java similarity index 94% rename from opentelemetry/CarBooking/src/test/java/com/example/demo/DemoApplicationTests.java rename to opentelemetry/HotelBooking/src/test/java/com/example/demo/DemoApplicationTest.java index 9fa3f6603..8c38eb5d0 100644 --- a/opentelemetry/CarBooking/src/test/java/com/example/demo/DemoApplicationTests.java +++ b/opentelemetry/HotelBooking/src/test/java/com/example/demo/DemoApplicationTest.java @@ -20,7 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class DemoApplicationTests { +class DemoApplicationTest { @Test void contextLoads() { diff --git a/opentelemetry/TripBooking/pom.xml b/opentelemetry/TripBooking/pom.xml index 224b69dee..e9dafe3ed 100644 --- a/opentelemetry/TripBooking/pom.xml +++ b/opentelemetry/TripBooking/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-opentelemetry-tripbooking @@ -60,7 +60,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/opentelemetry/TripBooking/src/main/resources/application.properties b/opentelemetry/TripBooking/src/main/resources/application.properties index aa932c297..e75b28d7f 100644 --- a/opentelemetry/TripBooking/src/main/resources/application.properties +++ b/opentelemetry/TripBooking/src/main/resources/application.properties @@ -19,7 +19,7 @@ camel.main.use-mdc-logging = true camel.component.micrometer.enabled=true camel.component.metrics.metric-registry=prometheusMeterRegistry camel.metrics.enable-message-history=true -management.endpoint.metrics.enabled=true +management.endpoint.metrics.access=read-only management.endpoints.web.exposure.include=* spring.application.name=TripBooking server.port=8080 \ No newline at end of file diff --git a/opentelemetry/pom.xml b/opentelemetry/pom.xml index c2d3d3122..18c4aeffb 100644 --- a/opentelemetry/pom.xml +++ b/opentelemetry/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-opentelemetry diff --git a/paho-mqtt5-shared-subscriptions/pom.xml b/paho-mqtt5-shared-subscriptions/pom.xml index 9a5cc1100..639bbd258 100644 --- a/paho-mqtt5-shared-subscriptions/pom.xml +++ b/paho-mqtt5-shared-subscriptions/pom.xml @@ -5,7 +5,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 diff --git a/platform-http-proxy/pom.xml b/platform-http-proxy/pom.xml index 2b0e13b80..23ce46083 100644 --- a/platform-http-proxy/pom.xml +++ b/platform-http-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-platform-http-proxy @@ -57,7 +57,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -82,8 +82,7 @@ org.apache.camel - camel-test-junit5 - ${camel-version} + camel-test-spring-junit6 test diff --git a/platform-http/README.adoc b/platform-http/README.adoc index fbfa3f703..ddf74132d 100644 --- a/platform-http/README.adoc +++ b/platform-http/README.adoc @@ -48,7 +48,7 @@ o.apache.catalina.core.StandardEngine : Starting Servlet engine: [Apache Tomc o.a.c.c.C.[Tomcat].[localhost].[/] : Initializing Spring embedded WebApplicationContext w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 451 ms o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat started on port 8080 (http) with context path '/' -o.a.c.impl.engine.AbstractCamelContext : Apache Camel 4.18.0-SNAPSHOT (MyCamel) is starting +o.a.c.impl.engine.AbstractCamelContext : Apache Camel 4.19.0-SNAPSHOT (MyCamel) is starting o.a.c.impl.engine.AbstractCamelContext : Routes startup (total:6 rest-dsl:6) o.a.c.impl.engine.AbstractCamelContext : Started route1 (rest://get:/todos) o.a.c.impl.engine.AbstractCamelContext : Started route2 (rest://get:/todos:/%7Bid%7D) @@ -56,7 +56,7 @@ o.a.c.impl.engine.AbstractCamelContext : Started route3 (rest://patch:/tod o.a.c.impl.engine.AbstractCamelContext : Started route4 (rest://post:/todos) o.a.c.impl.engine.AbstractCamelContext : Started route5 (rest://delete:/todos) o.a.c.impl.engine.AbstractCamelContext : Started route6 (rest://delete:/todos:/%7Bid%7D) -o.a.c.impl.engine.AbstractCamelContext : Apache Camel 4.18.0-SNAPSHOT (MyCamel) started in 8ms (build:0ms init:0ms start:8ms boot:428ms) +o.a.c.impl.engine.AbstractCamelContext : Apache Camel 4.19.0-SNAPSHOT (MyCamel) started in 8ms (build:0ms init:0ms start:8ms boot:428ms) o.a.c.example.springboot.Application : Started Application in 1.155 seconds (process running for 1.283) ---- diff --git a/platform-http/pom.xml b/platform-http/pom.xml index 6dee5599c..0c4048069 100644 --- a/platform-http/pom.xml +++ b/platform-http/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-platform-http @@ -57,7 +57,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -82,8 +82,7 @@ org.apache.camel - camel-test-junit5 - ${camel-version} + camel-test-spring-junit6 test diff --git a/pojo/pom.xml b/pojo/pom.xml index a3febd66f..12bd8b957 100644 --- a/pojo/pom.xml +++ b/pojo/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-pojo @@ -85,7 +85,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/pom.xml b/pom.xml index 0e355e38b..32c115143 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot spring-boot - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT org.apache.camel.springboot.example @@ -106,14 +106,15 @@ - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT + 17 false 1.18.1 registry.access.redhat.com/ubi9/openjdk-17:latest true 7.1.1 3.7.0 - 1.20.4 + 2.0.3 2.5.1 2.38.0 diff --git a/quartz/pom.xml b/quartz/pom.xml index 3a8016829..bdea53280 100644 --- a/quartz/pom.xml +++ b/quartz/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-quartz @@ -89,7 +89,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index ec6cdb84c..1039cec14 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rabbitmq @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -94,7 +94,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/rabbitmq/readme.adoc b/rabbitmq/readme.adoc index 991656b37..6b003867f 100644 --- a/rabbitmq/readme.adoc +++ b/rabbitmq/readme.adoc @@ -16,9 +16,9 @@ in the `application.properties` file as well. The sample requires a RabbitMQ broker to be running. -You can for example easily start RabbitMQ via Docker +You can use the Camel CLI to start a RabbitMQ broker: - docker run -it -p 5672:5672 --hostname my-rabbit --name some-rabbit rabbitmq:3 + camel infra run rabbitmq Then you can run this example using diff --git a/reactive-streams/pom.xml b/reactive-streams/pom.xml index b4a12d7dd..9cb84a615 100644 --- a/reactive-streams/pom.xml +++ b/reactive-streams/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-reactive-streams @@ -72,7 +72,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/resilience4j/client/pom.xml b/resilience4j/client/pom.xml index 54d213403..0789adee2 100644 --- a/resilience4j/client/pom.xml +++ b/resilience4j/client/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-resilience4j - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-resilience4j-client @@ -59,7 +59,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc diff --git a/resilience4j/client/src/main/resources/META-INF/beans.xml b/resilience4j/client/src/main/resources/META-INF/beans.xml index 4d1f3ebd0..893e57c69 100644 --- a/resilience4j/client/src/main/resources/META-INF/beans.xml +++ b/resilience4j/client/src/main/resources/META-INF/beans.xml @@ -17,4 +17,4 @@ limitations under the License. --> - \ No newline at end of file + \ No newline at end of file diff --git a/resilience4j/client2/pom.xml b/resilience4j/client2/pom.xml index 03c6e35b8..8a0ea1541 100644 --- a/resilience4j/client2/pom.xml +++ b/resilience4j/client2/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-resilience4j - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-resilience4j-client2 diff --git a/resilience4j/client2/src/main/resources/META-INF/beans.xml b/resilience4j/client2/src/main/resources/META-INF/beans.xml index 4d1f3ebd0..893e57c69 100644 --- a/resilience4j/client2/src/main/resources/META-INF/beans.xml +++ b/resilience4j/client2/src/main/resources/META-INF/beans.xml @@ -17,4 +17,4 @@ limitations under the License. --> - \ No newline at end of file + \ No newline at end of file diff --git a/resilience4j/pom.xml b/resilience4j/pom.xml index 159b4acfa..605475f4e 100644 --- a/resilience4j/pom.xml +++ b/resilience4j/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-resilience4j diff --git a/resilience4j/service1/pom.xml b/resilience4j/service1/pom.xml index a651ac1ae..c5b534f41 100644 --- a/resilience4j/service1/pom.xml +++ b/resilience4j/service1/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-resilience4j - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-resilience4j-service1 diff --git a/resilience4j/service2/pom.xml b/resilience4j/service2/pom.xml index a126fb720..f26621ebe 100644 --- a/resilience4j/service2/pom.xml +++ b/resilience4j/service2/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-resilience4j - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-resilience4j-service2 diff --git a/rest-cxf-opentelemetry/pom.xml b/rest-cxf-opentelemetry/pom.xml index b30939a91..e2b521335 100644 --- a/rest-cxf-opentelemetry/pom.xml +++ b/rest-cxf-opentelemetry/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-cxf-opentelemetry @@ -67,7 +67,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -103,7 +103,7 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-common/pom.xml b/rest-cxf-opentelemetry/rest-cxf-otel-common/pom.xml index b39d2c2e0..ee1d473c1 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-common/pom.xml +++ b/rest-cxf-opentelemetry/rest-cxf-otel-common/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-rest-cxf-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-cxf-otel-common diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/CxfConfig.java b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/CxfConfig.java index d1a1751dc..f21d7c9fa 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/CxfConfig.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/CxfConfig.java @@ -21,8 +21,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.databind.SerializationFeature; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @Configuration public class CxfConfig { diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverter.java b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverter.java index d5137d6d7..1acd6ee42 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverter.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/main/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverter.java @@ -19,7 +19,7 @@ import org.apache.camel.Converter; import org.apache.camel.TypeConverters; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.io.InputStream; diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-even/pom.xml b/rest-cxf-opentelemetry/rest-cxf-otel-even/pom.xml index d1a414f87..4a4df18a4 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-even/pom.xml +++ b/rest-cxf-opentelemetry/rest-cxf-otel-even/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-rest-cxf-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-cxf-otel-even diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-odd/pom.xml b/rest-cxf-opentelemetry/rest-cxf-otel-odd/pom.xml index 47e0db0c7..ab5204a14 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-odd/pom.xml +++ b/rest-cxf-opentelemetry/rest-cxf-otel-odd/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-rest-cxf-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-cxf-otel-odd diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/pom.xml b/rest-cxf-opentelemetry/rest-cxf-otel-random/pom.xml index 5d6f645a2..6bacec7ef 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-random/pom.xml +++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-rest-cxf-opentelemetry - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-cxf-otel-random diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/RandomServiceImpl.java b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/RandomServiceImpl.java index 1941b0aad..e4140052e 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/RandomServiceImpl.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/RandomServiceImpl.java @@ -53,7 +53,7 @@ public void register(RandomNumber number, Exchange exchange) { assert number != null; assert number.getType() != null; LOGGER.info("register {}", number); - final String objName = String.format("%s-%s", serviceName, number.getNumber()); + final String objName = "%s-%s".formatted(serviceName, number.getNumber()); producerTemplate.sendBodyAndHeader("direct:save-obj", number, "objectName", objName); } } diff --git a/rest-cxf/pom.xml b/rest-cxf/pom.xml index 09f04460a..4036d897e 100644 --- a/rest-cxf/pom.xml +++ b/rest-cxf/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-cxf @@ -58,7 +58,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -80,7 +80,7 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/rest-cxf/src/main/java/org/apache/camel/example/springboot/cxf/CxfConfig.java b/rest-cxf/src/main/java/org/apache/camel/example/springboot/cxf/CxfConfig.java index b15be0dcb..dd13f01b5 100644 --- a/rest-cxf/src/main/java/org/apache/camel/example/springboot/cxf/CxfConfig.java +++ b/rest-cxf/src/main/java/org/apache/camel/example/springboot/cxf/CxfConfig.java @@ -19,7 +19,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @Configuration public class CxfConfig { diff --git a/rest-openapi-simple/pom.xml b/rest-openapi-simple/pom.xml index aaa881e7f..63cc475e1 100644 --- a/rest-openapi-simple/pom.xml +++ b/rest-openapi-simple/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-openapi-simple diff --git a/rest-openapi-springdoc/pom.xml b/rest-openapi-springdoc/pom.xml index de2e9fb96..1dd7634c4 100644 --- a/rest-openapi-springdoc/pom.xml +++ b/rest-openapi-springdoc/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-openapi-springdoc @@ -57,7 +57,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc diff --git a/rest-openapi/pom.xml b/rest-openapi/pom.xml index f95ae1f92..b57ccbc46 100644 --- a/rest-openapi/pom.xml +++ b/rest-openapi/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-rest-openapi @@ -58,7 +58,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -105,8 +105,7 @@ org.apache.camel - camel-test-junit5 - ${camel-version} + camel-test-spring-junit6 test diff --git a/route-reload/pom.xml b/route-reload/pom.xml index dfb5be888..e4fa3ad66 100644 --- a/route-reload/pom.xml +++ b/route-reload/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-route-reload @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -94,7 +94,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -102,11 +102,6 @@ camel-management-starter test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/route-reload/src/test/java/sample/camel/SampleCamelApplicationTest.java b/route-reload/src/test/java/sample/camel/SampleCamelApplicationTest.java index 1915afca5..99cea4fab 100644 --- a/route-reload/src/test/java/sample/camel/SampleCamelApplicationTest.java +++ b/route-reload/src/test/java/sample/camel/SampleCamelApplicationTest.java @@ -19,14 +19,14 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; + +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.Assert.assertTrue; - @CamelSpringBootTest @SpringBootTest(classes = SampleCamelApplication.class) public class SampleCamelApplicationTest { diff --git a/routes-configuration/pom.xml b/routes-configuration/pom.xml index bb18b2e55..093c2fa63 100644 --- a/routes-configuration/pom.xml +++ b/routes-configuration/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-routes-configuration @@ -110,7 +110,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/kamelet-chucknorris/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/routes-configuration/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 93% rename from kamelet-chucknorris/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to routes-configuration/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 21c7a2a71..356fbbf5f 100644 --- a/kamelet-chucknorris/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/routes-configuration/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/routetemplate-xml/pom.xml b/routetemplate-xml/pom.xml index 78e52dda1..9d223187f 100644 --- a/routetemplate-xml/pom.xml +++ b/routetemplate-xml/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-routetemplate-xml @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -94,7 +94,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/routetemplate-xml/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/routetemplate-xml/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 94% rename from routetemplate-xml/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to routetemplate-xml/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 1d6ae2d47..53ee51389 100644 --- a/routetemplate-xml/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/routetemplate-xml/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) -class MyCamelApplicationJUnit5Test { +class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/routetemplate/pom.xml b/routetemplate/pom.xml index 891c3429f..85af2d913 100644 --- a/routetemplate/pom.xml +++ b/routetemplate/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-routetemplate @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -94,7 +94,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/endpointdsl/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 93% rename from endpointdsl/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 21c7a2a71..356fbbf5f 100644 --- a/endpointdsl/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; @@ -30,7 +30,7 @@ @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/saga/ocp-resources/amq-broker-ephemeral.yaml b/saga/ocp-resources/amq-broker-ephemeral.yaml index 2fb09ec4e..701d20fc5 100644 --- a/saga/ocp-resources/amq-broker-ephemeral.yaml +++ b/saga/ocp-resources/amq-broker-ephemeral.yaml @@ -37,7 +37,6 @@ items: kind: DockerImage name: registry.redhat.io/amq7/amq-broker-rhel8:7.12 generation: 0 - importPolicy: {} name: "latest" referencePolicy: type: Source diff --git a/saga/ocp-resources/amq-broker.yaml b/saga/ocp-resources/amq-broker.yaml index 40ae79d5b..348c0e875 100644 --- a/saga/ocp-resources/amq-broker.yaml +++ b/saga/ocp-resources/amq-broker.yaml @@ -50,7 +50,6 @@ items: kind: DockerImage name: registry.redhat.io/amq7/amq-broker-rhel8:7.12 generation: 0 - importPolicy: {} name: "latest" referencePolicy: type: Source diff --git a/saga/ocp-resources/lra-coordinator-ephemeral.yaml b/saga/ocp-resources/lra-coordinator-ephemeral.yaml index 82259de1d..5d564dada 100644 --- a/saga/ocp-resources/lra-coordinator-ephemeral.yaml +++ b/saga/ocp-resources/lra-coordinator-ephemeral.yaml @@ -33,7 +33,6 @@ items: kind: DockerImage name: quay.io/jbosstm/lra-coordinator:latest generation: 0 - importPolicy: {} name: "latest" referencePolicy: type: Source @@ -87,4 +86,3 @@ items: name: lra-coordinator-data volumes: - name: lra-coordinator-data - emptyDir: {} diff --git a/saga/ocp-resources/lra-coordinator.yaml b/saga/ocp-resources/lra-coordinator.yaml index e20a7920c..cb6df3f5b 100644 --- a/saga/ocp-resources/lra-coordinator.yaml +++ b/saga/ocp-resources/lra-coordinator.yaml @@ -46,7 +46,6 @@ items: kind: DockerImage name: quay.io/jbosstm/lra-coordinator:latest generation: 0 - importPolicy: {} name: "latest" referencePolicy: type: Source diff --git a/saga/pom.xml b/saga/pom.xml index 93d5d552c..d30899e5f 100644 --- a/saga/pom.xml +++ b/saga/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-saga @@ -75,7 +75,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -123,7 +123,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/saga/run-local.sh b/saga/run-local.sh index 5ffb27077..8763a80d5 100755 --- a/saga/run-local.sh +++ b/saga/run-local.sh @@ -7,13 +7,15 @@ echo compiling project mvn clean package echo running payment service -mvn -f saga-payment-service/ spring-boot:run +mvn -f saga-payment-service/ spring-boot:run & echo running flight service -mvn -f saga-flight-service/ spring-boot:run +mvn -f saga-flight-service/ spring-boot:run & echo running train service -mvn -f saga-train-service/ spring-boot:run +mvn -f saga-train-service/ spring-boot:run & echo running saga application -mvn -f saga-app/ spring-boot:run +mvn -f saga-app/ spring-boot:run & + +wait diff --git a/saga/saga-app/pom.xml b/saga/saga-app/pom.xml index 02458abfb..041e984d2 100644 --- a/saga/saga-app/pom.xml +++ b/saga/saga-app/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-saga - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-saga-app diff --git a/saga/saga-flight-service/pom.xml b/saga/saga-flight-service/pom.xml index 88b91da5d..63cc27e4d 100644 --- a/saga/saga-flight-service/pom.xml +++ b/saga/saga-flight-service/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-saga - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-saga-flight diff --git a/saga/saga-payment-service/pom.xml b/saga/saga-payment-service/pom.xml index 259457cce..0f8de5120 100644 --- a/saga/saga-payment-service/pom.xml +++ b/saga/saga-payment-service/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-saga - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-saga-payment diff --git a/saga/saga-payment-service/src/main/java/org/apache/camel/example/saga/PaymentRoute.java b/saga/saga-payment-service/src/main/java/org/apache/camel/example/saga/PaymentRoute.java index 10e1576c0..59808546f 100644 --- a/saga/saga-payment-service/src/main/java/org/apache/camel/example/saga/PaymentRoute.java +++ b/saga/saga-payment-service/src/main/java/org/apache/camel/example/saga/PaymentRoute.java @@ -21,6 +21,8 @@ import org.springframework.stereotype.Component; +import java.util.concurrent.ThreadLocalRandom; + @Component public class PaymentRoute extends RouteBuilder { @@ -35,7 +37,7 @@ public void configure() throws Exception { .log("Paying ${header.payFor} for order #${header.id}") .setBody(header("JMSCorrelationID")) .choice() - .when(x -> Math.random() >= 0.85) + .when(x -> ThreadLocalRandom.current().nextDouble() >= 0.85) .log("Payment ${header.payFor} for saga #${header.id} fails!") .throwException(new RuntimeException("Random failure during payment")) .end() diff --git a/saga/saga-train-service/pom.xml b/saga/saga-train-service/pom.xml index 470993bb2..c3b571e56 100644 --- a/saga/saga-train-service/pom.xml +++ b/saga/saga-train-service/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example camel-example-spring-boot-saga - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-saga-train diff --git a/salesforce/pom.xml b/salesforce/pom.xml index 74ea76fb2..020b9d647 100644 --- a/salesforce/pom.xml +++ b/salesforce/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-salesforce @@ -87,7 +87,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/soap-cxf/pom.xml b/soap-cxf/pom.xml index 511c06273..d9f73d64c 100644 --- a/soap-cxf/pom.xml +++ b/soap-cxf/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-soap-cxf @@ -70,7 +70,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/soap-cxf/src/main/java/sample/camel/MyPojoRouteBuilder.java b/soap-cxf/src/main/java/sample/camel/MyPojoRouteBuilder.java index 629f66767..9f715414f 100644 --- a/soap-cxf/src/main/java/sample/camel/MyPojoRouteBuilder.java +++ b/soap-cxf/src/main/java/sample/camel/MyPojoRouteBuilder.java @@ -20,6 +20,7 @@ import org.apache.camel.component.cxf.jaxws.CxfEndpoint; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; import sample.camel.service.ContactService; @@ -28,6 +29,7 @@ * This class demonstrate how to expose a SOAP endpoint starting from java classes */ @Component +@Configuration public class MyPojoRouteBuilder extends RouteBuilder { @Bean diff --git a/soap-cxf/src/main/java/sample/camel/MyWsdlRouteBuilder.java b/soap-cxf/src/main/java/sample/camel/MyWsdlRouteBuilder.java index ab5c2b5dc..85f7886b1 100644 --- a/soap-cxf/src/main/java/sample/camel/MyWsdlRouteBuilder.java +++ b/soap-cxf/src/main/java/sample/camel/MyWsdlRouteBuilder.java @@ -21,6 +21,7 @@ import org.apache.cxf.message.MessageContentsList; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; import com.example.customerservice.Customer; @@ -37,6 +38,7 @@ * This class demonstrate how to expose a SOAP endpoint starting from a wsdl, using the cxf-codegen-plugin */ @Component +@Configuration public class MyWsdlRouteBuilder extends RouteBuilder { private final CustomerRepository customerRepository; diff --git a/soap-cxf/src/main/java/sample/camel/service/NoSuchContactException.java b/soap-cxf/src/main/java/sample/camel/service/NoSuchContactException.java index 3716328ce..11b96c00b 100644 --- a/soap-cxf/src/main/java/sample/camel/service/NoSuchContactException.java +++ b/soap-cxf/src/main/java/sample/camel/service/NoSuchContactException.java @@ -18,10 +18,13 @@ import jakarta.xml.ws.WebFault; +import java.io.Serial; + @WebFault(name = "NoSuchContact") public class NoSuchContactException extends Exception { - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; private String faultInfo; diff --git a/soap-cxf/src/main/resources/application.properties b/soap-cxf/src/main/resources/application.properties index 65971612e..729e341a4 100644 --- a/soap-cxf/src/main/resources/application.properties +++ b/soap-cxf/src/main/resources/application.properties @@ -21,7 +21,7 @@ camel.main.run-controller=true # logging.level.root=TRACE -management.endpoint.metrics.enabled=true +management.endpoint.metrics.access=read-only management.endpoints.web.exposure.include=* server.tomcat.accept-count=1 diff --git a/splitter-eip/pom.xml b/splitter-eip/pom.xml index 2f63a13e4..a975d7780 100644 --- a/splitter-eip/pom.xml +++ b/splitter-eip/pom.xml @@ -24,7 +24,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 @@ -85,7 +85,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/splitter-eip/src/test/java/CamelSplitterEIPTests.java b/splitter-eip/src/test/java/org/apache/camel/example/springboot/splitter/CamelSplitterEIPTest.java similarity index 83% rename from splitter-eip/src/test/java/CamelSplitterEIPTests.java rename to splitter-eip/src/test/java/org/apache/camel/example/springboot/splitter/CamelSplitterEIPTest.java index ffdfcf35c..f5ebe5ba8 100644 --- a/splitter-eip/src/test/java/CamelSplitterEIPTests.java +++ b/splitter-eip/src/test/java/org/apache/camel/example/springboot/splitter/CamelSplitterEIPTest.java @@ -17,6 +17,8 @@ * */ +package org.apache.camel.example.springboot.splitter; + import java.util.ArrayList; import java.util.Arrays; @@ -26,19 +28,19 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.example.spring.boot.Application; -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; import org.springframework.boot.test.context.SpringBootTest; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @CamelSpringBootTest @SpringBootTest(classes = {Application.class}) -public class CamelSplitterEIPTests { +public class CamelSplitterEIPTest { @Autowired private CamelContext camelContext; @@ -110,8 +112,9 @@ public void testSplitAggregateStopOnAggregationException() throws InterruptedExc MockEndpoint mockJ = camelContext.getEndpoint("mock:j", MockEndpoint.class); // without error aggregation is done as usual - mockH.expectedBodiesReceived("A", "B", "C"); - mockJ.expectedBodiesReceived("A+B+C"); + // Messages are transformed by MyMessageTransformer before reaching mock:h + mockH.expectedBodiesReceived("Alpha", "Beta", "Charlie"); + mockJ.expectedBodiesReceived("Alpha+Beta+Charlie"); producerTemplate.sendBody("direct:split-aggregate-stop-on-aggregation-exception", "A,B,C"); @@ -121,9 +124,12 @@ public void testSplitAggregateStopOnAggregationException() throws InterruptedExc mockH.reset(); mockJ.reset(); - // Received all messages that went into aggregation, including corrupted one - mockH.expectedBodiesReceived("A", "B", "E"); - // Since aggregation stopped, receiving all original messages + // 'E' is not in the transformer dictionary, so it throws IllegalArgumentException. + // With .continued(true), the exception from the transformer is swallowed and the original + // body 'E' passes through to mock:h. Then the aggregation strategy also throws on 'E', + // which stops the split — so 'C' and 'D' are never processed. + mockH.expectedBodiesReceived("Alpha", "Beta", "E"); + // The aggregation result is the original unsplit input since aggregation failed mockJ.expectedBodiesReceived("A,B,E,C,D"); // 'E' is poison message which will lead to an error during aggregation diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 878e1bedf..d4ac2b584 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -104,7 +104,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/spring-boot/src/main/java/sample/camel/MyBean.java b/spring-boot/src/main/java/sample/camel/MyBean.java index 45b9aa8f9..6acb553f6 100644 --- a/spring-boot/src/main/java/sample/camel/MyBean.java +++ b/spring-boot/src/main/java/sample/camel/MyBean.java @@ -34,7 +34,7 @@ public class MyBean { private String say; public String saySomething(String body) { - return String.format("%s I am invoked %d times", say, ++counter); + return "%s I am invoked %d times".formatted(say, ++counter); } } diff --git a/spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 90% rename from spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 511d93a22..ba127e489 100644 --- a/spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -20,8 +20,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.EnableRouteCoverage; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.EnableRouteCoverage; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -32,7 +32,7 @@ @CamelSpringBootTest @SpringBootTest(classes = MyCamelApplication.class) @EnableRouteCoverage -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/spring-jdbc/pom.xml b/spring-jdbc/pom.xml index e7f87a887..b58c38b50 100644 --- a/spring-jdbc/pom.xml +++ b/spring-jdbc/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-spring-jdbc @@ -62,7 +62,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/strimzi/pom.xml b/strimzi/pom.xml index 8f66133e4..32c15b408 100644 --- a/strimzi/pom.xml +++ b/strimzi/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-strimzi @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc diff --git a/strimzi/src/main/resources/kafka-ephemeral-kubernetes.yaml b/strimzi/src/main/resources/kafka-ephemeral-kubernetes.yaml index 7e8f3f12b..92089257f 100644 --- a/strimzi/src/main/resources/kafka-ephemeral-kubernetes.yaml +++ b/strimzi/src/main/resources/kafka-ephemeral-kubernetes.yaml @@ -6,9 +6,6 @@ spec: kafka: version: 2.4.0 replicas: 3 - listeners: - plain: {} - tls: {} config: offsets.topic.replication.factor: 3 transaction.state.log.replication.factor: 3 @@ -20,6 +17,3 @@ spec: replicas: 3 storage: type: ephemeral - entityOperator: - topicOperator: {} - userOperator: {} diff --git a/strimzi/src/main/resources/kafka-ephemeral-openshift.yaml b/strimzi/src/main/resources/kafka-ephemeral-openshift.yaml index 022d9d00d..218b4fe8d 100644 --- a/strimzi/src/main/resources/kafka-ephemeral-openshift.yaml +++ b/strimzi/src/main/resources/kafka-ephemeral-openshift.yaml @@ -7,8 +7,6 @@ spec: version: 2.4.0 replicas: 3 listeners: - plain: {} - tls: {} external: type: route config: @@ -22,6 +20,3 @@ spec: replicas: 3 storage: type: ephemeral - entityOperator: - topicOperator: {} - userOperator: {} diff --git a/supervising-route-controller/pom.xml b/supervising-route-controller/pom.xml index c3e3c4c61..d8397194e 100644 --- a/supervising-route-controller/pom.xml +++ b/supervising-route-controller/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-supervising-route-controller @@ -71,17 +71,7 @@ org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-undertow + spring-boot-starter-webmvc org.springframework.boot @@ -116,7 +106,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/supervising-route-controller/src/main/resources/application.properties b/supervising-route-controller/src/main/resources/application.properties index 4d8cb39df..5356567e5 100644 --- a/supervising-route-controller/src/main/resources/application.properties +++ b/supervising-route-controller/src/main/resources/application.properties @@ -26,7 +26,7 @@ logging.level.sample.camel = DEBUG # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=info,health -management.endpoint.health.enabled = true +management.endpoint.health.access = read-only # show verbose health details (/actuator/health) so you can see Camel information also management.endpoint.health.show-details=always diff --git a/tomcat-jdbc/pom.xml b/tomcat-jdbc/pom.xml index e260a0784..10f30652a 100644 --- a/tomcat-jdbc/pom.xml +++ b/tomcat-jdbc/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-tomcat-jdbc @@ -120,7 +120,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -128,6 +128,10 @@ h2 test + + org.springframework.boot + spring-boot-data-jdbc-test + diff --git a/tomcat-jdbc/readme.adoc b/tomcat-jdbc/readme.adoc index 1d6b9b663..9589d8021 100644 --- a/tomcat-jdbc/readme.adoc +++ b/tomcat-jdbc/readme.adoc @@ -15,9 +15,38 @@ The example generates 2 routes: === How to deploy -. Run the database container -[source,console] -podman run --rm --name db -e POSTGRES_PASSWORD=password -p 5432:5432 docker.io/library/postgres:latest +. Start the PostgreSQL server + +* Use camel-jbang + +In camel-jbang there is a `camel infra` command to start services. + +To start the postgresql server +``` +camel infra run postgres +``` +It will output this: +``` +Starting service postgres +{ + "getServiceAddress" : "localhost:5432", + "host" : "localhost", + "password" : "test", + "port" : 5432, + "userName" : "test" +} +Press any key to stop the execution +``` + +NOTE: If you use `camel infra run`, make sure the credentials in `src/main/resources/application.properties` match the ones reported by the service (e.g. `spring.datasource.username=test` and `spring.datasource.password=test`). + +* Use docker + +You can use docker in case you don't want to use camel-jbang. + +``` +docker run --rm --name db -e POSTGRES_PASSWORD=password -p 5432:5432 docker.io/library/postgres:latest +``` . Run the tests and package the `war` file [source,console] diff --git a/tomcat-jdbc/src/main/resources/application.properties b/tomcat-jdbc/src/main/resources/application.properties index 66060498a..ec59a1d5b 100644 --- a/tomcat-jdbc/src/main/resources/application.properties +++ b/tomcat-jdbc/src/main/resources/application.properties @@ -22,9 +22,9 @@ spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource // other spring datasource properties #database configuration spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.url=jdbc:postgresql://localhost:5432/postgres -spring.datasource.username=postgres -spring.datasource.password=password +spring.datasource.url=jdbc:postgresql://localhost:5432/test +spring.datasource.username=test +spring.datasource.password=test #init schema.sql -- this should be changed for production use! spring.sql.init.mode=always diff --git a/tomcat-jdbc/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/tomcat-jdbc/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java similarity index 77% rename from tomcat-jdbc/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java rename to tomcat-jdbc/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java index 4952c3454..3648f035a 100644 --- a/tomcat-jdbc/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java +++ b/tomcat-jdbc/src/test/java/sample/camel/MyCamelApplicationJUnit6Test.java @@ -16,28 +16,21 @@ */ package sample.camel; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.EnableRouteCoverage; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.EnableRouteCoverage; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.EmbeddedDatabaseConnection; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; -import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.transaction.annotation.Transactional; -import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -47,7 +40,7 @@ @SpringBootTest(classes = MyCamelApplication.class) @AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.H2) @EnableRouteCoverage -public class MyCamelApplicationJUnit5Test { +public class MyCamelApplicationJUnit6Test { @Autowired private CamelContext camelContext; diff --git a/twitter-salesforce/pom.xml b/twitter-salesforce/pom.xml index 7ab30fa59..2c7cc2810 100644 --- a/twitter-salesforce/pom.xml +++ b/twitter-salesforce/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-twitter-salesforce @@ -81,7 +81,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/twitter-salesforce/src/main/java/org/apache/camel/example/mention/TwitterSalesforceRoute.java b/twitter-salesforce/src/main/java/org/apache/camel/example/mention/TwitterSalesforceRoute.java index d073a3d46..2f57362dd 100644 --- a/twitter-salesforce/src/main/java/org/apache/camel/example/mention/TwitterSalesforceRoute.java +++ b/twitter-salesforce/src/main/java/org/apache/camel/example/mention/TwitterSalesforceRoute.java @@ -43,7 +43,7 @@ public void configure() throws Exception { contact = Contact.class; } - Object contactObject = contact.newInstance(); + Object contactObject = contact.getDeclaredConstructor().newInstance(); Method setLastName = contact.getMethod("setLastName", String.class); Method setTwitterScreenName__c = contact.getMethod("setTwitterScreenName__c", String.class); setLastName.invoke(contactObject, name); diff --git a/type-converter/pom.xml b/type-converter/pom.xml index 02a983917..f7a587e3c 100644 --- a/type-converter/pom.xml +++ b/type-converter/pom.xml @@ -5,7 +5,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 @@ -66,7 +66,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java b/type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java index 95c9613ad..9d02c1154 100644 --- a/type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java +++ b/type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java b/type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java index b60b858ec..46fe037e0 100644 --- a/type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java +++ b/type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/validator/pom.xml b/validator/pom.xml index e67c70458..d67aecaf2 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-validator @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -90,7 +90,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -98,11 +98,6 @@ camel-management-starter test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/validator/src/test/java/sample/camel/SampleCamelApplicationTest.java b/validator/src/test/java/sample/camel/SampleCamelApplicationTest.java index 1915afca5..99cea4fab 100644 --- a/validator/src/test/java/sample/camel/SampleCamelApplicationTest.java +++ b/validator/src/test/java/sample/camel/SampleCamelApplicationTest.java @@ -19,14 +19,14 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; + +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.Assert.assertTrue; - @CamelSpringBootTest @SpringBootTest(classes = SampleCamelApplication.class) public class SampleCamelApplicationTest { diff --git a/variables/pom.xml b/variables/pom.xml index 51d4d54d8..3a0fb1a9d 100644 --- a/variables/pom.xml +++ b/variables/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-variables @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -86,7 +86,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -94,11 +94,6 @@ camel-management-starter test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/vault/pom.xml b/vault/pom.xml index 0ddc88b6c..c71cdba9d 100644 --- a/vault/pom.xml +++ b/vault/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-vault @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/vault/src/main/java/org/apache/camel/example/spring/vault/CamelSpringVaultApplication.java b/vault/src/main/java/org/apache/camel/example/spring/vault/CamelSpringVaultApplication.java index 8dc0929c8..6dbb1f9f4 100644 --- a/vault/src/main/java/org/apache/camel/example/spring/vault/CamelSpringVaultApplication.java +++ b/vault/src/main/java/org/apache/camel/example/spring/vault/CamelSpringVaultApplication.java @@ -18,7 +18,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) public class CamelSpringVaultApplication { diff --git a/webhook/pom.xml b/webhook/pom.xml index 95b25491f..773390016 100644 --- a/webhook/pom.xml +++ b/webhook/pom.xml @@ -21,7 +21,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 @@ -57,7 +57,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.apache.camel.springboot diff --git a/widget-gadget/README.adoc b/widget-gadget/README.adoc index 9c1adfd3b..9905a341e 100644 --- a/widget-gadget/README.adoc +++ b/widget-gadget/README.adoc @@ -10,15 +10,13 @@ image::https://camel.apache.org/components/latest/eips/_images/eip/DistributionA === Configuration -Before the application can run, rabbitmq must be started. This can be done with docker, executing the following command: +Before the application can run, RabbitMQ must be started. You can use the Camel CLI to start a RabbitMQ broker: [source,sh] ---- -$ docker run -d -p 5672:5672 -p 15672:15672 --name my-rabbit rabbitmq:3-management +$ camel infra run rabbitmq ---- -The port can be configured as desired, but do not forget to match the configured port number in your `application.properties`-file! - === Build After that, you can build this example using: diff --git a/widget-gadget/pom.xml b/widget-gadget/pom.xml index b9e081953..d20a75dd1 100644 --- a/widget-gadget/pom.xml +++ b/widget-gadget/pom.xml @@ -23,7 +23,7 @@ examples org.apache.camel.springboot.example - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT 4.0.0 @@ -64,7 +64,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc @@ -89,7 +89,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/widget-gadget/src/main/resources/application.properties b/widget-gadget/src/main/resources/application.properties index f6cfb509f..e911a3746 100644 --- a/widget-gadget/src/main/resources/application.properties +++ b/widget-gadget/src/main/resources/application.properties @@ -17,5 +17,5 @@ spring.artemis.mode=native AMQP_REMOTE_URI=amqp://localhost:5672 -AMQP_SERVICE_USERNAME=admin -AMQP_SERVICE_PASSWORD=admin \ No newline at end of file +AMQP_SERVICE_USERNAME=artemis +AMQP_SERVICE_PASSWORD=artemis \ No newline at end of file diff --git a/xml-import/pom.xml b/xml-import/pom.xml index 418c74232..d78fc3ce5 100644 --- a/xml-import/pom.xml +++ b/xml-import/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-xml-import @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -91,7 +91,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -99,11 +99,6 @@ camel-management-starter test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/xml-import/src/main/resources/application.properties b/xml-import/src/main/resources/application.properties index 7ab7ca951..2636ebdd1 100644 --- a/xml-import/src/main/resources/application.properties +++ b/xml-import/src/main/resources/application.properties @@ -27,7 +27,7 @@ timer.period = 2000 # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=camelroutes # turn on actuator health check -management.endpoint.health.enabled = true +management.endpoint.health.access = read-only # to configure logging levels #logging.level.org.springframework = INFO diff --git a/xml-import/src/test/java/sample/camel/SampleCamelApplicationTest.java b/xml-import/src/test/java/sample/camel/SampleCamelApplicationTest.java index 1915afca5..99cea4fab 100644 --- a/xml-import/src/test/java/sample/camel/SampleCamelApplicationTest.java +++ b/xml-import/src/test/java/sample/camel/SampleCamelApplicationTest.java @@ -19,14 +19,14 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; + +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.Assert.assertTrue; - @CamelSpringBootTest @SpringBootTest(classes = SampleCamelApplication.class) public class SampleCamelApplicationTest { diff --git a/xml/pom.xml b/xml/pom.xml index 5f4c52792..3aa0674ed 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.springboot.example examples - 4.18.0-SNAPSHOT + 4.19.0-SNAPSHOT camel-example-spring-boot-xml @@ -65,7 +65,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot @@ -99,12 +99,7 @@ org.apache.camel - camel-test-spring-junit5 - test - - - org.junit.vintage - junit-vintage-engine + camel-test-spring-junit6 test diff --git a/xml/src/main/resources/application.properties b/xml/src/main/resources/application.properties index cc8eb1ef1..ea0288590 100644 --- a/xml/src/main/resources/application.properties +++ b/xml/src/main/resources/application.properties @@ -37,7 +37,7 @@ timer.period = 2000 # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=camelroutes # turn on actuator health check -management.endpoint.health.enabled = true +management.endpoint.health.access = read-only # to configure logging levels #logging.level.org.springframework = INFO diff --git a/xml/src/test/java/sample/camel/SampleCamelApplicationTest.java b/xml/src/test/java/sample/camel/SampleCamelApplicationTest.java index 1915afca5..99cea4fab 100644 --- a/xml/src/test/java/sample/camel/SampleCamelApplicationTest.java +++ b/xml/src/test/java/sample/camel/SampleCamelApplicationTest.java @@ -19,14 +19,14 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; + +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.camel.builder.NotifyBuilder; -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; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.Assert.assertTrue; - @CamelSpringBootTest @SpringBootTest(classes = SampleCamelApplication.class) public class SampleCamelApplicationTest {