Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aggregate-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-aggregate-dist</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions aggregate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-aggregate</artifactId>
Expand Down Expand Up @@ -84,7 +84,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring-junit5</artifactId>
<artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.apache.camel.test.spring.junit5.MockEndpoints;
import org.apache.camel.test.spring.junit5.UseAdviceWith;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.apache.camel.test.spring.junit6.MockEndpoints;
import org.apache.camel.test.spring.junit6.UseAdviceWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws-kcl-kinesis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-aws-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-endpointdsl-aws2-kinesis-kcl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws2-s3-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-aws-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-endpointdsl-aws2-s3-kafka</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws2-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-aws-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-endpointdsl-aws2-s3</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws2/aws2-eventbridge-creator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-example-main-endpointdsl-aws2</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>aws2-eventbridge-creator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws2/aws2-s3-events-inject/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-example-main-endpointdsl-aws2</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>aws2-s3-events-inject</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws2/aws2-sqs-consumer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-example-main-endpointdsl-aws2</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>aws2-sqs-consumer</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-aws2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-aws-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-endpointdsl-aws2</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-aws-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-endpointdsl-kafka-aws2-s3-restarting-policy</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.junit6.CamelContextConfiguration;
import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down
2 changes: 1 addition & 1 deletion aws/main-endpointdsl-kafka-aws2-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-aws-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-endpointdsl-kafka-aws2-s3</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.camel.test.junit5.CamelContextConfiguration;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.junit6.CamelContextConfiguration;
import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down
4 changes: 2 additions & 2 deletions aws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-examples-aws-parent</artifactId>
Expand All @@ -48,7 +48,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-main-junit5</artifactId>
<artifactId>camel-test-main-junit6</artifactId>
<version>${camel.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion azure/azure-eventhubs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-azure-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-azure-eventhubs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion azure/azure-storage-blob/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-azure-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-azure-storage-blob</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion azure/kafka-azure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples-azure-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-main-kafka-azure-storage-blob</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion azure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-examples-azure-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-basic</artifactId>
Expand Down Expand Up @@ -72,7 +72,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;

import java.util.concurrent.TimeUnit;
Expand Down
4 changes: 2 additions & 2 deletions bigxml-split/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-bigxml-split</artifactId>
Expand Down Expand Up @@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions billboard-aggregate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-billboard-aggr</artifactId>
Expand Down Expand Up @@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.engine.PooledExchangeFactory;
import org.apache.camel.model.dataformat.BindyType;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions cafe-endpointdsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-cafe-endpointdsl</artifactId>
Expand Down Expand Up @@ -74,7 +74,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.camel.example.cafe.test.TestDrinkRouter;
import org.apache.camel.example.cafe.test.TestWaiter;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;

class CafeRouteBuilderTest extends CamelTestSupport {
Expand Down
4 changes: 2 additions & 2 deletions cafe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-cafe</artifactId>
Expand Down Expand Up @@ -89,7 +89,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.camel.example.cafe.test.TestDrinkRouter;
import org.apache.camel.example.cafe.test.TestWaiter;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;

import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
Expand Down
2 changes: 1 addition & 1 deletion cassandra-kubernetes/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ You should then see an output similar to this:
[INFO] k8s: 2020-08-07 12:34:38,012 [main ] INFO AbstractCamelContext - Apache Camel 3.8.0-SNAPSHOT (camel-1) is starting
[INFO] k8s: 2020-08-07 12:34:38,019 [main ] INFO AbstractCamelContext - StreamCaching is not in use. If using streams then its recommended to enable stream caching. See more details at http://camel.apache.org/stream-caching.html
[INFO] k8s: 2020-08-07 12:34:38,019 [main ] INFO AbstractCamelContext - Using HealthCheck: camel-health
[INFO] k8s: 2020-08-07 12:34:38,664 [main ] INFO DefaultMavenCoordinates - DataStax Java driver for Apache Cassandra(R) (com.datastax.oss:java-driver-core) version 4.18.0-SNAPSHOT
[INFO] k8s: 2020-08-07 12:34:38,664 [main ] INFO DefaultMavenCoordinates - DataStax Java driver for Apache Cassandra(R) (com.datastax.oss:java-driver-core) version 4.19.0-SNAPSHOT
[INFO] k8s: 2020-08-07 12:34:39,554 [s0-admin-0 ] INFO Clock - Using native clock for microsecond precision
[INFO] k8s: 2020-08-07 12:34:41,453 [main ] INFO InternalRouteStartupManager - Route: cassandra-route started and consuming from: timer://foo
[INFO] k8s: 2020-08-07 12:34:41,454 [main ] INFO AbstractCamelContext - Total 1 routes, of which 1 are started
Expand Down
2 changes: 1 addition & 1 deletion cassandra-kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>camel-examples</artifactId>
<version>4.18.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<artifactId>camel-example-cassandra-kubernetes</artifactId>
Expand Down
Loading