From 6008ecc581ec04d2a96b59d7c6dd0e542c828af0 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Tue, 16 Dec 2025 20:52:50 -0500 Subject: [PATCH 1/7] Upgrade to JUnit 6 --- components-starter/camel-avro-starter/pom.xml | 2 +- .../springboot/test/AvroGenericMarshaAndUnmarshaTest.java | 2 +- .../avro/springboot/test/AvroMarshalAndUnmarshallTest.java | 2 +- .../springboot/test/AvroMarshalAndUnmarshallXmlTest.java | 2 +- .../springboot/EarlyResolvedPropertiesTest.java | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel/aws/xray/starter/CamelAwsXRayCustomTest.java | 2 +- .../camel/aws/xray/starter/CamelAwsXRayDisabledTest.java | 2 +- .../apache/camel/aws/xray/starter/CamelAwsXRayNoopTest.java | 2 +- .../org/apache/camel/aws/xray/starter/CamelAwsXRayTest.java | 2 +- .../org/apache/camel/component/aws2/cw/CwComponentTest.java | 2 +- .../camel/component/aws2/ddb/Ddb2BatchGetItemsTest.java | 2 +- .../apache/camel/component/aws2/ddb/Ddb2DeleteItemTest.java | 2 +- .../camel/component/aws2/ddb/Ddb2DeleteTableTest.java | 2 +- .../camel/component/aws2/ddb/Ddb2DescribeTableRuleIT.java | 2 +- .../apache/camel/component/aws2/ddb/Ddb2GetItemTest.java | 2 +- .../org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java | 2 +- .../org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java | 2 +- .../apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java | 2 +- .../camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java | 2 +- .../camel/component/aws2/ddbstream/Ddb2StreamTest.java | 2 +- .../camel/component/aws2/kinesis/KinesisComponentTest.java | 2 +- .../apache/camel/component/aws2/s3/S3BatchConsumerTest.java | 2 +- .../org/apache/camel/component/aws2/s3/S3ComponentTest.java | 2 +- .../component/aws2/s3/S3CopyObjectCustomerKeyTest.java | 2 +- .../camel/component/aws2/s3/S3CopyObjectOperationTest.java | 2 +- .../aws2/s3/S3CreateDownloadLinkOperationTest.java | 2 +- .../camel/component/aws2/s3/S3ListObjectsOperationTest.java | 2 +- .../component/aws2/s3/S3MoveAfterReadConsumerTest.java | 2 +- .../component/aws2/s3/S3MultipartUploadOperationTest.java | 2 +- .../camel/component/aws2/s3/S3ObjectRangeOperationTest.java | 2 +- .../apache/camel/component/aws2/s3/S3PojoAsBodyTest.java | 2 +- .../aws2/s3/S3SimpleEncryptedUploadOperationTest.java | 2 +- .../component/aws2/s3/S3StreamUploadOperationTest.java | 2 +- .../component/aws2/sns/SnsAdvancedConfigurationTest.java | 2 +- .../camel/component/aws2/sns/SnsComponentFifoTest.java | 2 +- .../aws2/sns/SnsTopicProducerCustomConfigTest.java | 2 +- .../camel/component/aws2/sns/SnsTopicProducerTest.java | 2 +- .../aws2/sns/SnsTopicProducerWithSubscriptionTest.java | 2 +- .../component/aws2/sns/SnsTopicWithKmsEncryptionTest.java | 2 +- .../camel/component/aws2/sqs/JmsStyleSelectorTest.java | 2 +- .../apache/camel/component/aws2/sqs/SqsComponentTest.java | 2 +- .../apache/camel/component/aws2/sqs/SqsDeadletterTest.java | 2 +- .../camel/component/aws2/sqs/SqsDelayedQueueTest.java | 2 +- .../apache/camel/component/aws2/sqs/SqsOperationsTest.java | 2 +- .../component/aws2/sqs/SqsProducerAutoCreateQueueTest.java | 2 +- .../key/vault/springboot/EarlyResolvedPropertiesTest.java | 2 +- .../cassandra/integration/CassandraComponentBeanRefIT.java | 2 +- .../cassandra/integration/CassandraComponentConsumerIT.java | 2 +- .../cassandra/integration/CassandraComponentProducerIT.java | 2 +- .../integration/CassandraComponentProducerUnpreparedIT.java | 2 +- .../aggregate/cassandra/CassandraAggregationIT.java | 2 +- .../cassandra/CassandraAggregationRepositoryIT.java | 2 +- .../cassandra/CassandraAggregationSerializedHeadersIT.java | 2 +- .../cassandra/NamedCassandraAggregationRepositoryIT.java | 2 +- .../idempotent/cassandra/CassandraIdempotentIT.java | 2 +- .../cassandra/CassandraIdempotentRepositoryIT.java | 2 +- .../cassandra/NamedCassandraIdempotentRepositoryIT.java | 2 +- .../camel/component/cron/springboot/CronLoaderTest.java | 2 +- .../vault/springboot/EarlyResolvedPropertiesTest.java | 2 +- .../CacheConfigurationCustomizerEnabledAppendTest.java | 2 +- .../CacheConfigurationCustomizerEnabledReplaceTest.java | 2 +- .../CacheConfigurationCustomizerNotEnabledGlobalTest.java | 2 +- ...cheConfigurationCustomizerNotEnabledOnComponentTest.java | 2 +- .../CacheConfigurationCustomizerNotEnabledTest.java | 2 +- .../CacheManagerCustomizerEnabledOnComponentTest.java | 2 +- .../customizer/CacheManagerCustomizerEnabledTest.java | 2 +- .../customizer/CacheManagerCustomizerNoOverrideTest.java | 2 +- .../CacheManagerCustomizerNotEnabledGlobalTest.java | 2 +- .../CacheManagerCustomizerNotEnabledOnComponentTest.java | 2 +- .../customizer/CacheManagerCustomizerNotEnabledTest.java | 2 +- .../customizer/CacheManagerCustomizerOverrideTest.java | 2 +- .../springboot/customizer/CacheManagerCustomizerTest.java | 2 +- .../CacheManagerCustomizerWithoutCacheManagerTest.java | 2 +- components-starter/camel-fhir-starter/pom.xml | 2 +- .../org/apache/camel/component/fhir/FhirCapabilitiesIT.java | 2 +- .../apache/camel/component/fhir/FhirConfigurationIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirCreateIT.java | 2 +- .../component/fhir/FhirCustomClientConfigurationIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirDeleteIT.java | 2 +- .../apache/camel/component/fhir/FhirExtraParametersIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirHistoryIT.java | 2 +- .../org/apache/camel/component/fhir/FhirLoadPageIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirMetaIT.java | 2 +- .../org/apache/camel/component/fhir/FhirOperationIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirPatchIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirReadIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirSearchIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirSimpleIT.java | 2 +- .../org/apache/camel/component/fhir/FhirTransactionIT.java | 2 +- .../java/org/apache/camel/component/fhir/FhirUpdateIT.java | 2 +- .../org/apache/camel/component/fhir/FhirValidateIT.java | 2 +- .../camel/component/fhir/Hl7v2PatientToFhirPatientIT.java | 2 +- .../component/fhir/dataformat/FhirJsonDataFormatTest.java | 2 +- .../fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java | 2 +- .../component/fhir/dataformat/FhirXmlDataFormatTest.java | 2 +- .../fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java | 2 +- .../component/file/AntPathMatcherGenericFileFilterTest.java | 2 +- .../camel/component/file/FileBeginFailureOneTimeTest.java | 2 +- .../camel/component/file/FileBridgeErrorHandlerTest.java | 2 +- .../camel/component/file/FileBrowsableEndpointTest.java | 2 +- .../file/FileChangedReadLockMarkerFileFalseTest.java | 2 +- .../file/FileConsumerAbsolutePathDefaultMoveTest.java | 2 +- .../apache/camel/component/file/FileConsumerBatchTest.java | 2 +- .../component/file/FileConsumerFileExpressionTest.java | 2 +- .../camel/component/file/FileConsumerFileFilterTest.java | 2 +- .../camel/component/file/FileConsumerIdempotentTest.java | 2 +- .../component/file/FileConsumerMoveAndMoveFailureTest.java | 2 +- .../camel/component/file/FileConsumerPreMoveTest.java | 2 +- .../file/FileIdempotentReadLockWithFileIdempRepoTest.java | 2 +- .../component/file/FileIdempotentReadSameFileAgainTest.java | 2 +- .../camel/component/file/FileProduceTempPrefixTest.java | 2 +- .../component/file/FileProducerCharsetUTFtoISOTest.java | 2 +- .../camel/component/file/FileProducerExpressionTest.java | 2 +- .../component/file/FileProducerFileExistOverrideTest.java | 2 +- .../file/FileProducerOverruleToDifferentFolderTest.java | 2 +- .../file/FileProducerRecursivelayToDifferentFolderTest.java | 2 +- .../apache/camel/component/file/FileProducerStreamTest.java | 2 +- .../org/apache/camel/component/file/FileSorterRefTest.java | 2 +- .../camel/component/file/FileToFileWithFlattenTest.java | 2 +- .../component/file/FilerConsumerDoneFileNamePrefixTest.java | 2 +- .../component/file/FilerProducerDoneFileNameRouteTest.java | 2 +- .../component/file/FromFileMoveFileIfProcessFailsTest.java | 2 +- .../file/remote/springboot/ftp/FromFtpFilterTest.java | 2 +- .../remote/springboot/ftp/FromFtpMoveFileRecursiveTest.java | 2 +- .../file/remote/springboot/ftp/FromFtpToBinaryFileTest.java | 2 +- .../file/remote/springboot/ftp/FtpAnonymousTest.java | 2 +- .../springboot/ftp/FtpConsumerMaxMessagesPerPollTest.java | 2 +- .../file/remote/springboot/ftp/FtpEmbeddedService.java | 2 +- .../remote/springboot/ftp/FtpProducerConcurrentTest.java | 2 +- .../ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java | 2 +- .../ftp/FtpSimpleConsumeStreamingStepwiseTrueTest.java | 2 +- .../file/remote/springboot/ftp/FtpSoTimeoutTest.java | 2 +- .../ftps/FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +- .../ftps/FileToFtpsWithCustomTrustStorePropertiesTest.java | 2 +- .../component/file/remote/springboot/ftps/FtpsTest.java | 2 +- .../springboot/sftp/SftpConsumerLocalWorkDirectoryTest.java | 2 +- .../springboot/sftp/SftpKeyExchangeProtocolsTest.java | 2 +- .../springboot/sftp/SftpSimpleProduceThroughProxyTest.java | 2 +- .../file/remote/springboot/sftp/SftpUseListFalseTest.java | 2 +- .../manager/springboot/EarlyResolvedPropertiesTest.java | 2 +- components-starter/camel-gson-starter/pom.xml | 2 +- .../camel/component/gson/springboot/GsonConcurrentTest.java | 2 +- .../component/gson/springboot/GsonFieldNamePolicyTest.java | 2 +- .../component/gson/springboot/GsonJsonDataFormatTest.java | 2 +- .../component/gson/springboot/GsonMarshalExclusionTest.java | 2 +- .../component/gson/springboot/GsonMarshalListTest.java | 2 +- .../camel/component/gson/springboot/GsonMarshalTest.java | 2 +- .../gson/springboot/GsonUnmarshalTypeFromHeaderTest.java | 2 +- .../gson/springboot/SpringGsonFieldNamePolicyTest.java | 2 +- .../gson/springboot/SpringGsonJsonDataFormatTest.java | 2 +- .../springboot/SpringGsonUnmarshalTypeFromHeaderTest.java | 2 +- .../vault/springboot/EarlyResolvedPropertiesTest.java | 2 +- .../component/hl7/springboot/test/AckExpressionTest.java | 2 +- .../component/hl7/springboot/test/ConvertLineFeedTest.java | 2 +- .../hl7/springboot/test/HL7ByteArrayRouteTest.java | 2 +- .../component/hl7/springboot/test/HL7DataFormatTest.java | 2 +- .../hl7/springboot/test/HL7MLLPCodecBoundaryTest.java | 2 +- .../component/hl7/springboot/test/HL7MLLPCodecLongTest.java | 2 +- .../springboot/test/HL7MLLPCodecMessageFloodingTest.java | 2 +- .../hl7/springboot/test/HL7MLLPCodecPlainStringTest.java | 2 +- .../springboot/test/HL7MLLPCodecStandAndEndBytesTest.java | 2 +- .../component/hl7/springboot/test/HL7MLLPCodecTest.java | 2 +- .../hl7/springboot/test/HL7MLLPNettyCodecBoundaryTest.java | 2 +- .../test/HL7MLLPNettyCodecByteArrayRouteTest.java | 2 +- .../hl7/springboot/test/HL7MLLPNettyCodecLongTest.java | 2 +- .../test/HL7MLLPNettyCodecStandAndEndBytesTest.java | 2 +- .../hl7/springboot/test/HL7MLLPNettyCodecTest.java | 2 +- .../test/HL7MLLPNettyDecoderResourceLeakTest.java | 2 +- .../hl7/springboot/test/HL7MLLPNettyRouteToTest.java | 2 +- .../component/hl7/springboot/test/HL7NettyRouteTest.java | 2 +- .../camel/component/hl7/springboot/test/HL7RouteTest.java | 2 +- .../component/hl7/springboot/test/HL7ValidateTest.java | 2 +- .../component/hl7/springboot/test/HL7XmlDataFormatTest.java | 2 +- .../component/hl7/springboot/test/MessageValidatorTest.java | 2 +- .../component/hl7/springboot/test/TerserExpressionTest.java | 2 +- .../http/springboot/HttpComponentTimeoutConverterTest.java | 2 +- .../src/test/java/EarlyResolvedPropertiesTest.java | 2 +- components-starter/camel-infinispan-starter/pom.xml | 2 +- .../avro/springboot/test/JacksonAvroLookupResolverTest.java | 2 +- .../test/JacksonAvroMarshalUnmarshalJsonNodeTest.java | 2 +- .../test/JacksonAvroMarshalUnmarshalPojoListTest.java | 2 +- .../test/JacksonAvroMarshalUnmarshalPojoTest.java | 2 +- .../springboot/JacksonProtobufLookupResolverTest.java | 2 +- .../JacksonProtobufMarshalUnmarshalJsonNodeTest.java | 2 +- .../springboot/JacksonProtobufMarshalUnmarshalPojoTest.java | 2 +- .../jasypt/springboot/EarlyEncryptedPropertiesTest.java | 2 +- .../EncryptedPropertiesCustomConfigurationBeansTest.java | 2 +- ...yptedPropertiesDisabledCustomConfigurationBeansTest.java | 2 +- .../jasypt/springboot/EncryptedPropertiesDisabledTest.java | 2 +- ...dPropertiesIvGeneratorAutoDetectionBouncyCastleTest.java | 2 +- .../jasypt/springboot/EncryptedPropertiesTest.java | 2 +- components-starter/camel-jira-starter/pom.xml | 2 +- .../jira/springboot/test/AddCommentProducerTest.java | 2 +- .../jira/springboot/test/AddIssueLinkProducerTest.java | 2 +- .../jira/springboot/test/AddIssueProducerTest.java | 2 +- .../jira/springboot/test/AddWorkLogProducerTest.java | 2 +- .../jira/springboot/test/AttachFileProducerTest.java | 2 +- .../jira/springboot/test/DeleteIssueProducerTest.java | 2 +- .../jira/springboot/test/FetchCommentsProducerTest.java | 2 +- .../jira/springboot/test/FetchIssueProducerTest.java | 2 +- .../jira/springboot/test/NewCommentsConsumerTest.java | 2 +- .../jira/springboot/test/NewIssuesConsumerTest.java | 2 +- .../jira/springboot/test/TransitionIssueProducerTest.java | 2 +- .../jira/springboot/test/UpdateIssueProducerTest.java | 2 +- .../jira/springboot/test/WatchUpdatesConsumerTest.java | 2 +- .../component/jira/springboot/test/WatcherProducerTest.java | 2 +- components-starter/camel-jsonpath-starter/pom.xml | 2 +- .../springboot/test/EasyJsonPathWithRootSimpleCBRTest.java | 2 +- .../springboot/test/EasyJsonPathWithSimpleCBRTest.java | 2 +- .../springboot/test/JsonPathBeanStreamCachingTest.java | 2 +- .../springboot/test/JsonPathBeanSuppressExceptionsTest.java | 2 +- .../jsonpath/springboot/test/JsonPathBeanTest.java | 2 +- .../component/jsonpath/springboot/test/JsonPathCBRTest.java | 2 +- .../jsonpath/springboot/test/JsonPathCharsetTest.java | 2 +- .../springboot/test/JsonPathExchangePropertyTest.java | 2 +- .../jsonpath/springboot/test/JsonPathHeaderNameTest.java | 2 +- .../jsonpath/springboot/test/JsonPathLanguageTest.java | 2 +- .../jsonpath/springboot/test/JsonPathMapTransformTest.java | 4 ++-- .../jsonpath/springboot/test/JsonPathMockMatchesTest.java | 2 +- .../jsonpath/springboot/test/JsonPathPlatformHttpTest.java | 2 +- .../jsonpath/springboot/test/JsonPathPojoTransformTest.java | 2 +- .../jsonpath/springboot/test/JsonPathSourceTest.java | 2 +- .../jsonpath/springboot/test/JsonPathSplitTest.java | 2 +- .../springboot/test/JsonPathSplitWriteAsStringMapTest.java | 2 +- .../springboot/test/JsonPathSplitWriteAsStringTest.java | 2 +- .../springboot/test/JsonPathStreamCachingCBRTest.java | 2 +- .../jsonpath/springboot/test/JsonPathSuppressTest.java | 2 +- .../springboot/test/JsonPathTransformHeaderNameTest.java | 2 +- .../springboot/test/JsonPathTransformONielEscapedTest.java | 2 +- .../test/JsonPathTransformONielPlaceholderTest.java | 2 +- .../springboot/test/JsonPathTransformONielTest.java | 2 +- .../springboot/test/JsonPathTransformResultTypeTest.java | 2 +- .../jsonpath/springboot/test/JsonPathTransformTest.java | 2 +- .../jsonpath/springboot/test/JsonPathWithSimpleCBRTest.java | 2 +- .../jsonpath/springboot/test/SpringJsonPathCBRTest.java | 2 +- .../test/SpringJsonPathSplitWriteAsStringTest.java | 2 +- .../springboot/test/SpringJsonPathSuppressTest.java | 2 +- .../test/SpringJsonPathTransformHeaderNameTest.java | 2 +- .../test/SpringJsonPathTransformResultTypeTest.java | 2 +- .../springboot/test/SpringJsonPathTransformTest.java | 2 +- components-starter/camel-kafka-starter/pom.xml | 2 +- .../kafka/integration/KafkaConsumerAsyncManualCommitIT.java | 2 +- .../kafka/integration/KafkaConsumerBatchSizeIT.java | 2 +- .../component/kafka/integration/KafkaConsumerFullIT.java | 4 ++-- .../kafka/integration/KafkaConsumerLastRecordHeaderIT.java | 2 +- .../kafka/integration/KafkaConsumerManualCommitIT.java | 2 +- .../kafka/integration/KafkaConsumerRebalanceIT.java | 2 +- .../kafka/integration/KafkaConsumerTopicIsPatternIT.java | 2 +- .../component/kafka/integration/KafkaProducerFullIT.java | 4 ++-- .../camel/component/kafka/integration/KafkaToDIT.java | 2 +- .../apache/kafka/clients/consumer/KafkaConsumerTest.java | 2 +- components-starter/camel-kamelet-starter/pom.xml | 2 +- .../component/kamelet/springboot/KameletBasicTest.java | 2 +- .../component/kamelet/springboot/KameletComponentTest.java | 2 +- .../kamelet/springboot/KameletConsumeOnlyTest.java | 2 +- .../kamelet/springboot/KameletConsumerUoWIssueTest.java | 2 +- .../component/kamelet/springboot/KameletDiscoveryTest.java | 2 +- .../kamelet/springboot/KameletEipAggregateGroovyTest.java | 2 +- .../kamelet/springboot/KameletEipAggregateJoorTest.java | 2 +- .../kamelet/springboot/KameletEipAggregateTest.java | 2 +- .../component/kamelet/springboot/KameletEipFilterTest.java | 2 +- .../kamelet/springboot/KameletEipMulticastTest.java | 2 +- .../kamelet/springboot/KameletEipNoChildrenTest.java | 2 +- .../camel/component/kamelet/springboot/KameletEipTest.java | 2 +- .../kamelet/springboot/KameletGlobalPropertiesTest.java | 4 ++-- .../kamelet/springboot/KameletLocalBeanClassFourTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanClassTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanClassThreeTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanClassTwoTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanConfigureTest.java | 2 +- .../springboot/KameletLocalBeanGroovyExternalTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanGroovyTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanIoCTest.java | 2 +- .../springboot/KameletLocalBeanJoorExternalTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanLanguageTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanSupplierTest.java | 2 +- .../component/kamelet/springboot/KameletLocalBeanTest.java | 2 +- .../kamelet/springboot/KameletLocalBeanTypeTest.java | 2 +- .../component/kamelet/springboot/KameletLocationTest.java | 2 +- .../kamelet/springboot/KameletRecipientListTest.java | 2 +- .../component/kamelet/springboot/KameletRouteDumpTest.java | 2 +- .../component/kamelet/springboot/KameletRouteTest.java | 2 +- .../camel/component/kamelet/springboot/KameletToDTest.java | 2 +- .../component/kamelet/springboot/KameletUoWIssueTest.java | 2 +- .../component/kamelet/springboot/KameletValidationTest.java | 2 +- .../component/kamelet/springboot/KameletWireTapTest.java | 2 +- components-starter/camel-master-starter/pom.xml | 2 +- .../master/springboot/EndpointUriEncodingTest.java | 2 +- .../component/master/springboot/MasterComponentTest.java | 2 +- .../netty/springboot/NettyComponentConfigurationTest.java | 2 +- components-starter/camel-openapi-java-starter/pom.xml | 2 +- .../RestOpenApiModelApiSecurityRequirementsTest.java | 2 +- .../camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java | 2 +- .../apache/camel/openapi/RestOpenApiReaderApiDocsTest.java | 2 +- .../camel/openapi/RestOpenApiReaderContextPathTest.java | 2 +- .../camel/openapi/RestOpenApiReaderDayOfWeekTest.java | 2 +- .../openapi/RestOpenApiReaderEnableVendorExtensionTest.java | 2 +- .../openapi/RestOpenApiReaderFileResponseModelTest.java | 2 +- .../openapi/RestOpenApiReaderModelApiSecurityTest.java | 2 +- .../camel/openapi/RestOpenApiReaderModelBookOrderTest.java | 2 +- .../apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 +- .../openapi/RestOpenApiReaderPropertyPlaceholderTest.java | 2 +- .../org/apache/camel/openapi/RestOpenApiReaderTest.java | 2 +- .../camel/openapi/RestOpenApiV2SecuritySchemesTest.java | 2 +- .../camel/openapi/RestOpenApiV3SecuritySchemesTest.java | 2 +- .../SpringRestOpenApiReaderModelApiSecurityTest.java | 2 +- .../apache/camel/openapi/producer/RestOpenApiGetTest.java | 2 +- .../camel/openapi/producer/RestOpenApiGetUriParamTest.java | 2 +- .../opentelemetry/metrics/springboot/CounterRouteTest.java | 2 +- .../OpenTelemetryExchangeEventNotifierTest.java | 2 +- .../eventnotifier/OpenTelemetryRouteEventNotifierTest.java | 2 +- .../springboot/messagehistory/MessageHistoryTest.java | 2 +- .../routepolicy/OpenTelemetryContextOnlyPolicyTest.java | 2 +- .../routepolicy/OpenTelemetryRoutePolicyTest.java | 2 +- .../springboot/PlatformHttpAsyncRequestHandlingTest.java | 2 +- .../platform/http/springboot/PlatformHttpStreamingTest.java | 2 +- .../SpringBootPlatformHttpBridgedEndpointTest.java | 2 +- .../SpringBootPlatformHttpCamelIntegrationsTest.java | 2 +- .../SpringBootPlatformHttpCamelVirtualThreadsTest.java | 2 +- .../springboot/SpringBootPlatformHttpCertificationTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpCookiesTest.java | 2 +- .../SpringBootPlatformHttpCorsCredentialsTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpCorsTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpEngineTest.java | 2 +- .../SpringBootPlatformHttpHandleWriteErrorTest.java | 2 +- .../SpringBootPlatformHttpJacksonConverterTest.java | 2 +- .../SpringBootPlatformHttpMultipleExecutorsTest.java | 2 +- ...BootPlatformHttpMultipleExecutorsVirtualThreadsTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpOptionsTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpProxyTest.java | 2 +- .../SpringBootPlatformHttpRequestTimeoutTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpRestDSLTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpSessionTest.java | 2 +- .../springboot/SpringBootPlatformHttpSpringSessionTest.java | 2 +- .../http/springboot/SpringBootPlatformHttpTest.java | 2 +- .../springboot/SpringBootPlatformHttpTypeConverterTest.java | 2 +- .../springboot/SpringBootPlatformHttpValidationTest.java | 2 +- .../SpringBootPlatformHttpVirtualThreadsOptimizedTest.java | 2 +- .../SpringBootPlatformHttpVirtualThreadsTest.java | 2 +- .../quartz/springboot/DelegateEndpointQuartzTest.java | 2 +- .../springboot/FileConsumerQuartzSchedulerRestartTest.java | 2 +- .../quartz/springboot/FileConsumerQuartzSchedulerTest.java | 2 +- .../camel/component/quartz/springboot/FromFileBase.java | 2 +- .../quartz/springboot/FromFileQuartzSchedulerTest.java | 2 +- .../quartz/springboot/MultiplePoliciesOnRouteTest.java | 2 +- .../quartz/springboot/QuartUnderscoreTimerNameTest.java | 2 +- .../quartz/springboot/QuartzAddDynamicRouteTest.java | 2 +- .../QuartzAddRoutesAfterCamelContextStartedTest.java | 2 +- .../component/quartz/springboot/QuartzAutoStartTest.java | 2 +- .../component/quartz/springboot/QuartzCronMappingTest.java | 2 +- .../component/quartz/springboot/QuartzCronRoute2Test.java | 2 +- .../quartz/springboot/QuartzCronRouteDurableJobTest.java | 2 +- .../quartz/springboot/QuartzCronRouteFireNowTest.java | 2 +- .../component/quartz/springboot/QuartzCronRouteTest.java | 2 +- .../springboot/QuartzCronRouteWithSmallCacheTest.java | 2 +- .../quartz/springboot/QuartzCronTriggerRouteTest.java | 2 +- .../quartz/springboot/QuartzCustomCalendarFireTest.java | 2 +- .../quartz/springboot/QuartzCustomCalendarNoFireTest.java | 2 +- .../component/quartz/springboot/QuartzInterruptTest.java | 2 +- .../quartz/springboot/QuartzJobRouteUnderscoreTest.java | 2 +- .../component/quartz/springboot/QuartzManagementTest.java | 2 +- .../quartz/springboot/QuartzManuallyTriggerJobTest.java | 2 +- .../quartz/springboot/QuartzRepeatIntervalTest.java | 2 +- .../quartz/springboot/QuartzRouteFireNowOnlyOnceTest.java | 2 +- .../component/quartz/springboot/QuartzRouteFireNowTest.java | 2 +- .../component/quartz/springboot/QuartzRouteRestartTest.java | 2 +- .../camel/component/quartz/springboot/QuartzRouteTest.java | 2 +- .../component/quartz/springboot/QuartzSimpleRouteTest.java | 2 +- .../quartz/springboot/QuartzStatefulJobRouteTest.java | 2 +- .../component/quartz/springboot/QuartzStopRouteTest.java | 2 +- .../component/quartz/springboot/QuartzSuspendRouteTest.java | 2 +- .../quartz/springboot/QuartzTriggerParametersTest.java | 2 +- .../RouteAutoStopFalseCronScheduledPolicyTest.java | 2 +- .../springboot/SimpleScheduledCombinedRoutePolicyTest.java | 2 +- .../quartz/springboot/StatefulQuartzRouteTest.java | 2 +- .../test/ReactiveStreamsAutoConfigurationTest.java | 2 +- .../springboot/test/ReactiveStreamsDefaultEngineTest.java | 2 +- .../springboot/test/ReactiveStreamsNamedEngineTest.java | 2 +- .../springboot/test/ReactiveStreamsRegistryEngineTest.java | 2 +- .../apache/camel/model/rest/springboot/CamelRestTest.java | 2 +- .../component/salesforce/springboot/RawPayloadTest.java | 4 ++-- .../salesforce/springboot/SalesforceComponentTest.java | 2 +- .../xquery/springboot/BeanWithXQueryInjectionTest.java | 2 +- .../camel/language/xquery/springboot/FromFileBase.java | 2 +- .../springboot/SaxonLanguageExtensionFunctionsTest.java | 2 +- .../language/xquery/springboot/SaxonXPathSplitTest.java | 2 +- .../camel/language/xquery/springboot/SaxonXPathTest.java | 2 +- .../language/xquery/springboot/SoapPayloadBeanTest.java | 2 +- .../springboot/XPathHeaderEnableSaxonJavaDslTest.java | 2 +- .../xquery/springboot/XPathSplitChoicePerformanceTest.java | 2 +- .../language/xquery/springboot/XQueryConcurrencyTest.java | 2 +- .../camel/language/xquery/springboot/XQueryFilterTest.java | 2 +- .../xquery/springboot/XQueryFromFileExceptionTest.java | 6 +++--- .../language/xquery/springboot/XQueryFromFileTest.java | 2 +- .../XQueryHeaderNameResultTypeAndNamespaceTest.java | 2 +- .../language/xquery/springboot/XQueryHeaderNameTest.java | 2 +- .../xquery/springboot/XQueryLanguageFromFileTest.java | 2 +- .../xquery/springboot/XQueryPredicateFilterTest.java | 2 +- .../xquery/springboot/XQueryPropogateHeadersTest.java | 2 +- .../language/xquery/springboot/XQueryRecipientListTest.java | 2 +- .../language/xquery/springboot/XQueryResourceTest.java | 2 +- .../xquery/springboot/XQueryTransformIssueTest.java | 2 +- .../language/xquery/springboot/XQueryTransformTest.java | 2 +- .../language/xquery/springboot/XQueryTransformTextTest.java | 2 +- .../xquery/springboot/XQueryURLBasedConcurrencyTest.java | 2 +- .../language/xquery/springboot/XQueryWithExtensionTest.java | 2 +- .../language/xquery/springboot/XQueryWithFlworTest.java | 2 +- .../xquery/springboot/XQueryWithNamespacesFilterTest.java | 2 +- .../camel/component/slack/springboot/SlackProducerTest.java | 2 +- .../component/sql/SqlConsumerDynamicParameterTest.java | 2 +- .../sql/SqlEndpointMisconfigureDataSourceTest.java | 2 +- .../apache/camel/component/sql/SqlGeneratedKeysTest.java | 2 +- .../component/sql/SqlProducerExpressionParameterTest.java | 2 +- .../org/apache/camel/component/sql/SqlProducerInTest.java | 2 +- .../camel/component/sql/SqlProducerOutputHeaderTest.java | 2 +- .../component/sql/SqlProducerOutputTypeStreamListTest.java | 2 +- .../org/apache/camel/component/sql/SqlProducerToDTest.java | 2 +- .../camel/component/sql/SqlProducerUpdateHeadersTest.java | 2 +- .../component/sql/SqlProducerUseMessageBodyForSqlTest.java | 2 +- .../apache/camel/component/sql/SqlTransactedRouteTest.java | 2 +- .../JdbcAggregateRecoverDeadLetterChannelTest.java | 2 +- .../sql/aggregation/JdbcAggregateSerializedHeadersTest.java | 2 +- .../sql/aggregation/JdbcAggregateStoreAsTextTest.java | 2 +- .../idempotent/CustomizedJdbcMessageIdRepositoryTest.java | 2 +- .../sql/idempotent/JdbcCachedMessageIdRepositoryTest.java | 2 +- .../sql/idempotent/JdbcMessageIdRepositoryTest.java | 2 +- components-starter/camel-swift-starter/pom.xml | 2 +- .../camel/dataformat/swift/mt/SwiftMtDataFormatTest.java | 2 +- .../camel/dataformat/swift/mx/SwiftMxDataFormatTest.java | 2 +- .../component/telegram/springboot/TelegramChatBotTest.java | 2 +- .../springboot/TelegramComponentParametersTest.java | 2 +- .../telegram/springboot/TelegramConfigurationTest.java | 2 +- .../springboot/TelegramConsumerChannelPostTest.java | 2 +- .../springboot/TelegramConsumerEmptyResponseTest.java | 2 +- .../springboot/TelegramConsumerFallbackConversionTest.java | 2 +- ...elegramConsumerHealthCheckErrorDisabledConsumerTest.java | 2 +- .../springboot/TelegramConsumerHealthCheckErrorTest.java | 2 +- .../springboot/TelegramConsumerHealthCheckOkTest.java | 2 +- .../springboot/TelegramConsumerIncomingInlineQueryTest.java | 2 +- .../telegram/springboot/TelegramConsumerMappingTest.java | 2 +- .../springboot/TelegramConsumerMediaDocumentTest.java | 2 +- .../telegram/springboot/TelegramConsumerMediaGameTest.java | 2 +- .../telegram/springboot/TelegramConsumerMediaPhotoTest.java | 2 +- .../springboot/TelegramConsumerMediaStickerTest.java | 2 +- .../telegram/springboot/TelegramConsumerMediaVideoTest.java | 2 +- .../telegram/springboot/TelegramConsumerMultipleTest.java | 2 +- .../springboot/TelegramConsumerServiceErrorTest.java | 2 +- .../telegram/springboot/TelegramConsumerSingleTest.java | 2 +- .../springboot/TelegramProducerChatIdResolutionTest.java | 2 +- .../telegram/springboot/TelegramProducerLocationTest.java | 2 +- .../telegram/springboot/TelegramProducerMediaTest.java | 2 +- .../telegram/springboot/TelegramWebhookCallTest.java | 2 +- .../apache/camel/component/undertow/UndertowSSLTest.java | 2 +- .../component/validator/CustomSchemaFactoryFeatureTest.java | 2 +- .../camel/component/validator/FileValidatorRouteTest.java | 2 +- .../camel/component/validator/ValidatorBeanCallTest.java | 2 +- .../component/validator/ValidatorDtdAccessOffTest.java | 2 +- .../camel/component/validator/ValidatorDtdAccessOnTest.java | 2 +- .../validator/ValidatorEndpointClearCachedSchemaTest.java | 2 +- .../component/validator/ValidatorIllegalImportTest.java | 2 +- .../validator/ValidatorIncludeEncodingRouteTest.java | 2 +- .../validator/ValidatorIncludeRelativeRouteTest.java | 2 +- .../component/validator/ValidatorIncludeRouteTest.java | 2 +- .../component/validator/ValidatorLazyStartProducerTest.java | 2 +- .../validator/ValidatorResourceResolverFactoryTest.java | 2 +- .../camel/component/validator/ValidatorRootPathTest.java | 2 +- .../camel/component/validator/ValidatorRouteTest.java | 2 +- .../validator/ValidatorWithResourceResolverRouteTest.java | 2 +- .../component/vertx/http/springboot/VertxHttpSSLTest.java | 2 +- .../vertx/http/springboot/VertxWebsocketSSLGlobalTest.java | 2 +- .../vertx/http/springboot/VertxWebsocketSSLTest.java | 2 +- .../component/webhook/springboot/WebhookBasePathTest.java | 2 +- .../webhook/springboot/WebhookHttpBindingTest.java | 2 +- .../component/webhook/springboot/WebhookMultiRouteTest.java | 2 +- .../camel/component/webhook/springboot/WebhookPathTest.java | 2 +- .../webhook/springboot/WebhookUriEncodingTest.java | 2 +- .../AggregationStrategyWithFilenameHeaderTest.java | 4 ++-- .../springboot/AggregationStrategyWithPreservationTest.java | 4 ++-- .../springboot/ZipAggregationStrategyEmptyFileTest.java | 4 ++-- .../zipfile/springboot/ZipAggregationStrategyTest.java | 4 ++-- .../zipfile/springboot/ZipFileDataFormatTest.java | 6 +++--- .../zipfile/springboot/ZipFileIteratorDataFormatTest.java | 2 +- .../springboot/ZipFileMultipleFilesSplitterTest.java | 2 +- .../zipfile/springboot/ZipFileSplitAndDeleteTest.java | 4 ++-- .../zipfile/springboot/ZipFileSplitIteratorCorruptTest.java | 2 +- .../zipfile/springboot/ZipFileSplitOneFileTest.java | 4 ++-- .../zipfile/springboot/ZipSplitterRouteIssueTest.java | 4 ++-- .../dataformat/zipfile/springboot/ZipSplitterRouteTest.java | 2 +- components-starter/pom.xml | 4 +++- core/camel-spring-boot-xml/pom.xml | 2 +- .../spring/boot/xml/CamelNonInvasiveCamelContextTest.java | 2 +- .../spring/boot/xml/MixedBootAndXmlConfigurationTest.java | 2 +- .../camel/spring/boot/xml/MixedJavaDslAndXmlTest.java | 2 +- .../org/apache/camel/spring/boot/xml/MixedRestDslTest.java | 2 +- core/camel-spring-boot/pom.xml | 2 +- core/camel-spring-boot/src/main/docs/spring-boot.adoc | 6 +++--- .../org/apache/camel/spring/boot/CamelAnnotationsTest.java | 2 +- .../spring/boot/CamelAutoConfigurationPropertiesTest.java | 2 +- .../camel/spring/boot/CamelAutoConfigurationTest.java | 2 +- .../boot/CamelAutoConfigurationWithCompatPrefixTest.java | 2 +- .../boot/CamelAutoConfigurationWithMainPrefixTest.java | 2 +- .../camel/spring/boot/CamelConfigurationLocationsTest.java | 2 +- ...melConfigurationPostConstructAddRouteToRegistryTest.java | 2 +- .../apache/camel/spring/boot/CamelEventNotifierTest.java | 2 +- .../camel/spring/boot/CamelLambdaRouteBuilderTest.java | 2 +- .../org/apache/camel/spring/boot/CamelMainListenerTest.java | 2 +- .../camel/spring/boot/CamelSpringBootShutdownTest.java | 2 +- .../camel/spring/boot/CamelStartupConditionEnvTest.java | 2 +- .../org/apache/camel/spring/boot/CamelXmlRoutesTest.java | 2 +- .../spring/boot/CustomCamelCamelConfigurationTest.java | 2 +- .../camel/spring/boot/CustomShutdownStrategyTest.java | 2 +- .../camel/spring/boot/ExistingConversionServiceTest.java | 2 +- .../org/apache/camel/spring/boot/GlobalOptionsTest.java | 2 +- .../apache/camel/spring/boot/LogListenerDiscoveryTest.java | 2 +- .../java/org/apache/camel/spring/boot/NoConvertersTest.java | 2 +- .../test/java/org/apache/camel/spring/boot/PlainTest.java | 2 +- .../camel/spring/boot/SpringConverterDelegationTest.java | 2 +- .../apache/camel/spring/boot/SpringTypeConverterTest.java | 2 +- .../spring/boot/SupervisingRouteControllerRestartTest.java | 2 +- .../camel/spring/boot/SupervisingRouteControllerTest.java | 2 +- .../camel/spring/boot/ThreadPoolConfigurationTest.java | 2 +- .../camel/spring/boot/UuidGeneratorDiscoveryTest.java | 2 +- .../camel/spring/boot/XPathPropertyPlaceholderTest.java | 2 +- .../actuate/endpoint/CamelEndpointsGloballyEnabledTest.java | 2 +- .../endpoint/CamelRouteControllerEndpointEnabledTest.java | 2 +- ...eControllerEndpointGloballyDisabledAndReenabledTest.java | 2 +- .../actuate/endpoint/CamelRouteControllerEndpointTest.java | 2 +- .../endpoint/CamelRoutesEndpointControllerRouteTest.java | 2 +- .../actuate/endpoint/CamelRoutesEndpointEnabledTest.java | 2 +- .../endpoint/CamelRoutesEndpointReadOnlyOperationTest.java | 2 +- .../boot/actuate/endpoint/CamelRoutesEndpointTest.java | 2 +- .../endpoint/CamelRoutesEndpointWriteOperationTest.java | 2 +- .../camel/spring/boot/actuate/health/CamelHealthTest.java | 2 +- .../camel/spring/boot/actuate/health/CamelProbesTest.java | 2 +- .../camel/spring/boot/actuate/info/CamelInfoTest.java | 2 +- .../AutoStartupExcludePatternAnnotationTest.java | 4 ++-- .../boot/autostartup/AutoStartupExcludePatternTest.java | 2 +- .../cloud/CamelCloudServiceCallGlobalConfigurationTest.java | 2 +- .../boot/cloud/CamelCloudServiceCallRefExpressionTest.java | 2 +- .../cloud/CamelCloudServiceCallSimpleExpressionTest.java | 2 +- .../camel/spring/boot/cloud/CamelCloudServiceCallTest.java | 2 +- .../spring/boot/componentroute/ComponentRouteTest.java | 2 +- .../apache/camel/spring/boot/example/MyApplicationTest.java | 4 ++-- .../camel/spring/boot/issues/OverridePropertiesTest.java | 2 +- .../apache/camel/spring/boot/issues/RestDslPostTest.java | 2 +- .../org/apache/camel/spring/boot/issues/SimpleOgnlTest.java | 2 +- .../apache/camel/spring/boot/issues/StreamCachingTest.java | 2 +- .../camel/spring/boot/mockendpoints/AdviceWithTest.java | 4 ++-- .../MockEndpointsAndSkipDirtiesContextTest.java | 4 ++-- .../camel/spring/boot/mockendpoints/MockEndpointsTest.java | 4 ++-- .../org/apache/camel/spring/boot/routefilter/BarTest.java | 2 +- .../boot/routefilter/FooExcludeRouteAnnotationTest.java | 4 ++-- .../org/apache/camel/spring/boot/routefilter/FooTest.java | 2 +- .../camel/spring/boot/security/CamelSSLNoConfigTest.java | 2 +- .../apache/camel/spring/boot/stub/StubEndpointsTest.java | 4 ++-- .../camel/spring/boot/util/CamelPropertiesHelperTest.java | 2 +- .../apache/camel/spring/boot/util/GroupCondition1Test.java | 2 +- .../apache/camel/spring/boot/util/GroupCondition2Test.java | 2 +- .../apache/camel/spring/boot/util/GroupCondition3Test.java | 2 +- .../apache/camel/spring/boot/util/GroupCondition4Test.java | 2 +- .../boot/util/HierarchicalPropertiesEvaluatorTest.java | 2 +- .../camel/spring/boot/vault/AwsVaultConfigurationTest.java | 2 +- .../spring/boot/vault/AzureVaultConfigurationTest.java | 2 +- .../spring/boot/vault/CyberArkVaultConfigurationTest.java | 2 +- .../camel/spring/boot/vault/GcpVaultConfigurationTest.java | 2 +- .../boot/vault/HashicorpVaultCloudConfigurationTest.java | 2 +- .../spring/boot/vault/HashicorpVaultConfigurationTest.java | 2 +- .../boot/vault/IBMSecretsManagerVaultConfigurationTest.java | 2 +- .../vault/KubernetesConfigMapVaultConfigurationTest.java | 2 +- .../spring/boot/vault/KubernetesVaultConfigurationTest.java | 2 +- .../apache/camel/spring/boot/CamelVirtualThreadsTest.java | 2 +- .../camel/itest/springboot/command/UnitTestCommand.java | 1 + .../src/test/resources/application-pom-sb3.xml | 2 ++ tooling/camel-spring-boot-bom/pom.xml | 2 +- .../camel-spring-boot-config-generator-maven-plugin/pom.xml | 6 +++--- tooling/camel-spring-boot-generator-maven-plugin/pom.xml | 6 +++--- .../org/apache/camel/springboot/maven/BomGeneratorMojo.java | 2 +- 578 files changed, 610 insertions(+), 605 deletions(-) diff --git a/components-starter/camel-avro-starter/pom.xml b/components-starter/camel-avro-starter/pom.xml index 5509fa355669..47a441de66db 100644 --- a/components-starter/camel-avro-starter/pom.xml +++ b/components-starter/camel-avro-starter/pom.xml @@ -42,7 +42,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroGenericMarshaAndUnmarshaTest.java b/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroGenericMarshaAndUnmarshaTest.java index 80ce0e6fbcbc..900e6ad86349 100644 --- a/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroGenericMarshaAndUnmarshaTest.java +++ b/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroGenericMarshaAndUnmarshaTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallTest.java b/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallTest.java index 546db06ec3f9..6dc22846d49f 100644 --- a/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallTest.java +++ b/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallXmlTest.java b/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallXmlTest.java index e64dc1c6438d..660b71f712e2 100644 --- a/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallXmlTest.java +++ b/components-starter/camel-avro-starter/src/test/java/org/apache/camel/dataformat/avro/springboot/test/AvroMarshalAndUnmarshallXmlTest.java @@ -34,7 +34,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-aws-secrets-manager-starter/src/test/java/org/apache/camel/component/aws/secretsmanager/springboot/EarlyResolvedPropertiesTest.java b/components-starter/camel-aws-secrets-manager-starter/src/test/java/org/apache/camel/component/aws/secretsmanager/springboot/EarlyResolvedPropertiesTest.java index 733265f6af8b..80ee58c2c9b7 100644 --- a/components-starter/camel-aws-secrets-manager-starter/src/test/java/org/apache/camel/component/aws/secretsmanager/springboot/EarlyResolvedPropertiesTest.java +++ b/components-starter/camel-aws-secrets-manager-starter/src/test/java/org/apache/camel/component/aws/secretsmanager/springboot/EarlyResolvedPropertiesTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws.secretsmanager.springboot; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws-xray-starter/pom.xml b/components-starter/camel-aws-xray-starter/pom.xml index 575b91be91ab..e429365dcb07 100644 --- a/components-starter/camel-aws-xray-starter/pom.xml +++ b/components-starter/camel-aws-xray-starter/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayCustomTest.java b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayCustomTest.java index fbfaa72bcdc8..4f275ce6912b 100644 --- a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayCustomTest.java +++ b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayCustomTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.aws.xray.XRayTracer; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; diff --git a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayDisabledTest.java b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayDisabledTest.java index 4e16b384b4c6..45d7153e0eb2 100644 --- a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayDisabledTest.java +++ b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayDisabledTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.aws.xray.XRayTracer; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; diff --git a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayNoopTest.java b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayNoopTest.java index d98f338f0062..4193057d9134 100644 --- a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayNoopTest.java +++ b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayNoopTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.aws.xray.XRayTracer; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; diff --git a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTest.java b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTest.java index aca3ce72a0a4..ce669141497f 100644 --- a/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTest.java +++ b/components-starter/camel-aws-xray-starter/src/test/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.aws.xray.XRayTracer; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; diff --git a/components-starter/camel-aws2-cw-starter/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java b/components-starter/camel-aws2-cw-starter/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java index 26df03007793..8279a7c124d5 100644 --- a/components-starter/camel-aws2-cw-starter/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java +++ b/components-starter/camel-aws2-cw-starter/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -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.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2BatchGetItemsTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2BatchGetItemsTest.java index 0cad1986451a..2bd9b818bb4b 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2BatchGetItemsTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2BatchGetItemsTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteItemTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteItemTest.java index 06d143c236f6..7abed35192d7 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteItemTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteItemTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteTableTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteTableTest.java index 317feca221cb..82fecc89f6e8 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteTableTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DeleteTableTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DescribeTableRuleIT.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DescribeTableRuleIT.java index c8384021c988..64e3b48fbcfb 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DescribeTableRuleIT.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2DescribeTableRuleIT.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2GetItemTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2GetItemTest.java index 5d20b091f21a..98a8a3dec325 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2GetItemTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2GetItemTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java index 4a25a8cd0168..56bc19135526 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java index c3e70df87322..d43f4a2f1050 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java index 7bf678223e4f..1289c823c653 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java index b0bf35f28396..148097b6dad8 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.BaseDdb2; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java index bf9e5efa684d..b6134f32af7b 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java b/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java index 53d6684663f9..201f6c928686 100644 --- a/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java +++ b/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3BatchConsumerTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3BatchConsumerTest.java index 48907718078f..f71889b38cda 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3BatchConsumerTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3BatchConsumerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java index e8e32cf0d91d..48f21abe30c3 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java index f9f44b7607f5..e10345d5c659 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectOperationTest.java index f73b1c0970a6..60024318e785 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectOperationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java index 3838041911d7..b7d88ed16e30 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ListObjectsOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ListObjectsOperationTest.java index 1054ae7160f4..2ba32d6fb666 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ListObjectsOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ListObjectsOperationTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MoveAfterReadConsumerTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MoveAfterReadConsumerTest.java index 8dc9acbbe8de..28dfdc98100a 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MoveAfterReadConsumerTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MoveAfterReadConsumerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MultipartUploadOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MultipartUploadOperationTest.java index 4a8a9f4b07b9..7897fb607f07 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MultipartUploadOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3MultipartUploadOperationTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java index e0e0a834f3d6..5ef9dd143348 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3PojoAsBodyTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3PojoAsBodyTest.java index 751b1957e369..71a43149ae09 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3PojoAsBodyTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3PojoAsBodyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3SimpleEncryptedUploadOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3SimpleEncryptedUploadOperationTest.java index 2a7c380c3d86..5ae7d3904ebc 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3SimpleEncryptedUploadOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3SimpleEncryptedUploadOperationTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3StreamUploadOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3StreamUploadOperationTest.java index bf0166a18154..6ed146428daf 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3StreamUploadOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3StreamUploadOperationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsAdvancedConfigurationTest.java b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsAdvancedConfigurationTest.java index 8fb5d146f6a7..7dddd917e424 100644 --- a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsAdvancedConfigurationTest.java +++ b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsAdvancedConfigurationTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -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.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentFifoTest.java b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentFifoTest.java index 0bcfcf181641..56c6d3c2af86 100644 --- a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentFifoTest.java +++ b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentFifoTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerCustomConfigTest.java b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerCustomConfigTest.java index c743f63f44d4..4beb0afa28a3 100644 --- a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerCustomConfigTest.java +++ b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerCustomConfigTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerTest.java b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerTest.java index 566418aa5602..e801bc52a9f6 100644 --- a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerTest.java +++ b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.common.SharedNameGenerator; import org.apache.camel.test.infra.common.TestEntityNameGenerator; -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.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerWithSubscriptionTest.java b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerWithSubscriptionTest.java index 522174f810cd..dcc2a491b7f6 100644 --- a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerWithSubscriptionTest.java +++ b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicProducerWithSubscriptionTest.java @@ -25,7 +25,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.common.SharedNameGenerator; import org.apache.camel.test.infra.common.TestEntityNameGenerator; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicWithKmsEncryptionTest.java b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicWithKmsEncryptionTest.java index 360ddfc1ffb6..8c8dbfb568d0 100644 --- a/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicWithKmsEncryptionTest.java +++ b/components-starter/camel-aws2-sns-starter/src/test/java/org/apache/camel/component/aws2/sns/SnsTopicWithKmsEncryptionTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java index 98b8d5e878af..522f0cae3fc9 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java index 52329660c676..0fc01753362c 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java index ca0fdc91aba7..17c72c82ed21 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDelayedQueueTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDelayedQueueTest.java index 43c5bd8c69a2..cb1d8ea8a5dc 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDelayedQueueTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDelayedQueueTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java index 1d0e4b4ff439..7093e9582ed1 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java index 58c9f73c5fb5..1512fd142868 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; -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.Disabled; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-azure-key-vault-starter/src/test/java/org/apache/camel/component/azure/key/vault/springboot/EarlyResolvedPropertiesTest.java b/components-starter/camel-azure-key-vault-starter/src/test/java/org/apache/camel/component/azure/key/vault/springboot/EarlyResolvedPropertiesTest.java index 80641f4aecf8..e6967c3581bc 100644 --- a/components-starter/camel-azure-key-vault-starter/src/test/java/org/apache/camel/component/azure/key/vault/springboot/EarlyResolvedPropertiesTest.java +++ b/components-starter/camel-azure-key-vault-starter/src/test/java/org/apache/camel/component/azure/key/vault/springboot/EarlyResolvedPropertiesTest.java @@ -24,7 +24,7 @@ import com.azure.security.keyvault.secrets.models.DeletedSecret; import com.azure.security.keyvault.secrets.models.KeyVaultSecret; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentBeanRefIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentBeanRefIT.java index 56379b472ef8..0e7b2c98d34e 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentBeanRefIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentBeanRefIT.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java index 3badd4111dbd..5ede28668ada 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java index bb35ad654a9a..1fd8fa26c368 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java @@ -49,7 +49,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java index b9676f0b9da2..f8ede118dbc9 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationIT.java index 72da6f8139ed..686818f0cbcf 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationIT.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java index 940d6bd93f07..b2341119a792 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersIT.java index c7daf2422638..c095b1991749 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersIT.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java index cc167d2e8307..c31bfbdd8124 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentIT.java index 752171d8cd4b..f6be863d74ce 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentIT.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java index 74268b493c11..2c8fa82209a4 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java index 4cd3e44c7377..0366f6099f07 100644 --- a/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java +++ b/components-starter/camel-cassandraql-starter/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-cron-starter/src/test/java/org/apache/camel/component/cron/springboot/CronLoaderTest.java b/components-starter/camel-cron-starter/src/test/java/org/apache/camel/component/cron/springboot/CronLoaderTest.java index 866ed34c829d..6948faeb022f 100644 --- a/components-starter/camel-cron-starter/src/test/java/org/apache/camel/component/cron/springboot/CronLoaderTest.java +++ b/components-starter/camel-cron-starter/src/test/java/org/apache/camel/component/cron/springboot/CronLoaderTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-cyberark-vault-starter/src/test/java/org/apache/camel/component/cyberark/vault/springboot/EarlyResolvedPropertiesTest.java b/components-starter/camel-cyberark-vault-starter/src/test/java/org/apache/camel/component/cyberark/vault/springboot/EarlyResolvedPropertiesTest.java index 05afecdf83a8..4e84e3293fce 100644 --- a/components-starter/camel-cyberark-vault-starter/src/test/java/org/apache/camel/component/cyberark/vault/springboot/EarlyResolvedPropertiesTest.java +++ b/components-starter/camel-cyberark-vault-starter/src/test/java/org/apache/camel/component/cyberark/vault/springboot/EarlyResolvedPropertiesTest.java @@ -19,7 +19,7 @@ import org.apache.camel.component.cyberark.vault.client.ConjurClient; import org.apache.camel.component.cyberark.vault.client.ConjurClientFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledAppendTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledAppendTest.java index 87543fc1f0ae..05bd282e7f38 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledAppendTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledAppendTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Ordered; import org.apache.camel.component.ehcache.EhcacheComponent; import org.apache.camel.spi.ComponentCustomizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.ehcache.config.CacheConfiguration; import org.ehcache.config.builders.CacheConfigurationBuilder; import org.ehcache.config.builders.ResourcePoolsBuilder; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledReplaceTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledReplaceTest.java index b15c13b2527c..9f5901e612d0 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledReplaceTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerEnabledReplaceTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Ordered; import org.apache.camel.component.ehcache.EhcacheComponent; import org.apache.camel.spi.ComponentCustomizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.ehcache.config.CacheConfiguration; import org.ehcache.config.builders.CacheConfigurationBuilder; import org.ehcache.config.builders.ResourcePoolsBuilder; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledGlobalTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledGlobalTest.java index cc6591c6bbf7..311313a591fa 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledGlobalTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledGlobalTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledOnComponentTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledOnComponentTest.java index be016864f067..5a5d59c3f572 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledOnComponentTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledOnComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledTest.java index 4c0bcfdc14ad..ce6d2192d79d 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheConfigurationCustomizerNotEnabledTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledOnComponentTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledOnComponentTest.java index 273bab244bc3..5a154646b519 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledOnComponentTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledOnComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledTest.java index 43f38b0eb455..1f256a8365a8 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerEnabledTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNoOverrideTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNoOverrideTest.java index 4446bf3315ee..0df42c4cbfb9 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNoOverrideTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNoOverrideTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.ehcache.springboot.EhcacheComponentAutoConfiguration; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.ehcache.CacheManager; import org.ehcache.config.builders.CacheManagerBuilder; import org.junit.jupiter.api.Assertions; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledGlobalTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledGlobalTest.java index 60922e9cd023..f65dd99695b2 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledGlobalTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledGlobalTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledOnComponentTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledOnComponentTest.java index 7f8e276603f3..efe90e0addde 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledOnComponentTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledOnComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledTest.java index ce5d102df621..59ab9c3af383 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerNotEnabledTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ehcache.springboot.customizer; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerOverrideTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerOverrideTest.java index 3836c2a70f35..6f55699d74e8 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerOverrideTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerOverrideTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.ehcache.springboot.EhcacheComponentAutoConfiguration; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.ehcache.CacheManager; import org.ehcache.config.builders.CacheManagerBuilder; import org.junit.jupiter.api.Assertions; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerTest.java index 560344df740b..07ccdaa494a8 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.ehcache.EhcacheComponent; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.ehcache.CacheManager; import org.ehcache.config.builders.CacheManagerBuilder; import org.junit.jupiter.api.Assertions; diff --git a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerWithoutCacheManagerTest.java b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerWithoutCacheManagerTest.java index b9494000569b..4e5ee265ced0 100644 --- a/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerWithoutCacheManagerTest.java +++ b/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizerWithoutCacheManagerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.ehcache.EhcacheComponent; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-fhir-starter/pom.xml b/components-starter/camel-fhir-starter/pom.xml index 1ce2e4ebb95a..5151cf46b158 100644 --- a/components-starter/camel-fhir-starter/pom.xml +++ b/components-starter/camel-fhir-starter/pom.xml @@ -42,7 +42,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java index 085bf67c945f..98596ad24dc4 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirCapabilitiesApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.CapabilityStatement; import org.hl7.fhir.r4.model.Enumerations; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java index 098c806580cf..2dd87e26ff1e 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java @@ -30,7 +30,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; import org.apache.camel.support.PluginHelper; -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.condition.DisabledIfSystemProperty; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java index cbfaf42698b4..760e5e06a5a7 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirCreateApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.HumanName; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java index f590bf05a88a..afde60ee7671 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java @@ -52,7 +52,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirCreateApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java index 9e72ea81e3cc..912f6cb7f175 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirDeleteApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.slf4j.Logger; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java index f57620827ae1..74cab36cff50 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirSearchApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java index 78dae648dfbc..5ea16345dcd0 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirHistoryApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java index 23d4b805416d..7ad3d66b1913 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirLoadPageApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Bundle; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java index 5cfeb20d5935..a9dbf518588c 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirMetaApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseMetaType; import org.hl7.fhir.r4.model.Meta; import org.hl7.fhir.r4.model.Patient; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java index 2b0552113621..899066cceb07 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java @@ -22,7 +22,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirOperationApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Parameters; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java index 94227e05a90a..f28888ee90d8 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirPatchApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Patient; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java index 58124a070881..d9363c6d9634 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirReadApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java index 38fd2a2402d3..a839908eec6f 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java @@ -20,7 +20,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirSearchApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java index 04d6928d92c9..6adc8ea4a063 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java @@ -22,7 +22,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirCreateApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.HumanName; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java index ccc2e53b5f78..f0daf8ac15ab 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirTransactionApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.HumanName; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java index a0b46e2b5d32..825ae036961b 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirUpdateApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java index 3c2512640766..121784314ff5 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java @@ -21,7 +21,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirValidateApiMethod; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.HumanName; import org.hl7.fhir.r4.model.Narrative; import org.hl7.fhir.r4.model.OperationOutcome; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java index e906b02dc80b..021a8a1c6416 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java index 4b440acbb8f7..594b54f8bb75 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.Base; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java index 874d125d0293..66f99ac0a233 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.fhir.FhirJsonDataFormat; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java index 54eeb06556ac..4b30f0166ca4 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.Base; diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java index cbd616c60269..030d28e20da8 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.fhir.FhirXmlDataFormat; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java index c41af2d9af0d..55257cd23e3b 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java index a917cd34b1ca..c287ac735b73 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBridgeErrorHandlerTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBridgeErrorHandlerTest.java index 25d4e6d4ddaa..f467c42b45dc 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBridgeErrorHandlerTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBridgeErrorHandlerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java index 286989406a97..248b4cf53d2e 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; -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.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java index 2b8277999e85..0cea312ced69 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.junit.jupiter.api.parallel.Isolated; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java index 025197f34e63..0275baaddd95 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java index dc61e10b834d..52d15d130d42 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java index f531bd41c017..a400cb693c58 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java index a0ab653b489b..aa694cc92f93 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java index 920a7fc7bb1b..99f71ed5e2e2 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java index d96104030f48..25b02311cbe6 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java index 6e1acb663120..9b17d147effa 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadLockWithFileIdempRepoTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadLockWithFileIdempRepoTest.java index 3dbbba65203f..651eec96fdb4 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadLockWithFileIdempRepoTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadLockWithFileIdempRepoTest.java @@ -25,7 +25,7 @@ import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.processor.idempotent.FileIdempotentRepository; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java index c966c1938f11..158e6786df25 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java index bc8786659242..13ff626b48c9 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOTest.java index 1bf8010f5326..4cc1f0e0e736 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java index 890954041bcb..020ed2a010a5 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java index 7f6169a3087d..ac4514f63c9d 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerOverruleToDifferentFolderTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerOverruleToDifferentFolderTest.java index 5caa981c6bb8..dbe5a705d1e5 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerOverruleToDifferentFolderTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerOverruleToDifferentFolderTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerRecursivelayToDifferentFolderTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerRecursivelayToDifferentFolderTest.java index cb6116676b0d..1e891c80d4a5 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerRecursivelayToDifferentFolderTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerRecursivelayToDifferentFolderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerStreamTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerStreamTest.java index 29e10bbe39de..eb15b4c294f8 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerStreamTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileProducerStreamTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java index 0b43e7d43b34..3c6a8255249b 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java index 4ce5bcd9dffa..4f12d3859576 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNamePrefixTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNamePrefixTest.java index 29b99b6d828f..238eac247589 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNamePrefixTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNamePrefixTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java index c03347decad9..b6ae9b4b455d 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java index b2279b248e19..363012eccef5 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpFilterTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpFilterTest.java index e2f71260b067..8b3f13302bab 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpFilterTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpFilterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.file.GenericFileFilter; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpMoveFileRecursiveTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpMoveFileRecursiveTest.java index 5aa47ee0f537..7be92d0c0a02 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpMoveFileRecursiveTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpMoveFileRecursiveTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpToBinaryFileTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpToBinaryFileTest.java index 7dd1d1b54165..bee7158fad1e 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpToBinaryFileTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FromFtpToBinaryFileTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpAnonymousTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpAnonymousTest.java index 897c261510b9..f8f55b3dc339 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpAnonymousTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpAnonymousTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpConsumerMaxMessagesPerPollTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpConsumerMaxMessagesPerPollTest.java index 6e845cab695c..500fce3b7cdc 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpConsumerMaxMessagesPerPollTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpConsumerMaxMessagesPerPollTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java index 9dab41e88322..ffece0b57ad0 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java @@ -47,7 +47,7 @@ import java.util.Set; import java.util.function.BiConsumer; -import static org.apache.camel.test.junit5.TestSupport.createCleanDirectory; +import static org.apache.camel.test.junit6.TestSupport.createCleanDirectory; public class FtpEmbeddedService extends AbstractTestService implements FtpService { protected static final String DEFAULT_LISTENER = "default"; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpProducerConcurrentTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpProducerConcurrentTest.java index 0dee5c692ba9..d5daacc9f673 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpProducerConcurrentTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpProducerConcurrentTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java index f7d576f66ae3..96c84adf2d90 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.file.GenericFile; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseTrueTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseTrueTest.java index 205ae0a57d71..4832477f590a 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseTrueTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseTrueTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSoTimeoutTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSoTimeoutTest.java index 511a733aa4fe..5fc229fbcc7d 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSoTimeoutTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSoTimeoutTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.commons.net.ftp.FTPClient; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsImplicitSSLWithClientAuthTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsImplicitSSLWithClientAuthTest.java index 9b6dde9e22ad..c65b214c3258 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsImplicitSSLWithClientAuthTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsImplicitSSLWithClientAuthTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.BaseFtp; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsWithCustomTrustStorePropertiesTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsWithCustomTrustStorePropertiesTest.java index e2400ea7e2cf..41aaf7d9dd27 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsWithCustomTrustStorePropertiesTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FileToFtpsWithCustomTrustStorePropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.BaseFtp; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FtpsTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FtpsTest.java index 9aeb7f10e94e..908dd540fb8f 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FtpsTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftps/FtpsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.BaseFtp; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpConsumerLocalWorkDirectoryTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpConsumerLocalWorkDirectoryTest.java index f74e34647fb1..517164a9961f 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpConsumerLocalWorkDirectoryTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpConsumerLocalWorkDirectoryTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.BaseFtp; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpKeyExchangeProtocolsTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpKeyExchangeProtocolsTest.java index e2e51b33ba5d..a685a83d61c0 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpKeyExchangeProtocolsTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpKeyExchangeProtocolsTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.FtpAnonymousTest; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpSimpleProduceThroughProxyTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpSimpleProduceThroughProxyTest.java index 013f8256ee42..f374ff153eef 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpSimpleProduceThroughProxyTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpSimpleProduceThroughProxyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.BaseFtp; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpUseListFalseTest.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpUseListFalseTest.java index b8a082b36028..c5b6f0ee4f14 100644 --- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpUseListFalseTest.java +++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/sftp/SftpUseListFalseTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.file.remote.springboot.ftp.BaseFtp; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-google-secret-manager-starter/src/test/java/org/apache/camel/component/google/secret/manager/springboot/EarlyResolvedPropertiesTest.java b/components-starter/camel-google-secret-manager-starter/src/test/java/org/apache/camel/component/google/secret/manager/springboot/EarlyResolvedPropertiesTest.java index 9d3313a0f466..1d1bb647d0b7 100644 --- a/components-starter/camel-google-secret-manager-starter/src/test/java/org/apache/camel/component/google/secret/manager/springboot/EarlyResolvedPropertiesTest.java +++ b/components-starter/camel-google-secret-manager-starter/src/test/java/org/apache/camel/component/google/secret/manager/springboot/EarlyResolvedPropertiesTest.java @@ -25,7 +25,7 @@ import com.google.cloud.secretmanager.v1.SecretPayload; import com.google.protobuf.ByteString; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components-starter/camel-gson-starter/pom.xml b/components-starter/camel-gson-starter/pom.xml index b4a13785d322..fe45bf20041f 100644 --- a/components-starter/camel-gson-starter/pom.xml +++ b/components-starter/camel-gson-starter/pom.xml @@ -42,7 +42,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonConcurrentTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonConcurrentTest.java index 534a21e4c69a..935323883c45 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonConcurrentTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonConcurrentTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonFieldNamePolicyTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonFieldNamePolicyTest.java index 5e80c7d3619e..065fa991db84 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonFieldNamePolicyTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonFieldNamePolicyTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonJsonDataFormatTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonJsonDataFormatTest.java index 44c527908941..1224f6803252 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonJsonDataFormatTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonJsonDataFormatTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalExclusionTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalExclusionTest.java index d6313844a1bb..6ffcdcf9b32b 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalExclusionTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalExclusionTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalListTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalListTest.java index 161ec53bc4e9..12592ea71f5b 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalListTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalListTest.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalTest.java index 5adc1f16bb73..81cd052b6f91 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonMarshalTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonUnmarshalTypeFromHeaderTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonUnmarshalTypeFromHeaderTest.java index 91cb7ca563e7..f4e61e250097 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonUnmarshalTypeFromHeaderTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/GsonUnmarshalTypeFromHeaderTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonFieldNamePolicyTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonFieldNamePolicyTest.java index 6707d1a0559b..34070ddc487d 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonFieldNamePolicyTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonFieldNamePolicyTest.java @@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonJsonDataFormatTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonJsonDataFormatTest.java index a88470ea8a25..10cffff71f53 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonJsonDataFormatTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonJsonDataFormatTest.java @@ -30,7 +30,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonUnmarshalTypeFromHeaderTest.java b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonUnmarshalTypeFromHeaderTest.java index d8645a5afebc..4e9794f70fad 100644 --- a/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonUnmarshalTypeFromHeaderTest.java +++ b/components-starter/camel-gson-starter/src/test/java/org/apache/camel/component/gson/springboot/SpringGsonUnmarshalTypeFromHeaderTest.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hashicorp-vault-starter/src/test/java/org/apache/camel/component/hashicorp/vault/springboot/EarlyResolvedPropertiesTest.java b/components-starter/camel-hashicorp-vault-starter/src/test/java/org/apache/camel/component/hashicorp/vault/springboot/EarlyResolvedPropertiesTest.java index 36ab4f86665e..1cd9578dda63 100644 --- a/components-starter/camel-hashicorp-vault-starter/src/test/java/org/apache/camel/component/hashicorp/vault/springboot/EarlyResolvedPropertiesTest.java +++ b/components-starter/camel-hashicorp-vault-starter/src/test/java/org/apache/camel/component/hashicorp/vault/springboot/EarlyResolvedPropertiesTest.java @@ -19,7 +19,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpServiceFactory; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpVaultService; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/AckExpressionTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/AckExpressionTest.java index cc8537a16d18..cc1f442f0981 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/AckExpressionTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/AckExpressionTest.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/ConvertLineFeedTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/ConvertLineFeedTest.java index 8e7e7093bfd1..8c5fe824d468 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/ConvertLineFeedTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/ConvertLineFeedTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ByteArrayRouteTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ByteArrayRouteTest.java index a7559595a571..b9c836fa89a9 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ByteArrayRouteTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ByteArrayRouteTest.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java index 780fe5c1fb53..4d46f10a951e 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java @@ -45,7 +45,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecBoundaryTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecBoundaryTest.java index 67c3c71eb1e6..42f5ae4c27e9 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecBoundaryTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecBoundaryTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecLongTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecLongTest.java index 8b32d904369a..725de3913aca 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecLongTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecLongTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecMessageFloodingTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecMessageFloodingTest.java index e64e41f1bd26..ca7b10a72fc7 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecMessageFloodingTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecMessageFloodingTest.java @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecPlainStringTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecPlainStringTest.java index 430b167b9a17..6f93bcff62a6 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecPlainStringTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecPlainStringTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecStandAndEndBytesTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecStandAndEndBytesTest.java index aa65edcdba87..fe2f226a0f2c 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecStandAndEndBytesTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecStandAndEndBytesTest.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecTest.java index 57dc488cc7b7..756a034e6903 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPCodecTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecBoundaryTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecBoundaryTest.java index 0befd3a7a847..04da2ffff9c2 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecBoundaryTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecBoundaryTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecByteArrayRouteTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecByteArrayRouteTest.java index 05fd0e5381dc..c7a8362beb05 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecByteArrayRouteTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecByteArrayRouteTest.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecLongTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecLongTest.java index 206100f9fe95..ea2c505aa043 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecLongTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecLongTest.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecStandAndEndBytesTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecStandAndEndBytesTest.java index 81ae8003f193..5bc30c767f80 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecStandAndEndBytesTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecStandAndEndBytesTest.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecTest.java index aa179373e26b..b2665c5ec98b 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyCodecTest.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyDecoderResourceLeakTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyDecoderResourceLeakTest.java index de5de1155cfd..d55c3ccb3755 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyDecoderResourceLeakTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyDecoderResourceLeakTest.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyRouteToTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyRouteToTest.java index 1745f916e5a3..0dfe776720ab 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyRouteToTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7MLLPNettyRouteToTest.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7NettyRouteTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7NettyRouteTest.java index 232b6f719d41..d429d13643f9 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7NettyRouteTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7NettyRouteTest.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7RouteTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7RouteTest.java index bd79b24740f6..841d5e539555 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7RouteTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7RouteTest.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java index baff17dc0a75..1ba740c3cc56 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java @@ -51,7 +51,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7XmlDataFormatTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7XmlDataFormatTest.java index cf0de87ccc78..88bbee69b465 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7XmlDataFormatTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7XmlDataFormatTest.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/MessageValidatorTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/MessageValidatorTest.java index 9e378b3a8164..36d5c0674310 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/MessageValidatorTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/MessageValidatorTest.java @@ -46,7 +46,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/TerserExpressionTest.java b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/TerserExpressionTest.java index 050928f427d6..b6179d0b6a10 100644 --- a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/TerserExpressionTest.java +++ b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/TerserExpressionTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java b/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java index da9f149717ef..a3b5c5aeb929 100644 --- a/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java +++ b/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpComponent; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.impl.bootstrap.HttpServer; import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap; diff --git a/components-starter/camel-ibm-secrets-manager-starter/src/test/java/EarlyResolvedPropertiesTest.java b/components-starter/camel-ibm-secrets-manager-starter/src/test/java/EarlyResolvedPropertiesTest.java index 72e6ccbce7d8..c45f41581934 100644 --- a/components-starter/camel-ibm-secrets-manager-starter/src/test/java/EarlyResolvedPropertiesTest.java +++ b/components-starter/camel-ibm-secrets-manager-starter/src/test/java/EarlyResolvedPropertiesTest.java @@ -25,7 +25,7 @@ import com.ibm.cloud.secrets_manager_sdk.secrets_manager.v2.model.Secret; import org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.ObjectHelper; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; diff --git a/components-starter/camel-infinispan-starter/pom.xml b/components-starter/camel-infinispan-starter/pom.xml index 029c48254de4..b99495adba4e 100644 --- a/components-starter/camel-infinispan-starter/pom.xml +++ b/components-starter/camel-infinispan-starter/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java index bba78d440951..13615cb6e50e 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java index d8338423e830..5eae9091e0f1 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java index 1d68d7be1bb6..d0ea2930d40e 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java index 6157fc0bd6f5..3b9bf5d93b6c 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java index 17da17f0346f..ce5dc981bcac 100644 --- a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java +++ b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java index 0cf36c845e31..575eaefee0bf 100644 --- a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java +++ b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java index 4dbbd505c28d..68c906a07986 100644 --- a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java +++ b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EarlyEncryptedPropertiesTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EarlyEncryptedPropertiesTest.java index dd04c29dd941..0b3935069324 100644 --- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EarlyEncryptedPropertiesTest.java +++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EarlyEncryptedPropertiesTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jasypt.springboot; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java index 704845d52cf9..46c51c823033 100644 --- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java +++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java @@ -20,7 +20,7 @@ import java.util.Properties; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; import org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig; import org.jasypt.iv.RandomIvGenerator; diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java index 321cbc363028..2dc21abe2b71 100644 --- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java +++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jasypt.springboot; -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.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java index 03777ae7124a..c9e4d7a9423a 100644 --- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java +++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java @@ -24,7 +24,7 @@ import static org.apache.camel.component.jasypt.springboot.Constants.START_URI_TEST_ENCRYPTED_PROPS_IN_CC; import static org.apache.camel.component.jasypt.springboot.Constants.START_URI_TEST_ENCRYPTED_PROPS_OUT_CC; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesIvGeneratorAutoDetectionBouncyCastleTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesIvGeneratorAutoDetectionBouncyCastleTest.java index cdf8b9b41472..2eaea705f41d 100644 --- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesIvGeneratorAutoDetectionBouncyCastleTest.java +++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesIvGeneratorAutoDetectionBouncyCastleTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jasypt.springboot; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.jasypt.registry.AlgorithmRegistry; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java index 54495d2145ee..f05c62c60a47 100644 --- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java +++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jasypt.springboot; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/components-starter/camel-jira-starter/pom.xml b/components-starter/camel-jira-starter/pom.xml index 876a1374f041..363af48f59f6 100644 --- a/components-starter/camel-jira-starter/pom.xml +++ b/components-starter/camel-jira-starter/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java index 761e585ea7de..8fc7f5881cf2 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java @@ -44,7 +44,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.mockito.stubbing.Answer; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java index cafef2d7323f..2e4f6a86f61e 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java @@ -53,7 +53,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.mockito.stubbing.Answer; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java index f84b5ab237cb..5ff515957f4f 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java @@ -56,7 +56,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java index acd59624530c..8810cfce60c6 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java @@ -53,7 +53,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java index 536ca851bd29..839d669a35e6 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java @@ -49,7 +49,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java index c9382061c423..df1ed9e66605 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java @@ -42,7 +42,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java index 10d183d4e477..f733325d9b29 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java @@ -41,7 +41,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java index c8bbb83a9617..a69976b7650d 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java @@ -39,7 +39,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java index db3450a76e5a..faa6a1e01af4 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java @@ -48,7 +48,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java index 41cfbd764f27..818aeb9064fd 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java @@ -49,7 +49,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeAll; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java index 6f544e2002d9..6663789bd70a 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java @@ -47,7 +47,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java index 5a6556a0b94c..267d4b86a9d4 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java @@ -55,7 +55,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java index 6e89a7ad82da..70eb9ed64e37 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java @@ -49,7 +49,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java index 63e74182278b..b2bda4cc7e9e 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java @@ -52,7 +52,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-jsonpath-starter/pom.xml b/components-starter/camel-jsonpath-starter/pom.xml index ae45cd4e4be8..237911f3b857 100644 --- a/components-starter/camel-jsonpath-starter/pom.xml +++ b/components-starter/camel-jsonpath-starter/pom.xml @@ -42,7 +42,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithRootSimpleCBRTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithRootSimpleCBRTest.java index 469986d6e391..30c9204badaf 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithRootSimpleCBRTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithRootSimpleCBRTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithSimpleCBRTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithSimpleCBRTest.java index 8ce08bcf6c2a..cd3064380bb6 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithSimpleCBRTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/EasyJsonPathWithSimpleCBRTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanStreamCachingTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanStreamCachingTest.java index 08c06cbf4bfb..92a36a4ce42f 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanStreamCachingTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanStreamCachingTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanSuppressExceptionsTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanSuppressExceptionsTest.java index 00b7408f8755..7061c3ab3398 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanSuppressExceptionsTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanSuppressExceptionsTest.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanTest.java index 78efa137256a..7556bb38d93a 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathBeanTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCBRTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCBRTest.java index 279740c5e516..aa0c97202095 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCBRTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCBRTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCharsetTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCharsetTest.java index 78e694f9dd9f..470509e612eb 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCharsetTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathCharsetTest.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathExchangePropertyTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathExchangePropertyTest.java index 5675e8510493..b05d9e891f92 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathExchangePropertyTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathExchangePropertyTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java index 4a24ea9090b1..9ebf7a589294 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathLanguageTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathLanguageTest.java index 510a09a82a05..252da9195b08 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathLanguageTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathLanguageTest.java @@ -46,7 +46,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMapTransformTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMapTransformTest.java index 2078d57c940b..2b001852bb6a 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMapTransformTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMapTransformTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jsonpath.springboot.test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import java.io.FileInputStream; import java.util.List; @@ -39,7 +39,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMockMatchesTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMockMatchesTest.java index 068103db89d9..7cc9c3aa4501 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMockMatchesTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathMockMatchesTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPlatformHttpTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPlatformHttpTest.java index 33e105b519ba..f507b460809f 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPlatformHttpTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPlatformHttpTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPojoTransformTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPojoTransformTest.java index befd8d2d4b97..025eb0c551a9 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPojoTransformTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathPojoTransformTest.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSourceTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSourceTest.java index 6989d6f6d4a7..b5e1c2e5cb41 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSourceTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSourceTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitTest.java index cb9ac663e399..7f45698723ca 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java index d83df51df831..7a69012fc4d1 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringTest.java index f4f66ad6461d..91ba44800f83 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathStreamCachingCBRTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathStreamCachingCBRTest.java index 889150b90cf9..bd791352a00f 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathStreamCachingCBRTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathStreamCachingCBRTest.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSuppressTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSuppressTest.java index 44987ab3ab1c..7a31aebda76e 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSuppressTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSuppressTest.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java index 23518683eca5..86f4d403bcfe 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielEscapedTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielEscapedTest.java index 43a77d339bb5..d9144e0659a6 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielEscapedTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielEscapedTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielPlaceholderTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielPlaceholderTest.java index 74a05c328a6d..e68397126f90 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielPlaceholderTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielPlaceholderTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielTest.java index 3ec9f355d41c..6f44c8dd81cf 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformONielTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformResultTypeTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformResultTypeTest.java index 59db098e6787..e88cdf7f7f86 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformResultTypeTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformResultTypeTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformTest.java index e19d5093f152..223aa6537b45 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathWithSimpleCBRTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathWithSimpleCBRTest.java index 092d83d85fd8..2504a08f5e47 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathWithSimpleCBRTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathWithSimpleCBRTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathCBRTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathCBRTest.java index 468a6165c5e1..e19188b462b9 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathCBRTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathCBRTest.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSplitWriteAsStringTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSplitWriteAsStringTest.java index a6d9c172ec44..dd94c77f694e 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSplitWriteAsStringTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSplitWriteAsStringTest.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSuppressTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSuppressTest.java index fc319eb94783..444841e19299 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSuppressTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathSuppressTest.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformHeaderNameTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformHeaderNameTest.java index 901792c2de39..82beb44c83b9 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformHeaderNameTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformHeaderNameTest.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformResultTypeTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformResultTypeTest.java index 832db62aee49..8ab7351e53b8 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformResultTypeTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformResultTypeTest.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformTest.java index 830a257c2205..61f686cabc1a 100644 --- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformTest.java +++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/SpringJsonPathTransformTest.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kafka-starter/pom.xml b/components-starter/camel-kafka-starter/pom.xml index 329e6599ea84..1a689d80e2b0 100644 --- a/components-starter/camel-kafka-starter/pom.xml +++ b/components-starter/camel-kafka-starter/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java index 4ec8427b2a41..5960a00c516d 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java @@ -28,7 +28,7 @@ import org.apache.camel.component.kafka.consumer.KafkaManualCommitFactory; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.producer.ProducerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java index 783019bc9104..fef529090719 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.producer.ProducerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java index fb969919c412..1f8e336362c9 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java @@ -28,7 +28,7 @@ import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.header.internals.RecordHeader; import org.junit.jupiter.api.AfterEach; @@ -45,7 +45,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -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.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java index 3303e018db1a..7b2d1f168a89 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.kafka.KafkaConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.producer.ProducerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualCommitIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualCommitIT.java index d81825953431..7da6bf4b31c8 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualCommitIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualCommitIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.kafka.consumer.KafkaManualCommit; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.producer.ProducerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerRebalanceIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerRebalanceIT.java index 22de0ab799c2..a8da73f79170 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerRebalanceIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerRebalanceIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.StateRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java index 03bc408dc8f2..96a5c96a8662 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.kafka.KafkaConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.producer.ProducerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java index 5a369f29e7df..44e4fceb7351 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java @@ -39,7 +39,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.DefaultHeaderFilterStrategy; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -57,7 +57,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -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.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaToDIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaToDIT.java index c9f9cfb4ee9e..a3597f494fc7 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaToDIT.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaToDIT.java @@ -19,7 +19,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledIfSystemProperty; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java index b7ee3b36926c..6ae9c58b3244 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java @@ -17,7 +17,7 @@ package org.apache.kafka.clients.consumer; import java.time.Duration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.core.IsNot; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-kamelet-starter/pom.xml b/components-starter/camel-kamelet-starter/pom.xml index 4a54499b0250..4c7abb67dbc8 100644 --- a/components-starter/camel-kamelet-starter/pom.xml +++ b/components-starter/camel-kamelet-starter/pom.xml @@ -41,7 +41,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletBasicTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletBasicTest.java index 0aefb220c4a1..33f4427577fa 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletBasicTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletBasicTest.java @@ -34,7 +34,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletComponentTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletComponentTest.java index 8fd3b7481159..acf462cd721a 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletComponentTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletComponentTest.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumeOnlyTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumeOnlyTest.java index d2d8b2dfa241..c328fe455591 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumeOnlyTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumeOnlyTest.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.spring.boot.CamelAutoConfiguration; @DirtiesContext diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java index 33967798896a..4b9522939bb2 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.spring.boot.CamelAutoConfiguration; @DirtiesContext diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletDiscoveryTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletDiscoveryTest.java index 63e25da9b0d6..273de631db24 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletDiscoveryTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletDiscoveryTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.spring.boot.CamelAutoConfiguration; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateGroovyTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateGroovyTest.java index 25d7b353b23c..1ad4947c7fce 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateGroovyTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateGroovyTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateJoorTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateJoorTest.java index 96a8d9814576..f0ba55fa2d89 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateJoorTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateJoorTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateTest.java index 11911dc3a3d7..49e3c9203565 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipAggregateTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipFilterTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipFilterTest.java index 8ed2e1590c02..2759429da060 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipFilterTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipFilterTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipMulticastTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipMulticastTest.java index e75e0c8b24e9..00264271df1f 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipMulticastTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipMulticastTest.java @@ -34,7 +34,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipNoChildrenTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipNoChildrenTest.java index fb29a247f93f..8c27f10cdacb 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipNoChildrenTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipNoChildrenTest.java @@ -27,7 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.ProducerTemplate; @DirtiesContext diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipTest.java index 16152478ba1f..88cf76bf8232 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletEipTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletGlobalPropertiesTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletGlobalPropertiesTest.java index 185f44bf1623..67cb7273dba1 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletGlobalPropertiesTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletGlobalPropertiesTest.java @@ -28,8 +28,8 @@ import org.apache.camel.component.kamelet.Kamelet; import org.apache.camel.component.kamelet.KameletEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.UseOverridePropertiesWithPropertiesComponent; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.UseOverridePropertiesWithPropertiesComponent; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassFourTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassFourTest.java index 9c68e8d8b751..dffaf6cf183f 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassFourTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassFourTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTest.java index 03d84c3c4f27..517fbfd0ac3c 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassThreeTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassThreeTest.java index b7392300efc0..8b5d60412950 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassThreeTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassThreeTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTwoTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTwoTest.java index 9c7952630b72..2657e22984a1 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTwoTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanClassTwoTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanConfigureTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanConfigureTest.java index 8e287c08ec9b..07e66cf09a48 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanConfigureTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanConfigureTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyExternalTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyExternalTest.java index ff6ce03e1550..e767ede15019 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyExternalTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyExternalTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyTest.java index 022c396b1a31..3c31d8582bab 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanGroovyTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanIoCTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanIoCTest.java index 65ec735b172d..7dd24e7eec68 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanIoCTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanIoCTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanJoorExternalTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanJoorExternalTest.java index 3cd36d3fc60c..9153e135a2ab 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanJoorExternalTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanJoorExternalTest.java @@ -30,7 +30,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanLanguageTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanLanguageTest.java index cac6c53bb650..92e7638ff1c8 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanLanguageTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanLanguageTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanSupplierTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanSupplierTest.java index f28f1a4210e6..59b2f3249d57 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanSupplierTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanSupplierTest.java @@ -30,7 +30,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTest.java index d58208e860a8..1a797604d838 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTypeTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTypeTest.java index 1d236193db8a..f0f88dc6a2f0 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTypeTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocalBeanTypeTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocationTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocationTest.java index dd495b45c8bd..cd6c8a6c57a3 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocationTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletLocationTest.java @@ -33,7 +33,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRecipientListTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRecipientListTest.java index a037eeebd96f..980b6231df9f 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRecipientListTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRecipientListTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteDumpTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteDumpTest.java index e5b3839331f5..0032645b23f1 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteDumpTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteDumpTest.java @@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteTest.java index c038165c3e1a..009b6c65bf8b 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletToDTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletToDTest.java index a9fab64c2782..7e510ece3e07 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletToDTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletToDTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java index 7f127b6ba3a2..f2742db85b30 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java @@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletValidationTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletValidationTest.java index 1e5b822823cb..09e71b6d071f 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletValidationTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletValidationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletWireTapTest.java b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletWireTapTest.java index 580347518db4..5c0cb0ac2672 100644 --- a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletWireTapTest.java +++ b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletWireTapTest.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-master-starter/pom.xml b/components-starter/camel-master-starter/pom.xml index 44906bbd081d..989b53d187bc 100644 --- a/components-starter/camel-master-starter/pom.xml +++ b/components-starter/camel-master-starter/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java index 823deff404e7..e2cbe636f892 100644 --- a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java +++ b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java @@ -37,7 +37,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.CamelContext; diff --git a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/MasterComponentTest.java b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/MasterComponentTest.java index 11691ff7fe87..0c6754947d72 100644 --- a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/MasterComponentTest.java +++ b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/MasterComponentTest.java @@ -40,7 +40,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.spring.boot.CamelAutoConfiguration; @DirtiesContext diff --git a/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java b/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java index fad8ec7ca1f4..982d2b4f851a 100644 --- a/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java +++ b/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java @@ -35,7 +35,7 @@ import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-openapi-java-starter/pom.xml b/components-starter/camel-openapi-java-starter/pom.xml index 55803b4fc78b..4f513e608d00 100644 --- a/components-starter/camel-openapi-java-starter/pom.xml +++ b/components-starter/camel-openapi-java-starter/pom.xml @@ -57,7 +57,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java index dae1b2bd5c96..2d7480905cf4 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java index b7867fc7f3b5..d07f6c730057 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java @@ -27,7 +27,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java index a72e3757fe64..4b834808ef77 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java index 7d9574856bb8..10a9b2045edc 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java @@ -27,7 +27,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java index 4ace3946343d..186158ba5aa2 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java @@ -26,7 +26,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java index 0df441dd0b56..9766dd4ecfc8 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java @@ -27,7 +27,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java index 560464e1fcc1..6a8b22c9792d 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java @@ -26,7 +26,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java index aa7f89a26926..003285d01a0d 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java @@ -27,7 +27,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java index 835dffc908d3..261c195aedea 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java @@ -26,7 +26,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java index d8f28d49444c..21f4d2dc2632 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java @@ -27,7 +27,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java index c29a22a3134e..33fe76d79a1a 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java @@ -28,7 +28,7 @@ import org.apache.camel.model.rest.RestParamType; import org.apache.camel.openapi.producer.DummyRestProducerFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java index 76f82ea28887..1298d9966a18 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java @@ -26,7 +26,7 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java index f57f5768d101..8ff22e48b789 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java @@ -24,7 +24,7 @@ import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java index e7a26dbba256..cc2ca492e9ca 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java @@ -25,7 +25,7 @@ import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java index 72871c318401..3b090530bfd2 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java @@ -24,7 +24,7 @@ import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java index c1f72b0b352f..548f13a9e06f 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java index 301a7db77987..5542a89c21ad 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/CounterRouteTest.java b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/CounterRouteTest.java index 9709cc551531..3cffcb338d40 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/CounterRouteTest.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/CounterRouteTest.java @@ -8,7 +8,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java index c54c90d32391..42c0477974a0 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.springboot.AbstractOpenTelemetryTest; import org.apache.camel.opentelemetry.metrics.springboot.CamelOpenTelemetryExtension; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryRouteEventNotifierTest.java b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryRouteEventNotifierTest.java index 6bf5cff3de62..4fa3f0cfca4c 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryRouteEventNotifierTest.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/eventnotifier/OpenTelemetryRouteEventNotifierTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.springboot.AbstractOpenTelemetryTest; import org.apache.camel.opentelemetry.metrics.springboot.CamelOpenTelemetryExtension; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/messagehistory/MessageHistoryTest.java b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/messagehistory/MessageHistoryTest.java index 45ce1ba0fb69..3cacfee625ef 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/messagehistory/MessageHistoryTest.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/messagehistory/MessageHistoryTest.java @@ -28,7 +28,7 @@ import org.apache.camel.opentelemetry.metrics.springboot.AbstractOpenTelemetryTest; import org.apache.camel.opentelemetry.metrics.springboot.CamelOpenTelemetryExtension; import org.apache.camel.opentelemetry.metrics.springboot.routepolicy.OpenTelemetryContextOnlyPolicyTest; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryContextOnlyPolicyTest.java b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryContextOnlyPolicyTest.java index 52c7b4ecdd28..07c3abe976cc 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryContextOnlyPolicyTest.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryContextOnlyPolicyTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.springboot.AbstractOpenTelemetryTest; import org.apache.camel.opentelemetry.metrics.springboot.CamelOpenTelemetryExtension; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryRoutePolicyTest.java b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryRoutePolicyTest.java index 3e2abcd85308..ecfdd1fc93c5 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryRoutePolicyTest.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/test/java/org/apache/camel/opentelemetry/metrics/springboot/routepolicy/OpenTelemetryRoutePolicyTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.springboot.AbstractOpenTelemetryTest; import org.apache.camel.opentelemetry.metrics.springboot.CamelOpenTelemetryExtension; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java index 4d265162fc9a..9da4de07b19e 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java index b6766bad7653..aacd921090e4 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java @@ -20,7 +20,7 @@ import io.restassured.http.ContentType; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java index 003f44a548de..3efd0eff1eb8 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.springboot.HttpComponentAutoConfiguration; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Value; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java index 0cf28e0c0e65..d31aa4d9a7b4 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java index 8ff89d556d2f..86d91a28eeb9 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java index 28fa0bfa46e0..b0e8cf7a9417 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java @@ -41,7 +41,7 @@ import org.apache.camel.component.platform.http.cookie.CookieHandler; import org.apache.camel.model.rest.RestBindingMode; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java index 0708967e6e7e..9c09d1aea349 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.platform.http.cookie.CookieConfiguration; import org.apache.camel.component.platform.http.cookie.CookieHandler; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java index 7ec0a7383acc..ac2c9a187458 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java index 8cc096efd5bd..65b4c7e4cd24 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java index c90ae75d25cd..9a271552c2dc 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java @@ -24,7 +24,7 @@ import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java index b318ea593478..a0a14d4308ec 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.platform.http.spi.PlatformHttpEngine; import org.apache.camel.http.common.DefaultHttpBinding; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java index bf369ad8f447..f24631b87786 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jackson.JacksonConstants; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java index 3d4ce2f7ec12..6ef1c2d37d05 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java index 1a4e54564109..cbb7f63b5879 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnJre; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java index 086b158a9047..2d7dd8f48b66 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java @@ -19,7 +19,7 @@ import io.restassured.RestAssured; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java index 056c3fe37f2b..2d37c36b44e2 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java index 195144a4c20d..f01cf5df8b56 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java index 97dc2e88e027..df7612917797 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java index b52e764dcb4e..39cecf87d83b 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSpringSessionTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSpringSessionTest.java index bbff9abfd440..a47600cfd8cc 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSpringSessionTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSpringSessionTest.java @@ -20,7 +20,7 @@ import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java index b69cf6ddf0e1..a2e69f27039f 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java index 66cf1def32a0..3032c3b94f6e 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.*; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java index 9418e9a376b9..926e1b18cac3 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestBindingMode; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java index dcd9b48d5151..e484ee282a31 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java index 7cd0912e53e0..9541f8d64d02 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/DelegateEndpointQuartzTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/DelegateEndpointQuartzTest.java index 6c86c11d1141..1e0205fa7f2e 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/DelegateEndpointQuartzTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/DelegateEndpointQuartzTest.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.URISupport; import org.quartz.JobDetail; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerRestartTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerRestartTest.java index bcd793600724..c10154f1645c 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerRestartTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerRestartTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerTest.java index fcbc3e43bebd..093cdbf57e5b 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileBase.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileBase.java index 40b14c94fe5d..4e6199596ca3 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileBase.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileBase.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.quartz.springboot; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import java.io.IOException; import java.nio.file.Files; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileQuartzSchedulerTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileQuartzSchedulerTest.java index be8175eb0e4b..30e5de428bc1 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileQuartzSchedulerTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FromFileQuartzSchedulerTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.FileUtil; @DirtiesContext diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/MultiplePoliciesOnRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/MultiplePoliciesOnRouteTest.java index 6585ffa049b4..c39b7f13cccb 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/MultiplePoliciesOnRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/MultiplePoliciesOnRouteTest.java @@ -37,7 +37,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.throttling.ThrottlingInflightRoutePolicy; @DirtiesContext diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartUnderscoreTimerNameTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartUnderscoreTimerNameTest.java index befe33bc51fd..2507374719db 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartUnderscoreTimerNameTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartUnderscoreTimerNameTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddDynamicRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddDynamicRouteTest.java index c11c32fa0613..a779405c5db3 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddDynamicRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddDynamicRouteTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddRoutesAfterCamelContextStartedTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddRoutesAfterCamelContextStartedTest.java index a620295ec585..bd94e7da6c38 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddRoutesAfterCamelContextStartedTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAddRoutesAfterCamelContextStartedTest.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAutoStartTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAutoStartTest.java index 23fd73dc7ad1..417cda887bc9 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAutoStartTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzAutoStartTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronMappingTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronMappingTest.java index 13a9acb2ac2d..625901f3145a 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronMappingTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronMappingTest.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRoute2Test.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRoute2Test.java index 651deb5fdcb8..5dec558ad4be 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRoute2Test.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRoute2Test.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteDurableJobTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteDurableJobTest.java index 8609443870b2..2b520b0e7e3e 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteDurableJobTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteDurableJobTest.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteFireNowTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteFireNowTest.java index c0a51fcf4305..c4c9f5a99c79 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteFireNowTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteFireNowTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteTest.java index 0cc9cff72bfd..5f0644d70bdc 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.CoreMatchers; import org.quartz.CronTrigger; import org.quartz.JobDetail; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteWithSmallCacheTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteWithSmallCacheTest.java index 0bc178104d82..4addc9ba45a1 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteWithSmallCacheTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronRouteWithSmallCacheTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronTriggerRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronTriggerRouteTest.java index c5f5d046edf3..0165b97062b1 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronTriggerRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCronTriggerRouteTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.quartz.JobDetail; @DirtiesContext diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java index e8757686af2b..ef9e3e78c474 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.quartz.Calendar; import org.quartz.Scheduler; import org.quartz.impl.calendar.HolidayCalendar; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java index 2dfd137322db..df598d1d4708 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.quartz.Calendar; import org.quartz.Scheduler; import org.quartz.impl.calendar.HolidayCalendar; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzInterruptTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzInterruptTest.java index d92f3a9b8c51..6a9a013ccaa3 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzInterruptTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzInterruptTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzJobRouteUnderscoreTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzJobRouteUnderscoreTest.java index ec3cfae53553..322c39bbcae5 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzJobRouteUnderscoreTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzJobRouteUnderscoreTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.quartz.JobDetail; @DirtiesContext diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManagementTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManagementTest.java index 37a37ff45bec..162c15ff6188 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManagementTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManagementTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManuallyTriggerJobTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManuallyTriggerJobTest.java index 0f23e3c44839..5066d64b0afe 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManuallyTriggerJobTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManuallyTriggerJobTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRepeatIntervalTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRepeatIntervalTest.java index e143d334c014..cfe7a08fbc05 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRepeatIntervalTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRepeatIntervalTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowOnlyOnceTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowOnlyOnceTest.java index 473c91b039f4..b93191f5e737 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowOnlyOnceTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowOnlyOnceTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowTest.java index 9064ccd86b4c..7228ca1a6ca4 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteFireNowTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteRestartTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteRestartTest.java index 68d50fd2b6b9..c9879949d9de 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteRestartTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteRestartTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteTest.java index 51c0d7d7c34b..1aee819f227d 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzRouteTest.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSimpleRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSimpleRouteTest.java index 72db4ecbdd96..60cc82eaa276 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSimpleRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSimpleRouteTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.CoreMatchers; import org.quartz.JobDetail; import org.quartz.SimpleTrigger; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStatefulJobRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStatefulJobRouteTest.java index 2e255a9a3e56..e4daca5f4678 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStatefulJobRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStatefulJobRouteTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.hamcrest.CoreMatchers; import org.quartz.CronTrigger; import org.quartz.JobDetail; diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStopRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStopRouteTest.java index d8d48bf286cc..5b61c2986173 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStopRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzStopRouteTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSuspendRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSuspendRouteTest.java index e2e5b91aade5..240bbfb90369 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSuspendRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzSuspendRouteTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzTriggerParametersTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzTriggerParametersTest.java index f399848e07c7..15306f74dbc0 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzTriggerParametersTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzTriggerParametersTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/RouteAutoStopFalseCronScheduledPolicyTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/RouteAutoStopFalseCronScheduledPolicyTest.java index 24fa36ca9031..f64103ae0bb9 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/RouteAutoStopFalseCronScheduledPolicyTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/RouteAutoStopFalseCronScheduledPolicyTest.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/SimpleScheduledCombinedRoutePolicyTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/SimpleScheduledCombinedRoutePolicyTest.java index 2ea13939cec9..dbd81cce4b1c 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/SimpleScheduledCombinedRoutePolicyTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/SimpleScheduledCombinedRoutePolicyTest.java @@ -36,7 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java index 1ce336678085..68704c4f2c15 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsAutoConfigurationTest.java b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsAutoConfigurationTest.java index 7a8b39fe1372..a1235a209647 100644 --- a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsAutoConfigurationTest.java +++ b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsAutoConfigurationTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams; import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService; import org.apache.camel.component.reactive.streams.engine.DefaultCamelReactiveStreamsService; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; diff --git a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsDefaultEngineTest.java b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsDefaultEngineTest.java index 29e85c6e1d57..2314da18eb25 100644 --- a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsDefaultEngineTest.java +++ b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsDefaultEngineTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams; import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService; import org.apache.camel.component.reactive.streams.engine.DefaultCamelReactiveStreamsService; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java index 77afd196f69b..f399759f07e2 100644 --- a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java +++ b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams; import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService; import org.apache.camel.component.reactive.streams.springboot.test.support.ReactiveStreamsServiceTestSupport; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsRegistryEngineTest.java b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsRegistryEngineTest.java index ac9f5cb206ed..d579ce0c4692 100644 --- a/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsRegistryEngineTest.java +++ b/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsRegistryEngineTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams; import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService; import org.apache.camel.component.reactive.streams.springboot.test.support.ReactiveStreamsServiceTestSupport; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-rest-starter/src/test/java/org/apache/camel/model/rest/springboot/CamelRestTest.java b/components-starter/camel-rest-starter/src/test/java/org/apache/camel/model/rest/springboot/CamelRestTest.java index cb09340b48e0..2862992cbe42 100644 --- a/components-starter/camel-rest-starter/src/test/java/org/apache/camel/model/rest/springboot/CamelRestTest.java +++ b/components-starter/camel-rest-starter/src/test/java/org/apache/camel/model/rest/springboot/CamelRestTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.seda.SedaEndpoint; import org.apache.camel.support.ClassicUuidGenerator; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.spi.RestApiConsumerFactory; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestConsumerFactory; diff --git a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java index d110984a4265..a0b27c550062 100644 --- a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java +++ b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java @@ -51,8 +51,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.eclipse.jetty.http.HttpHeader; @DirtiesContext diff --git a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentTest.java b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentTest.java index b7b9f31a1b50..dcb6fa42a0db 100644 --- a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentTest.java +++ b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.salesforce.SalesforceComponent; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java index ab0d259564c0..4b63406051bf 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/FromFileBase.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/FromFileBase.java index 183e1ec3889d..6acf791bbc4e 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/FromFileBase.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/FromFileBase.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.xquery.springboot; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import java.io.IOException; import java.nio.file.Files; diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonLanguageExtensionFunctionsTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonLanguageExtensionFunctionsTest.java index cd7ee35bf654..6982ab9039a9 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonLanguageExtensionFunctionsTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonLanguageExtensionFunctionsTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathSplitTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathSplitTest.java index 88c102194c0b..4a956853b0cc 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathSplitTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathSplitTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathTest.java index 4752d50bd7b5..37bb12edca47 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SaxonXPathTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SoapPayloadBeanTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SoapPayloadBeanTest.java index b2f26cba36ba..6176db951c21 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SoapPayloadBeanTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/SoapPayloadBeanTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathHeaderEnableSaxonJavaDslTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathHeaderEnableSaxonJavaDslTest.java index 5eed490c7d5d..5ef7318a9859 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathHeaderEnableSaxonJavaDslTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathHeaderEnableSaxonJavaDslTest.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java index 5ccdd58197df..564a35bbe11c 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.StopWatch; import org.apache.camel.util.TimeUtils; import org.slf4j.Logger; diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryConcurrencyTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryConcurrencyTest.java index 9a006c8a16c9..0a5aca491875 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryConcurrencyTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryConcurrencyTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFilterTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFilterTest.java index 6bde3c4b03fd..71ab32964419 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFilterTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFilterTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileExceptionTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileExceptionTest.java index dbb91eb7d735..1f808347f9a0 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileExceptionTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileExceptionTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.language.xquery.springboot; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import org.apache.camel.CamelContext; import org.apache.camel.EndpointInject; @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileTest.java index 8ab8c33bffeb..dda9857633d6 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryFromFileTest.java @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java index bfa7b49909ed..294426c46f75 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java index 8acae5750caa..86f9390df186 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryLanguageFromFileTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryLanguageFromFileTest.java index 6b022fc99d15..5a8f4b35d554 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryLanguageFromFileTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryLanguageFromFileTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPredicateFilterTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPredicateFilterTest.java index 3ea972e1c211..4f6d85ef9c51 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPredicateFilterTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPredicateFilterTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPropogateHeadersTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPropogateHeadersTest.java index 25f7d72e0f84..028565e40efc 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPropogateHeadersTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryPropogateHeadersTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryRecipientListTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryRecipientListTest.java index 4cec59f07b74..62c14be3529a 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryRecipientListTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryRecipientListTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryResourceTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryResourceTest.java index 63c783a67ba7..7b5d1d012b54 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryResourceTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryResourceTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformIssueTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformIssueTest.java index 49798b754404..9548e7694c9a 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformIssueTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformIssueTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTest.java index 6629e2f540a1..feb5357b439c 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTextTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTextTest.java index 4823a2375c45..ddeacb935a80 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTextTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryTransformTextTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryURLBasedConcurrencyTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryURLBasedConcurrencyTest.java index e3fa560ce14b..f30487044e79 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryURLBasedConcurrencyTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryURLBasedConcurrencyTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithExtensionTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithExtensionTest.java index 235383d9621f..570f90c95c89 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithExtensionTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithExtensionTest.java @@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithFlworTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithFlworTest.java index e49ae094f43f..4c63a7d338a5 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithFlworTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithFlworTest.java @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithNamespacesFilterTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithNamespacesFilterTest.java index b723d98348ff..dcd190eae234 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithNamespacesFilterTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryWithNamespacesFilterTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-slack-starter/src/test/java/org/apache/camel/component/slack/springboot/SlackProducerTest.java b/components-starter/camel-slack-starter/src/test/java/org/apache/camel/component/slack/springboot/SlackProducerTest.java index 18e7ed3dc4f4..8dbe4110b006 100644 --- a/components-starter/camel-slack-starter/src/test/java/org/apache/camel/component/slack/springboot/SlackProducerTest.java +++ b/components-starter/camel-slack-starter/src/test/java/org/apache/camel/component/slack/springboot/SlackProducerTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java index 90e6eedee2e9..c414a3389cc3 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java index 71a91fc9350e..7ef44fb92f7c 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java @@ -19,7 +19,7 @@ import org.apache.camel.PropertyBindingException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java index 836f2f0a293f..c40e788093ea 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java index 719b5b236a73..e60d7fbfa8ef 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java index bf74413a5f9c..f7947f207770 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java index bf768f6429ee..c284a39d8d20 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java index 75451152c20c..bd386cc02c3d 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java index 28805a9a8568..bedd047bdc3d 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUpdateHeadersTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUpdateHeadersTest.java index b95f397e6097..59f44b6abe86 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUpdateHeadersTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUpdateHeadersTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java index 05abebddbe51..50c241deea38 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.boot.test.context.SpringBootTest; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java index c51466f0e246..c2bb7e5b60f6 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.spi.SpringTransactionPolicy; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java index 25a7cddf54da..da4a0a475c13 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.sql.BaseSql; import org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java index b642e2e28dfb..80dffd88bf48 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.sql.BaseSql; import org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java index eb08db99556b..10692f13b858 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.sql.BaseSql; import org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java index a350defba708..7f9ae63af61c 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.sql.BaseSql; import org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java index 999d324e1683..22bf09e2488d 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java @@ -24,7 +24,7 @@ import org.apache.camel.processor.idempotent.jdbc.JdbcCachedMessageIdRepository; import org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java index 528b6e266653..ba48daee5823 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.sql.BaseSql; import org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-swift-starter/pom.xml b/components-starter/camel-swift-starter/pom.xml index 2ee1ed4d3cdb..220aa373d32a 100644 --- a/components-starter/camel-swift-starter/pom.xml +++ b/components-starter/camel-swift-starter/pom.xml @@ -42,7 +42,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 ${camel-version} test diff --git a/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java b/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java index e059b40aaed0..13aa29113a28 100644 --- a/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java +++ b/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java @@ -28,7 +28,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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; diff --git a/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java b/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java index 9b11dfb08a22..32d1085b26b1 100644 --- a/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java +++ b/components-starter/camel-swift-starter/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java @@ -32,7 +32,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramChatBotTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramChatBotTest.java index 04920d4cb1a2..1c388f8e8524 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramChatBotTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramChatBotTest.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramComponentParametersTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramComponentParametersTest.java index e0f8d879c356..628e8eab6d20 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramComponentParametersTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramComponentParametersTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConfigurationTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConfigurationTest.java index 59e158915305..aa8fe8dd4b80 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConfigurationTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConfigurationTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerChannelPostTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerChannelPostTest.java index 1695907acb6c..ee94f3948cd9 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerChannelPostTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerChannelPostTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerEmptyResponseTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerEmptyResponseTest.java index 9122b25eb14c..2db414db470b 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerEmptyResponseTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerEmptyResponseTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerFallbackConversionTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerFallbackConversionTest.java index 63dd47e2f1b1..51b46e816280 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerFallbackConversionTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerFallbackConversionTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java index c859709eaf44..6fec5c6d637e 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java index 37f9b19b4a81..4467d7ff39ba 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java index ec3c0f3299b6..521f96d4c3f6 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerIncomingInlineQueryTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerIncomingInlineQueryTest.java index 7aab712ffbd8..f052a1f089b2 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerIncomingInlineQueryTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerIncomingInlineQueryTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMappingTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMappingTest.java index ad7256d79a9e..b71cec5b9cb9 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMappingTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMappingTest.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaDocumentTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaDocumentTest.java index 89380aaa312d..c5d2b2c6d58f 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaDocumentTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaDocumentTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaGameTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaGameTest.java index 78ebb6f4e7f8..e53593b6ed5f 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaGameTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaGameTest.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaPhotoTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaPhotoTest.java index 203744245caa..d17371954106 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaPhotoTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaPhotoTest.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaStickerTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaStickerTest.java index 942519c42722..90490e387317 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaStickerTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaStickerTest.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaVideoTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaVideoTest.java index 58d19bb9796b..0be6d9f556a2 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaVideoTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMediaVideoTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMultipleTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMultipleTest.java index 702a12f21baf..a299e60c2015 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMultipleTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerMultipleTest.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerServiceErrorTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerServiceErrorTest.java index 59cae783bea2..8fa4566c10be 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerServiceErrorTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerServiceErrorTest.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerSingleTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerSingleTest.java index ae506e439472..c54671b6a8a2 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerSingleTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerSingleTest.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerChatIdResolutionTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerChatIdResolutionTest.java index c945a4b55c60..76168c97576a 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerChatIdResolutionTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerChatIdResolutionTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerLocationTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerLocationTest.java index 22e2fcdb52a8..96309807b38b 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerLocationTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerLocationTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerMediaTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerMediaTest.java index 2d599cae6ada..4f87fca523de 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerMediaTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramProducerMediaTest.java @@ -50,7 +50,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramWebhookCallTest.java b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramWebhookCallTest.java index a40385049768..8ba4b9228053 100644 --- a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramWebhookCallTest.java +++ b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramWebhookCallTest.java @@ -35,7 +35,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @CamelSpringBootTest diff --git a/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java b/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java index 655902d5469d..a19800028c25 100644 --- a/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java +++ b/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java @@ -19,7 +19,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/CustomSchemaFactoryFeatureTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/CustomSchemaFactoryFeatureTest.java index 37472c9a86cb..1bf16e3f1c25 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/CustomSchemaFactoryFeatureTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/CustomSchemaFactoryFeatureTest.java @@ -20,7 +20,7 @@ import javax.xml.validation.SchemaFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/FileValidatorRouteTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/FileValidatorRouteTest.java index 06f86529346b..493a8b95b1e6 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/FileValidatorRouteTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/FileValidatorRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorBeanCallTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorBeanCallTest.java index b3b75fa094df..ff1f34c361aa 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorBeanCallTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorBeanCallTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOffTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOffTest.java index 96958244846d..34b3cdb0917e 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOffTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOffTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.processor.validation.SchemaReader; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOnTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOnTest.java index 7ed98a7d88ae..d7e00594e643 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOnTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessOnTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.processor.validation.SchemaReader; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java index ba4dc30d8aab..6c8dda4e7713 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.engine.DefaultResourceLoader; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.urlhandler.pd.Handler; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIllegalImportTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIllegalImportTest.java index e1586de313ab..984c6ca839c7 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIllegalImportTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIllegalImportTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeEncodingRouteTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeEncodingRouteTest.java index a9781bd63f20..294c344f24c0 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeEncodingRouteTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeEncodingRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRelativeRouteTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRelativeRouteTest.java index 24fe2cdaa936..b987c0e40c70 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRelativeRouteTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRelativeRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRouteTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRouteTest.java index a07e655746c4..1237bbfff684 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRouteTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorLazyStartProducerTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorLazyStartProducerTest.java index 7829f6e731ff..6b1624d228b7 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorLazyStartProducerTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorLazyStartProducerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java index af4804a8754f..af79c96b9798 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java @@ -38,7 +38,7 @@ import org.apache.camel.model.language.ConstantExpression; import org.apache.camel.model.language.SimpleExpression; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRootPathTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRootPathTest.java index e25db795d6ea..ff0a84cb7c7a 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRootPathTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRootPathTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java index 6d112f3c1ee8..7eb3c8162e7d 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.processor.validation.NoXmlHeaderValidationException; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java index 33acf0910652..c4330b791d62 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java @@ -29,7 +29,7 @@ import org.apache.camel.processor.validation.CatalogLSResourceResolver; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.xml.resolver.CatalogManager; import org.apache.xml.resolver.tools.CatalogResolver; import org.junit.jupiter.api.BeforeEach; diff --git a/components-starter/camel-vertx-http-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxHttpSSLTest.java b/components-starter/camel-vertx-http-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxHttpSSLTest.java index 30030d6feffd..5838ef6b815a 100644 --- a/components-starter/camel-vertx-http-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxHttpSSLTest.java +++ b/components-starter/camel-vertx-http-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxHttpSSLTest.java @@ -22,7 +22,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLGlobalTest.java b/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLGlobalTest.java index b6ff07e0240b..07a23cc06118 100644 --- a/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLGlobalTest.java +++ b/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLGlobalTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLTest.java b/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLTest.java index 9af529e0b4ea..36a84af3c18c 100644 --- a/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLTest.java +++ b/components-starter/camel-vertx-websocket-starter/src/test/java/org/apache/camel/component/vertx/http/springboot/VertxWebsocketSSLTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookBasePathTest.java b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookBasePathTest.java index c03d5f071e74..b5a942ed49a5 100644 --- a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookBasePathTest.java +++ b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookBasePathTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookHttpBindingTest.java b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookHttpBindingTest.java index a5fb2dbda638..b6f935645e54 100644 --- a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookHttpBindingTest.java +++ b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookHttpBindingTest.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookMultiRouteTest.java b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookMultiRouteTest.java index 708ac88eea76..4decdb99c7f1 100644 --- a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookMultiRouteTest.java +++ b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookMultiRouteTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookPathTest.java b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookPathTest.java index faf82522ab8a..4d8d329e723c 100644 --- a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookPathTest.java +++ b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookPathTest.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookUriEncodingTest.java b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookUriEncodingTest.java index a1817d955f1c..c734c37c9145 100644 --- a/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookUriEncodingTest.java +++ b/components-starter/camel-webhook-starter/src/test/java/org/apache/camel/component/webhook/springboot/WebhookUriEncodingTest.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithFilenameHeaderTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithFilenameHeaderTest.java index a2e477380bf8..bf83a3def105 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithFilenameHeaderTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithFilenameHeaderTest.java @@ -43,8 +43,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithPreservationTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithPreservationTest.java index 1960b9ff1b1c..e475ae3124ad 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithPreservationTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/AggregationStrategyWithPreservationTest.java @@ -43,8 +43,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyEmptyFileTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyEmptyFileTest.java index d2547ef752e7..e765f0cdcf1d 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyEmptyFileTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyEmptyFileTest.java @@ -40,8 +40,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyTest.java index e1bed19e08c9..f21673f3bd25 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipAggregationStrategyTest.java @@ -40,8 +40,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java index 2b343a851c63..b0675f4eb3ef 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java @@ -17,8 +17,8 @@ package org.apache.camel.dataformat.zipfile.springboot; import static org.apache.camel.Exchange.FILE_NAME; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -63,7 +63,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.IOHelper; @DirtiesContext diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileIteratorDataFormatTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileIteratorDataFormatTest.java index c02f42b89572..ba4253b890cb 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileIteratorDataFormatTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileIteratorDataFormatTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileMultipleFilesSplitterTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileMultipleFilesSplitterTest.java index 9e8ba3266db2..bd3498728213 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileMultipleFilesSplitterTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileMultipleFilesSplitterTest.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitAndDeleteTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitAndDeleteTest.java index 725812cf6117..0ba73e4c2eb0 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitAndDeleteTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitAndDeleteTest.java @@ -44,8 +44,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitIteratorCorruptTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitIteratorCorruptTest.java index 23c799c6daf1..a004fad5c9f0 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitIteratorCorruptTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitIteratorCorruptTest.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitOneFileTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitOneFileTest.java index 2c9b335e206d..05fb34ace9db 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitOneFileTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileSplitOneFileTest.java @@ -42,8 +42,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteIssueTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteIssueTest.java index adafce03a0cd..1a0a317e14db 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteIssueTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteIssueTest.java @@ -34,8 +34,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteTest.java index a2cb074d8a98..2626eebe36b7 100644 --- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteTest.java +++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteTest.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/components-starter/pom.xml b/components-starter/pom.xml index bd9ec0dd9d88..8cdf64d36637 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel-version} test @@ -315,7 +315,9 @@ camel-jsonpath-starter camel-jt400-starter camel-jte-starter + camel-kamelet-starter camel-keycloak-starter camel-knative-starter diff --git a/core/camel-spring-boot-xml/pom.xml b/core/camel-spring-boot-xml/pom.xml index aac20f56497d..b3655197762c 100644 --- a/core/camel-spring-boot-xml/pom.xml +++ b/core/camel-spring-boot-xml/pom.xml @@ -85,7 +85,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/CamelNonInvasiveCamelContextTest.java b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/CamelNonInvasiveCamelContextTest.java index 22f87d2fa2bd..ff32d820c990 100644 --- a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/CamelNonInvasiveCamelContextTest.java +++ b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/CamelNonInvasiveCamelContextTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; 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.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java index e73f8d0d9f66..9832c2ce0941 100644 --- a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java +++ b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.xml; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedJavaDslAndXmlTest.java b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedJavaDslAndXmlTest.java index 70f5d85a97a6..9b9fdadab533 100644 --- a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedJavaDslAndXmlTest.java +++ b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedJavaDslAndXmlTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Route; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultRoute; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedRestDslTest.java b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedRestDslTest.java index 9f8d84bc9314..dac8d12f17cc 100644 --- a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedRestDslTest.java +++ b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedRestDslTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.rest.RestEndpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml index 4cf3d46c9b2c..6d10d2424a30 100644 --- a/core/camel-spring-boot/pom.xml +++ b/core/camel-spring-boot/pom.xml @@ -107,7 +107,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 org.apache.camel diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.adoc b/core/camel-spring-boot/src/main/docs/spring-boot.adoc index 675e087ae046..71aa8af7edf8 100644 --- a/core/camel-spring-boot/src/main/docs/spring-boot.adoc +++ b/core/camel-spring-boot/src/main/docs/spring-boot.adoc @@ -351,7 +351,7 @@ The XML files should be Camel XML routes (*not* ``) such as ---- -== Testing the JUnit 5 way +== Testing the JUnit 6 way For testing, Maven users will need to add the following dependencies to their `pom.xml`: @@ -365,7 +365,7 @@ For testing, Maven users will need to add the following dependencies to their `p org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 ${camel.version} test @@ -378,7 +378,7 @@ https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-tes To get the `CamelContext` or `ProducerTemplate`, you can inject them into the class in the normal Spring manner, using `@Autowired`. -You can also use xref:components:others:test-spring-junit5.adoc[camel-test-spring-junit5] to configure tests declaratively. This example uses the `@MockEndpoints` annotation to auto-mock an endpoint: +You can also use xref:components:others:test-spring-junit6.adoc[camel-test-spring-junit6] to configure tests declaratively. This example uses the `@MockEndpoints` annotation to auto-mock an endpoint: [source,java] ---- diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java index 5f03bfc2b3d9..e5d48d0893cd 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; 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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java index 879c6d4ca831..81b8334c901d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; 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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java index 0a1bccfe4593..b09e3bb1b0f8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java @@ -32,7 +32,7 @@ import org.apache.camel.spi.BeanRepository; import org.apache.camel.spi.Registry; import org.apache.camel.spring.spi.SpringInjector; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java index b636225b95cc..4702320431e1 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; -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.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java index b8bee542e7f5..8a1fb06cfab2 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; -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.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java index a507001b1f1c..91866707afb8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java index 6f56e9d9021a..26f699109f9d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationPostConstructAddRouteToRegistryTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java index 7cece7b992f6..f35a3494be0f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java @@ -24,7 +24,7 @@ import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.EventNotifier; import org.apache.camel.support.EventNotifierSupport; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java index ee7da1d74d81..320f9688c3cc 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Route; 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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelMainListenerTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelMainListenerTest.java index d4a2932edb00..7414cc3ce2cf 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelMainListenerTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelMainListenerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.main.BaseMainSupport; import org.apache.camel.main.MainListener; import org.apache.camel.main.MainListenerSupport; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java index be8bc12950e4..dfa7cf96a43a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java @@ -24,7 +24,7 @@ import org.apache.camel.TypeConverter; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.converter.DefaultTypeConverter; -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; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelStartupConditionEnvTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelStartupConditionEnvTest.java index e6a90b1b0b78..852ab7f0dbcc 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelStartupConditionEnvTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelStartupConditionEnvTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.startup.EnvStartupCondition; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java index 4bfc9c89f6c8..895ef9ad0997 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Route; -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.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java index daf7d6bedc93..2914c3401a63 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -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.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java index 39702d4fe99a..1022cd27c14d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.RouteStartupOrder; import org.apache.camel.spi.ShutdownStrategy; import org.apache.camel.spring.SpringRouteBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java index bcb897752667..d322ab63bd28 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java @@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; -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.beans.factory.annotation.Qualifier; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java index c724639693ea..6f1a977a9f63 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -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; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java index 7781b4d419ab..2066e3e6ef12 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ExtendedCamelContext; import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.LogListener; -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; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java index 9740f1d9602d..c5c1fd3dd08a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.camel.TypeConverter; -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.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java index 4a4fc79dcf9e..3c26dae16049 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java index c04f0298b260..42f7846485ef 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.camel.TypeConverter; -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.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java index b905bec1670c..44ce65011b27 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java index f45f1914b271..dd7ef0782c11 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.SupervisingRouteController; import org.apache.camel.spring.boot.dummy.DummyComponent; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java index 7722f58285e0..3dfaa19645ab 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.SupervisingRouteController; import org.apache.camel.test.AvailablePortFinder; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java index a98b709a8f91..4ce62a7d6a96 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.ThreadPoolProfile; import org.apache.camel.spring.boot.threadpool.CamelThreadPoolAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java index 96fe86416471..6dc0c27ecb0e 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java @@ -21,7 +21,7 @@ import java.util.UUID; import org.apache.camel.CamelContext; import org.apache.camel.spi.UuidGenerator; -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; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java index dbc3a2789e94..5a85195e1fb6 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java index 3aff79888d86..d225dd19ed53 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java @@ -18,7 +18,7 @@ package org.apache.camel.spring.boot.actuate.endpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java index db90e4abbcb8..c8a574b04c25 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java index a6232000e8b4..c9f4460bd377 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java index bc16305246a0..e72b211d9e28 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointControllerRouteTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointControllerRouteTest.java index fa9358f1d6e0..1e88076ef03c 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointControllerRouteTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointControllerRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.RouteEndpointInfo; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java index 6d59a2d0812b..a4508774716d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java index b777ffbfe41e..4a8a8e5cc877 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.TimeInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.WriteAction; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java index e717acab1699..abab275ae2e9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java @@ -24,7 +24,7 @@ import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.RouteEndpointInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.TimeInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.WriteAction; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java index 2c55ff61fb39..07bd1d537f04 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.TimeInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.WriteAction; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java index 37f73010514b..b8f2dafa7bdc 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java index 84f596ad676c..3f974e928c9e 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java index d6995c14b739..bae27ec98bbb 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternAnnotationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternAnnotationTest.java index c57cdb1e8d9b..d17c940e72c8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternAnnotationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternAnnotationTest.java @@ -21,8 +21,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.SpringRouteBuilder; -import org.apache.camel.test.spring.junit5.AutoStartupExclude; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.AutoStartupExclude; +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.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternTest.java index e9a7a2881727..15bd58027530 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/autostartup/AutoStartupExcludePatternTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.SpringRouteBuilder; -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.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java index 257c1b257af2..198d86d3bf37 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Disabled; import org.junit.jupiter.api.Test; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java index db0861e66123..03732add8c3a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.language.SimpleExpression; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Disabled; import org.junit.jupiter.api.Test; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java index 35e8a4425a5b..512c524f7aae 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Disabled; import org.junit.jupiter.api.Test; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java index 76c386e102fd..6c79c0848a5a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; -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.Disabled; import org.junit.jupiter.api.Test; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java index 3ee6cb686237..25aa838b6f11 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java @@ -19,7 +19,7 @@ import org.apache.camel.EndpointInject; 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.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java index 389e5e338dc4..59fa412043ed 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java @@ -19,8 +19,8 @@ import org.apache.camel.EndpointInject; 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.junit5.MockEndpoints; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.MockEndpoints; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java index eb5e48d44af3..e93db358e8bd 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.properties.PropertiesComponent; import org.apache.camel.spring.boot.SpringPropertiesParser; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java index 8cc1a370123d..318116843bf1 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.rest.RestBindingMode; import org.apache.camel.test.AvailablePortFinder; -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.autoconfigure.EnableAutoConfiguration; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java index f76b397831f3..5169f815da38 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java index 115df2e1fef3..9ee082cc26be 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.boot.SpringTypeConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java index 1dabdc176c9a..015bf34bd635 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java @@ -23,8 +23,8 @@ 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.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.UseAdviceWith; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.UseAdviceWith; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java index ad7f964050c3..7760e44a38c1 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java @@ -23,8 +23,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.SpringRouteBuilder; -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.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java index 3573dfb3b01e..68aa6b7c0964 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java @@ -19,8 +19,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.FluentProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.MockEndpoints; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.MockEndpoints; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java index 1b9d192b9a64..d56a190ac91f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java @@ -19,7 +19,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ModelCamelContext; -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.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java index bdd3bab90be3..275c2aa82a98 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java @@ -19,8 +19,8 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ModelCamelContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.ExcludeRoutes; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.ExcludeRoutes; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java index 5be46023238d..e13516697dba 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java @@ -19,7 +19,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ModelCamelContext; -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.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java index 21fdf3ace453..953c0531d043 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java @@ -18,7 +18,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.jsse.GlobalSSLContextParametersSupplier; -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.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/stub/StubEndpointsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/stub/StubEndpointsTest.java index 80532e3bd0a1..a831bef28a45 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/stub/StubEndpointsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/stub/StubEndpointsTest.java @@ -21,8 +21,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.SpringRouteBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; -import org.apache.camel.test.spring.junit5.StubEndpoints; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.StubEndpoints; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java index 1bd72ae811e5..3ef331b4d1b8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java @@ -20,7 +20,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java index 4aaf3413a2ab..c0f0dbb3ac80 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java @@ -16,7 +16,7 @@ */ package org.apache.camel.spring.boot.util; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java index 15e17384d441..db1332569098 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java @@ -16,7 +16,7 @@ */ package org.apache.camel.spring.boot.util; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java index 0306884c07fa..06db8aabb23d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java @@ -16,7 +16,7 @@ */ package org.apache.camel.spring.boot.util; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java index e0a907ca456b..7a6761ee8cee 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java @@ -16,7 +16,7 @@ */ package org.apache.camel.spring.boot.util; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java index 512433dbc74f..4b68366f36dc 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.spring.boot.util; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java index d3a3a6ed63d6..177e5fd8602d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AwsVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AzureVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AzureVaultConfigurationTest.java index 94eb5e0c1a68..dcc22ae75c07 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AzureVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/AzureVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/CyberArkVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/CyberArkVaultConfigurationTest.java index 238b0164a1be..80abeb363ab7 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/CyberArkVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/CyberArkVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java index b83d86ccaed5..7abed3a2d690 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultCloudConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultCloudConfigurationTest.java index 08bd63427237..0bd76d28eb23 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultCloudConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultCloudConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultConfigurationTest.java index 782dc25c0ae6..8638ca1c3077 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/HashicorpVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/IBMSecretsManagerVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/IBMSecretsManagerVaultConfigurationTest.java index 3058ef3a1aea..715918003740 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/IBMSecretsManagerVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/IBMSecretsManagerVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesConfigMapVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesConfigMapVaultConfigurationTest.java index dbcde1d34ee3..37bc98458750 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesConfigMapVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesConfigMapVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesVaultConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesVaultConfigurationTest.java index 2afe3ffdd965..677091829b07 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesVaultConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/KubernetesVaultConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.spring.boot.vault; import org.apache.camel.CamelContext; -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.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/camel-spring-boot/src/test/java21/org/apache/camel/spring/boot/CamelVirtualThreadsTest.java b/core/camel-spring-boot/src/test/java21/org/apache/camel/spring/boot/CamelVirtualThreadsTest.java index 93da9a870ad5..d0f1ec52db2c 100644 --- a/core/camel-spring-boot/src/test/java21/org/apache/camel/spring/boot/CamelVirtualThreadsTest.java +++ b/core/camel-spring-boot/src/test/java21/org/apache/camel/spring/boot/CamelVirtualThreadsTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java index 0252d0ace76c..fd470dc765d7 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java @@ -194,6 +194,7 @@ public FilterResult apply(TestDescriptor testDescriptor) { logger.debug("Checking class " + testClass.getName()); for (Annotation annotation : testClass.getAnnotations()) { if (annotation.toString().contains("org.apache.camel.test.spring.junit5.CamelSpringBootTest") + || annotation.toString().contains("org.apache.camel.test.spring.junit6.CamelSpringBootTest") || annotation.toString().contains("org.springframework.boot.test.context.SpringBootTest")) { return FilterResult.excluded("Not admissable"); } diff --git a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml index f6126da1d8b2..b62cd7fb4aae 100644 --- a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml +++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml @@ -71,12 +71,14 @@ org.junit.jupiter junit-jupiter + 6.0.1 test org.junit.platform junit-platform-launcher + 6.0.1 test diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index e64939783018..4ad8c8f9fc2c 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -2100,7 +2100,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 4.17.0-SNAPSHOT diff --git a/tooling/camel-spring-boot-config-generator-maven-plugin/pom.xml b/tooling/camel-spring-boot-config-generator-maven-plugin/pom.xml index 220d24cddbeb..0afab3c50dc8 100644 --- a/tooling/camel-spring-boot-config-generator-maven-plugin/pom.xml +++ b/tooling/camel-spring-boot-config-generator-maven-plugin/pom.xml @@ -209,19 +209,19 @@ org.junit.jupiter junit-jupiter-api - ${junit-jupiter-version} + ${junit6-jupiter-version} test org.junit.jupiter junit-jupiter-engine - ${junit-jupiter-version} + ${junit6-jupiter-version} test org.junit.jupiter junit-jupiter-params - ${junit-jupiter-version} + ${junit6-jupiter-version} test diff --git a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml index abec2f86cda9..95a1feb2c5bc 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml +++ b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml @@ -204,19 +204,19 @@ org.junit.jupiter junit-jupiter-api - ${junit-jupiter-version} + ${junit6-jupiter-version} test org.junit.jupiter junit-jupiter-engine - ${junit-jupiter-version} + ${junit6-jupiter-version} test org.junit.jupiter junit-jupiter-params - ${junit-jupiter-version} + ${junit6-jupiter-version} test diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java index 915ef17f9cf5..40d44d5d8b07 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java @@ -200,7 +200,7 @@ private List starters() throws IOException { // include some dependencies for testing and management dep = new Dependency(); dep.setGroupId("org.apache.camel"); - dep.setArtifactId("camel-test-spring-junit5"); + dep.setArtifactId("camel-test-spring-junit6"); dep.setVersion(project.getVersion()); outDependencies.add(dep); From cc579f43fbb80cbbbe12f6277fe92249191ac637 Mon Sep 17 00:00:00 2001 From: Croway Date: Tue, 25 Nov 2025 15:28:46 +0100 Subject: [PATCH 2/7] Upgrade: Spring Boot 4.0 Co-authored-by: David Ihnen --- .../catalog/components/spring-rabbitmq.json | 4 +- .../camel-activemq-starter/pom.xml | 8 + .../camel-activemq6-starter/pom.xml | 8 + components-starter/camel-amqp-starter/pom.xml | 8 + .../s3/S3CreateDownloadLinkOperationTest.java | 7 +- .../camel-hashicorp-vault-starter/pom.xml | 8 + components-starter/camel-jms-starter/pom.xml | 8 + components-starter/camel-jpa-starter/pom.xml | 8 + .../camel-platform-http-starter/pom.xml | 29 +- ...ringBootPlatformHttpAutoConfiguration.java | 2 +- ...SpringBootPlatformWebMvcConfiguration.java | 2 +- .../metrics/undertow/UndertowComponents.java | 25 -- .../metrics/undertow/UndertowMetrics.java | 338 ------------------ .../UndertowMetricsAutoConfiguration.java | 47 --- .../undertow/UndertowMetricsBinder.java | 86 ----- ...ot.autoconfigure.AutoConfiguration.imports | 6 +- .../PlatformHttpAsyncRequestHandlingTest.java | 13 +- .../http/springboot/PlatformHttpBase.java | 2 +- .../springboot/PlatformHttpStreamingTest.java | 4 +- ...ngBootPlatformHttpBridgedEndpointTest.java | 4 +- ...BootPlatformHttpCamelIntegrationsTest.java | 6 +- ...otPlatformHttpCamelVirtualThreadsTest.java | 4 +- ...ringBootPlatformHttpCertificationTest.java | 4 +- .../SpringBootPlatformHttpCookiesTest.java | 6 +- ...ngBootPlatformHttpCorsCredentialsTest.java | 4 +- .../SpringBootPlatformHttpCorsTest.java | 4 +- .../SpringBootPlatformHttpEngineTest.java | 6 +- ...gBootPlatformHttpHandleWriteErrorTest.java | 4 +- ...gBootPlatformHttpJacksonConverterTest.java | 6 +- ...BootPlatformHttpMultipleExecutorsTest.java | 4 +- ...tpMultipleExecutorsVirtualThreadsTest.java | 4 +- .../SpringBootPlatformHttpOptionsTest.java | 7 +- .../SpringBootPlatformHttpProxyTest.java | 10 +- ...ingBootPlatformHttpRequestTimeoutTest.java | 8 +- .../SpringBootPlatformHttpRestDSLTest.java | 6 +- .../SpringBootPlatformHttpSessionTest.java | 2 +- .../SpringBootPlatformHttpTest.java | 4 +- ...ringBootPlatformHttpTypeConverterTest.java | 6 +- .../SpringBootPlatformHttpValidationTest.java | 6 +- ...atformHttpVirtualThreadsOptimizedTest.java | 4 +- ...ingBootPlatformHttpVirtualThreadsTest.java | 4 +- components-starter/camel-pqc-starter/pom.xml | 8 + .../camel-servlet-starter/pom.xml | 5 + .../ServletMappingAutoConfiguration.java | 2 +- .../camel-spring-batch-starter/pom.xml | 8 + .../camel-spring-cloud-config-starter/pom.xml | 4 + .../camel-spring-jdbc-starter/pom.xml | 8 + .../camel-spring-ldap-starter/pom.xml | 8 + .../camel-spring-rabbitmq-starter/pom.xml | 8 + .../src/main/docs/spring-rabbitmq.json | 4 +- .../SpringRabbitMQComponentConfiguration.java | 10 +- .../SpringRabbitMQComponentConverter.java | 4 +- .../camel-spring-redis-starter/pom.xml | 8 + .../camel-spring-starter/pom.xml | 8 + .../camel-spring-ws-starter/pom.xml | 8 + components-starter/camel-sql-starter/pom.xml | 8 + .../pom.xml | 8 + core/camel-spring-boot/pom.xml | 6 + .../src/main/docs/spring-boot.json | 36 -- ...AsyncHealthIndicatorAutoConfiguration.java | 19 +- ...melAvailabilityCheckAutoConfiguration.java | 2 +- .../CamelHealthCheckAutoConfiguration.java | 2 +- .../health/CamelHealthCheckIndicator.java | 10 +- .../actuate/health/CamelHealthHelper.java | 6 +- .../CamelLivenessStateHealthIndicator.java | 2 +- .../CamelReadinessStateHealthIndicator.java | 2 +- .../spring/boot/aot/ReflectionHelper.java | 6 + .../boot/actuate/health/CamelHealthTest.java | 2 +- .../boot/actuate/health/CamelProbesTest.java | 11 +- 69 files changed, 300 insertions(+), 639 deletions(-) delete mode 100644 components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowComponents.java delete mode 100644 components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetrics.java delete mode 100644 components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsAutoConfiguration.java delete mode 100644 components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsBinder.java diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json index 33fb9a052ee7..67f0c58c79b7 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json @@ -43,7 +43,7 @@ "maxConcurrentConsumers": { "index": 16, "kind": "property", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, "messageListenerContainerType": { "index": 17, "kind": "property", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "index": 18, "kind": "property", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 250, "description": "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput." }, - "retry": { "index": 19, "kind": "property", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, + "retry": { "index": 19, "kind": "property", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, "shutdownTimeout": { "index": 20, "kind": "property", "displayName": "Shutdown Timeout", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout." }, "allowNullBody": { "index": 21, "kind": "property", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." }, "autoDeclareProducer": { "index": 22, "kind": "property", "displayName": "Auto Declare Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether the producer should auto declare binding between exchange, queue and routing key when starting. Enabling this can be good for development to make it easy to standup exchanges, queues and bindings on the broker." }, @@ -106,7 +106,7 @@ "maxConcurrentConsumers": { "index": 24, "kind": "parameter", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, "messageListenerContainerType": { "index": 25, "kind": "parameter", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "index": 26, "kind": "parameter", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput." }, - "retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, + "retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, "allowNullBody": { "index": 28, "kind": "parameter", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." }, "autoDeclareProducer": { "index": 29, "kind": "parameter", "displayName": "Auto Declare Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether the producer should auto declare binding between exchange, queue and routing key when starting." }, "confirm": { "index": 30, "kind": "parameter", "displayName": "Confirm", "group": "producer", "label": "producer", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Controls whether to wait for confirms. The connection factory must be configured for publisher confirms and this method. auto = Camel detects if the connection factory uses confirms or not. disabled = Confirms is disabled. enabled = Confirms is enabled." }, diff --git a/components-starter/camel-activemq-starter/pom.xml b/components-starter/camel-activemq-starter/pom.xml index 20efedf46bbe..02aac6a8074c 100644 --- a/components-starter/camel-activemq-starter/pom.xml +++ b/components-starter/camel-activemq-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-activemq ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-activemq6-starter/pom.xml b/components-starter/camel-activemq6-starter/pom.xml index 4543c6a36c21..575dc67a9df9 100644 --- a/components-starter/camel-activemq6-starter/pom.xml +++ b/components-starter/camel-activemq6-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-activemq6 ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-amqp-starter/pom.xml b/components-starter/camel-amqp-starter/pom.xml index 315695100e90..51f64212e94f 100644 --- a/components-starter/camel-amqp-starter/pom.xml +++ b/components-starter/camel-amqp-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-amqp ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java index b7d88ed16e30..4713433f5ffc 100644 --- a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java +++ b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CreateDownloadLinkOperationTest.java @@ -25,6 +25,7 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; @@ -32,8 +33,10 @@ import org.springframework.test.annotation.DirtiesContext; import software.amazon.awssdk.services.s3.S3Client; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + //Based on S3CreateDownloadLinkOperationIT @DirtiesContext diff --git a/components-starter/camel-hashicorp-vault-starter/pom.xml b/components-starter/camel-hashicorp-vault-starter/pom.xml index 0f1a069f376c..74a05afda3a4 100644 --- a/components-starter/camel-hashicorp-vault-starter/pom.xml +++ b/components-starter/camel-hashicorp-vault-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-hashicorp-vault ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-jms-starter/pom.xml b/components-starter/camel-jms-starter/pom.xml index 9c3684b00120..03f37b01e97e 100644 --- a/components-starter/camel-jms-starter/pom.xml +++ b/components-starter/camel-jms-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-jms ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-jpa-starter/pom.xml b/components-starter/camel-jpa-starter/pom.xml index 60ad1378014e..ccd00a91d1c5 100644 --- a/components-starter/camel-jpa-starter/pom.xml +++ b/components-starter/camel-jpa-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-jpa ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-platform-http-starter/pom.xml b/components-starter/camel-platform-http-starter/pom.xml index dfe61f3ebb3f..38cabb97d6c0 100644 --- a/components-starter/camel-platform-http-starter/pom.xml +++ b/components-starter/camel-platform-http-starter/pom.xml @@ -50,11 +50,20 @@ ${spring-boot-version} + org.springframework.boot + spring-boot-starter-security-oauth2-client + ${spring-boot-version} + + + + + + org.springframework.boot spring-boot-starter-actuator @@ -85,6 +94,24 @@ ${spring-session-hazelcast-version} test + + org.springframework.boot + spring-boot-restclient + ${spring-boot-version} + test + + + org.springframework.boot + spring-boot-resttestclient + ${spring-boot-version} + test + + + org.springframework.boot + spring-boot-webmvc-test + ${spring-boot-version} + test + com.hazelcast hazelcast diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java index a9fdbc9d0563..2f3ec376d407 100644 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java +++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.web.servlet.WebMvcProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.webmvc.autoconfigure.WebMvcProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformWebMvcConfiguration.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformWebMvcConfiguration.java index d8b2d71e79d4..b3c36c98f4d0 100644 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformWebMvcConfiguration.java +++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformWebMvcConfiguration.java @@ -17,8 +17,8 @@ package org.apache.camel.component.platform.http.springboot; import org.apache.camel.spring.boot.ComponentConfigurationProperties; -import org.springframework.boot.autoconfigure.web.servlet.WebMvcProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.webmvc.autoconfigure.WebMvcProperties; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowComponents.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowComponents.java deleted file mode 100644 index 0aab75a88465..000000000000 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowComponents.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow; - -import io.undertow.Undertow; -import io.undertow.server.session.SessionManager; -import io.undertow.servlet.api.Deployment; -import org.xnio.XnioWorker; - -public record UndertowComponents(XnioWorker xnioWorker, SessionManager sessionManager, - Deployment deployment, Undertow undertow) { } diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetrics.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetrics.java deleted file mode 100644 index 1b64570dff6e..000000000000 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetrics.java +++ /dev/null @@ -1,338 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow; - -import io.micrometer.core.instrument.FunctionCounter; -import io.micrometer.core.instrument.Gauge; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Tags; -import io.micrometer.core.instrument.binder.BaseUnits; -import io.micrometer.core.instrument.binder.MeterBinder; -import io.undertow.server.session.SessionManager; -import io.undertow.servlet.api.Deployment; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.xnio.XnioWorker; - -import javax.management.AttributeNotFoundException; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanException; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.management.ReflectionException; -import java.lang.management.ManagementFactory; -import java.util.function.Supplier; - -/** - * {@link MeterBinder} for Undertow. - *

- * This binder provides metrics for XNIO worker threads and session management. - * - */ -public class UndertowMetrics implements MeterBinder, AutoCloseable { - private static final Logger LOG = LoggerFactory.getLogger(UndertowMetrics.class); - - private final XnioWorker xnioWorker; - private final SessionManager sessionManager; - private final Deployment deployment; - private final Iterable tags; - private final MBeanServer mBeanServer; - - public UndertowMetrics(XnioWorker xnioWorker, - SessionManager sessionManager, - Iterable tags) { - this(xnioWorker, sessionManager, null, tags, ManagementFactory.getPlatformMBeanServer()); - } - - public UndertowMetrics(XnioWorker xnioWorker, - SessionManager sessionManager, - Deployment deployment, - Iterable tags) { - this(xnioWorker, sessionManager, deployment, tags, ManagementFactory.getPlatformMBeanServer()); - } - - public UndertowMetrics(XnioWorker xnioWorker, - SessionManager sessionManager, - Deployment deployment, - Iterable tags, - MBeanServer mBeanServer) { - this.xnioWorker = xnioWorker; - this.sessionManager = sessionManager; - this.deployment = deployment; - this.tags = tags; - this.mBeanServer = mBeanServer; - } - - public static void monitor(MeterRegistry registry, - XnioWorker xnioWorker, - SessionManager sessionManager, - String... tags) { - monitor(registry, xnioWorker, sessionManager, Tags.of(tags)); - } - - public static void monitor(MeterRegistry registry, - XnioWorker xnioWorker, - SessionManager sessionManager, - Iterable tags) { - new UndertowMetrics(xnioWorker, sessionManager, tags).bindTo(registry); - } - - public static void monitor(MeterRegistry registry, - XnioWorker xnioWorker, - SessionManager sessionManager, - Deployment deployment, - Iterable tags) { - new UndertowMetrics(xnioWorker, sessionManager, deployment, tags).bindTo(registry); - } - - @Override - public void bindTo(MeterRegistry registry) { - registerWorkerThreadMetrics(registry); - registerSessionMetrics(registry); - registerJmxMetrics(registry); - } - - private void registerWorkerThreadMetrics(MeterRegistry registry) { - if (xnioWorker == null) { - return; - } - - // Core worker pool size - Gauge.builder("undertow.threads.worker.core", xnioWorker, this::getCoreWorkerPoolSize) - .tags(tags) - .baseUnit(BaseUnits.THREADS) - .description("Core worker thread pool size") - .register(registry); - - // Maximum worker pool size - Gauge.builder("undertow.threads.worker.max", xnioWorker, this::getMaxWorkerPoolSize) - .tags(tags) - .baseUnit(BaseUnits.THREADS) - .description("Maximum worker thread pool size") - .register(registry); - - // Current worker thread count - Gauge.builder("undertow.threads.worker.current", xnioWorker, this::getCurrentWorkerThreadCount) - .tags(tags) - .baseUnit(BaseUnits.THREADS) - .description("Current worker thread count") - .register(registry); - - // Busy worker thread count - Gauge.builder("undertow.threads.worker.busy", xnioWorker, this::getBusyWorkerThreadCount) - .tags(tags) - .baseUnit(BaseUnits.THREADS) - .description("Busy worker thread count") - .register(registry); - - // Worker thread utilization percentage - Gauge.builder("undertow.threads.worker.utilization", xnioWorker, this::getWorkerThreadUtilization) - .tags(tags) - .baseUnit(BaseUnits.PERCENT) - .description("Worker thread utilization percentage") - .register(registry); - - // Worker queue size - Gauge.builder("undertow.threads.worker.queue.size", xnioWorker, this::getWorkerQueueSize) - .tags(tags) - .description("Worker thread queue size") - .register(registry); - - // IO thread count - Gauge.builder("undertow.threads.io", xnioWorker, XnioWorker::getIoThreadCount) - .tags(tags) - .baseUnit(BaseUnits.THREADS) - .description("IO thread count") - .register(registry); - } - - private void registerSessionMetrics(MeterRegistry registry) { - if (sessionManager == null) { - return; - } - - // Active sessions - Gauge.builder("undertow.sessions.active.current", sessionManager, this::getActiveSessions) - .tags(tags) - .baseUnit(BaseUnits.SESSIONS) - .description("Current active sessions") - .register(registry); - - // Maximum sessions (if available) - Gauge.builder("undertow.sessions.active.max", sessionManager, this::getMaxSessions) - .tags(tags) - .baseUnit(BaseUnits.SESSIONS) - .description("Maximum sessions allowed") - .register(registry); - - // Session creation rate (if statistics are available) - FunctionCounter.builder("undertow.sessions.created", sessionManager, this::getCreatedSessions) - .tags(tags) - .baseUnit(BaseUnits.SESSIONS) - .description("Total sessions created") - .register(registry); - - // Expired sessions - FunctionCounter.builder("undertow.sessions.expired", sessionManager, this::getExpiredSessions) - .tags(tags) - .baseUnit(BaseUnits.SESSIONS) - .description("Total sessions expired") - .register(registry); - } - - private void registerJmxMetrics(MeterRegistry registry) { - // Register any available JMX-based metrics for Undertow - // This is a placeholder for when JMX beans are available - registerJmxMetricsIfAvailable(":type=thread-pool,name=*", registry); - } - - private void registerJmxMetricsIfAvailable(String objectNamePattern, MeterRegistry registry) { - try { - ObjectName pattern = new ObjectName("jboss.threads" + objectNamePattern); - var objectNames = mBeanServer.queryNames(pattern, null); - - for (ObjectName objectName : objectNames) { - // Register JMX-based thread pool metrics if available - registerJmxThreadPoolMetrics(objectName, registry); - } - } catch (Exception e) { - // JMX beans not available, skip - } - } - - private void registerJmxThreadPoolMetrics(ObjectName objectName, MeterRegistry registry) { - Iterable allTags = Tags.concat(tags, Tags.of("name", getNameFromObjectName(objectName))); - - Gauge.builder("undertow.threads.jmx.active", mBeanServer, - s -> safeDouble(() -> { - try { - return s.getAttribute(objectName, "ActiveCount"); - } catch (Exception e) { - throw new RuntimeException(e); - } - })) - .tags(allTags) - .baseUnit(BaseUnits.THREADS) - .description("Active threads from JMX") - .register(registry); - - Gauge.builder("undertow.threads.jmx.pool.size", mBeanServer, - s -> safeDouble(() -> { - try { - return s.getAttribute(objectName, "PoolSize"); - } catch (Exception e) { - throw new RuntimeException(e); - } - })) - .tags(allTags) - .baseUnit(BaseUnits.THREADS) - .description("Thread pool size from JMX") - .register(registry); - } - - private double getCoreWorkerPoolSize(XnioWorker worker) { - return safeDouble(() -> this.xnioWorker.getMXBean().getCoreWorkerPoolSize()); - } - - private double getMaxWorkerPoolSize(XnioWorker worker) { - return safeDouble(() -> this.xnioWorker.getMXBean().getMaxWorkerPoolSize()); - } - - private double getCurrentWorkerThreadCount(XnioWorker worker) { - return safeDouble(() -> worker.getMXBean().getWorkerPoolSize()); - } - - private double getBusyWorkerThreadCount(XnioWorker worker) { - return safeDouble(() -> worker.getMXBean().getBusyWorkerThreadCount()); - } - - private double getWorkerThreadUtilization(XnioWorker worker) { - double current = getCurrentWorkerThreadCount(worker); - double total = getCoreWorkerPoolSize(worker); - if (total > 0 && !Double.isNaN(current) && !Double.isNaN(total)) { - return (current / total) * 100.0; - } - return Double.NaN; - } - - private double getWorkerQueueSize(XnioWorker worker) { - return safeDouble(() -> worker.getMXBean().getWorkerQueueSize()); - } - - // Session metrics - private double getActiveSessions(SessionManager manager) { - if (manager.getStatistics() != null) { - return safeDouble(() -> manager.getStatistics().getActiveSessionCount()); - } - if (deployment != null && deployment.getSessionManager() != null) { - return safeDouble(() -> deployment.getSessionManager().getActiveSessions().size()); - } - return Double.NaN; - } - - private double getMaxSessions(SessionManager manager) { - if (manager.getStatistics() != null) { - return safeDouble(() -> manager.getStatistics().getMaxActiveSessions()); - } - return Double.NaN; - } - - private double getCreatedSessions(SessionManager manager) { - if (manager.getStatistics() != null) { - return safeDouble(() -> manager.getStatistics().getCreatedSessionCount()); - } - return Double.NaN; - } - - private double getExpiredSessions(SessionManager manager) { - if (manager.getStatistics() != null) { - return safeDouble(() -> manager.getStatistics().getExpiredSessionCount()); - } - return Double.NaN; - } - - // Utility methods - private double safeDouble(Supplier supplier) { - try { - Object result = supplier.get(); - if (result == null) { - return Double.NaN; - } - if (result instanceof Number) { - return ((Number) result).doubleValue(); - } - return Double.parseDouble(result.toString()); - } catch (Exception e) { - LOG.trace(e.getMessage(), e); - return Double.NaN; - } - } - - private String getNameFromObjectName(ObjectName objectName) { - String name = objectName.getKeyProperty("name"); - return name != null ? name.replace("\"", "") : "unknown"; - } - - - @Override - public void close() { - // Cleanup any resources if needed - // Currently no resources to clean up, but this provides the interface - // for future enhancements - } -} diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsAutoConfiguration.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsAutoConfiguration.java deleted file mode 100644 index 9a52e0f55aac..000000000000 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsAutoConfiguration.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow; - -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.binder.MeterBinder; -import io.undertow.Undertow; -import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.context.annotation.Bean; - -/** - * {@link EnableAutoConfiguration Auto-configuration} for {@link UndertowMetrics}. - * - */ -@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class) -@ConditionalOnWebApplication -@ConditionalOnClass({ Undertow.class, MeterBinder.class, CompositeMeterRegistryAutoConfiguration.class }) -public class UndertowMetricsAutoConfiguration { - - @Bean - @ConditionalOnBean(MeterRegistry.class) - @ConditionalOnMissingBean({ UndertowMetrics.class, UndertowMetricsBinder.class }) - public UndertowMetricsBinder undertowMetricsBinder(MeterRegistry meterRegistry) { - return new UndertowMetricsBinder(meterRegistry); - } - -} diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsBinder.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsBinder.java deleted file mode 100644 index fe1a23c1ecd2..000000000000 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/actuate/metrics/undertow/UndertowMetricsBinder.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow; - -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.Tag; -import io.undertow.Undertow; -import io.undertow.servlet.api.DeploymentManager; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.boot.context.event.ApplicationStartedEvent; -import org.springframework.boot.web.context.WebServerApplicationContext; -import org.springframework.boot.web.embedded.undertow.UndertowServletWebServer; -import org.springframework.boot.web.server.WebServer; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationListener; -import org.xnio.XnioWorker; - -import java.util.Collections; - -public class UndertowMetricsBinder implements ApplicationListener, DisposableBean { - - private final MeterRegistry meterRegistry; - private final Iterable tags; - private volatile UndertowMetrics undertowMetrics; - - public UndertowMetricsBinder(MeterRegistry meterRegistry) { - this(meterRegistry, Collections.emptyList()); - } - - public UndertowMetricsBinder(MeterRegistry meterRegistry, Iterable tags) { - this.meterRegistry = meterRegistry; - this.tags = tags; - } - - @Override - public void destroy() { - if (this.undertowMetrics != null) { - this.undertowMetrics.close(); - } - } - - @Override - public void onApplicationEvent(ApplicationStartedEvent event) { - ApplicationContext applicationContext = event.getApplicationContext(); - UndertowComponents undertowComponents = findUndertowComponents(applicationContext); - if (undertowComponents != null) { - this.undertowMetrics = new UndertowMetrics(undertowComponents.xnioWorker(), undertowComponents.sessionManager(), - undertowComponents.deployment(), tags); - this.undertowMetrics.bindTo(this.meterRegistry); - } - } - - private UndertowComponents findUndertowComponents(ApplicationContext applicationContext) { - if (applicationContext instanceof WebServerApplicationContext webServerApplicationContext) { - WebServer webServer = webServerApplicationContext.getWebServer(); - if (webServer instanceof UndertowServletWebServer undertowServletWebServer) { - Undertow undertow = undertowServletWebServer.getUndertow(); - XnioWorker xnioWorker = undertowServletWebServer.getUndertow().getWorker(); - DeploymentManager deploymentManager = undertowServletWebServer.getDeploymentManager(); - - return new UndertowComponents( - xnioWorker, - deploymentManager.getDeployment().getSessionManager(), - deploymentManager.getDeployment(), - undertow - ); - } - } - return null; - } - -} diff --git a/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 84a0a5df88d1..0fff74df9c76 100644 --- a/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -19,4 +19,8 @@ org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConvert org.apache.camel.component.platform.http.springboot.PlatformHttpComponentAutoConfiguration org.apache.camel.component.platform.http.springboot.SpringBootPlatformHttpAutoConfiguration org.apache.camel.component.platform.http.springboot.SpringBootPlatformWebMvcConfiguration -org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow.UndertowMetricsAutoConfiguration \ No newline at end of file +## TODO reintroduce once spring-boot-starter-undertow will be available +## AND CHERRY PICK +## https://github.com/apache/camel-spring-boot/commit/1bb2b737a4cc1301945a1084e5a5cbb2e4744690 +## https://github.com/apache/camel-spring-boot/commit/16e8983051d473638701edcbb8b333022ac2eb90 +##org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow.UndertowMetricsAutoConfiguration \ No newline at end of file diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java index 9da4de07b19e..ff9decdb39d1 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java @@ -23,18 +23,21 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) @CamelSpringBootTest diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java index 40b02e9f372a..8deeee78eab1 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java @@ -22,7 +22,7 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.http.HttpStatusCode; import java.util.concurrent.TimeUnit; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java index aacd921090e4..d0797f6a626d 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java @@ -25,8 +25,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java index 3efd0eff1eb8..98e412e2fe5f 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java @@ -26,8 +26,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java index d31aa4d9a7b4..8df70edf2845 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java @@ -26,10 +26,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java index 86d91a28eeb9..8d2a071a19b7 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java @@ -23,8 +23,8 @@ import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java index b0e8cf7a9417..d4eccd8df7ba 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java @@ -51,8 +51,8 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java index 9c09d1aea349..d4980bbc1fe4 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java @@ -30,10 +30,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java index ac2c9a187458..9bf7c671483f 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java index 65b4c7e4cd24..fb18cd56955f 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java index 9a271552c2dc..bcbcb01fe53a 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java @@ -30,10 +30,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java index a0a14d4308ec..145d99c44c67 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java @@ -30,8 +30,8 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java index f24631b87786..4222e80fd036 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java @@ -26,10 +26,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java index 6ef1c2d37d05..7dac85cd4bad 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java @@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java index cbb7f63b5879..5f003baf5423 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java @@ -25,8 +25,8 @@ import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.task.SimpleAsyncTaskExecutorBuilder; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java index 2d7dd8f48b66..5f95a1d23f02 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java @@ -23,15 +23,16 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; @EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) @CamelSpringBootTest diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java index 2d37c36b44e2..b36ff89ca250 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java @@ -29,17 +29,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.wiremock.spring.ConfigureWireMock; import org.wiremock.spring.EnableWireMock; -import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java index f01cf5df8b56..025529a93220 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java @@ -23,11 +23,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatusCode; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java index df7612917797..29acb0c2348d 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java @@ -20,8 +20,10 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java index 39cecf87d83b..f92d8f82de57 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java @@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java index a2e69f27039f..d79c41323e19 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java @@ -20,8 +20,8 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java index 3032c3b94f6e..987739e34aa1 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java @@ -25,10 +25,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java index 926e1b18cac3..be1b4b8f5bab 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java @@ -31,10 +31,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java index e484ee282a31..e12f131b2b75 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java index 9541f8d64d02..7fc3f4e9995d 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-pqc-starter/pom.xml b/components-starter/camel-pqc-starter/pom.xml index 2edad02bd36b..0093dffa17e2 100644 --- a/components-starter/camel-pqc-starter/pom.xml +++ b/components-starter/camel-pqc-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-pqc ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-servlet-starter/pom.xml b/components-starter/camel-servlet-starter/pom.xml index 134e6e890416..095d0469bb9a 100644 --- a/components-starter/camel-servlet-starter/pom.xml +++ b/components-starter/camel-servlet-starter/pom.xml @@ -50,6 +50,11 @@ ${jakarta-servlet-api-version} provided + + org.springframework.boot + spring-boot-servlet + ${spring-boot-version} + org.springframework.boot diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java index 61d3c4657480..b386aaba5382 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.servlet.autoconfigure.MultipartProperties; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/components-starter/camel-spring-batch-starter/pom.xml b/components-starter/camel-spring-batch-starter/pom.xml index b619de66befb..052793bf5c7d 100644 --- a/components-starter/camel-spring-batch-starter/pom.xml +++ b/components-starter/camel-spring-batch-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-spring-batch ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-spring-cloud-config-starter/pom.xml b/components-starter/camel-spring-cloud-config-starter/pom.xml index 644581f7f27a..3a9f78737a58 100644 --- a/components-starter/camel-spring-cloud-config-starter/pom.xml +++ b/components-starter/camel-spring-cloud-config-starter/pom.xml @@ -47,6 +47,10 @@ ch.qos.logback logback-core + + commons-logging + commons-logging + diff --git a/components-starter/camel-spring-jdbc-starter/pom.xml b/components-starter/camel-spring-jdbc-starter/pom.xml index c73f179fa676..028b0ad7932e 100644 --- a/components-starter/camel-spring-jdbc-starter/pom.xml +++ b/components-starter/camel-spring-jdbc-starter/pom.xml @@ -42,6 +42,14 @@ org.apache.camel camel-spring-jdbc ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-spring-ldap-starter/pom.xml b/components-starter/camel-spring-ldap-starter/pom.xml index 1543d009c452..d2687df4317e 100644 --- a/components-starter/camel-spring-ldap-starter/pom.xml +++ b/components-starter/camel-spring-ldap-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-spring-ldap ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-spring-rabbitmq-starter/pom.xml b/components-starter/camel-spring-rabbitmq-starter/pom.xml index fa5829622379..b3faeea4a89a 100644 --- a/components-starter/camel-spring-rabbitmq-starter/pom.xml +++ b/components-starter/camel-spring-rabbitmq-starter/pom.xml @@ -37,6 +37,14 @@ org.apache.camel camel-spring-rabbitmq ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq.json b/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq.json index 19ce46c5f3ab..6b6d5e7be5ff 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq.json +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/docs/spring-rabbitmq.json @@ -203,8 +203,8 @@ }, { "name": "camel.component.spring-rabbitmq.retry", - "type": "org.springframework.retry.interceptor.RetryOperationsInterceptor", - "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. The option is a org.springframework.retry.interceptor.RetryOperationsInterceptor type.", + "type": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", + "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. The option is a org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor type.", "sourceType": "org.apache.camel.component.springrabbit.springboot.SpringRabbitMQComponentConfiguration" }, { diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java index e0ca855a356b..d9e5fd6262e8 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConfiguration.java @@ -22,10 +22,10 @@ import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.springframework.amqp.core.AmqpAdmin; +import org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.retry.interceptor.RetryOperationsInterceptor; import org.springframework.util.ErrorHandler; /** @@ -153,9 +153,9 @@ public class SpringRabbitMQComponentConfiguration * Custom retry configuration to use. If this is configured then the other * settings such as maximumRetryAttempts for retry are not in use. The * option is a - * org.springframework.retry.interceptor.RetryOperationsInterceptor type. + * org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor type. */ - private RetryOperationsInterceptor retry; + private StatelessRetryOperationsInterceptor retry; /** * The time to wait for workers in milliseconds after the container is * stopped. If any workers are active when the shutdown signal comes they @@ -388,11 +388,11 @@ public void setPrefetchCount(Integer prefetchCount) { this.prefetchCount = prefetchCount; } - public RetryOperationsInterceptor getRetry() { + public StatelessRetryOperationsInterceptor getRetry() { return retry; } - public void setRetry(RetryOperationsInterceptor retry) { + public void setRetry(StatelessRetryOperationsInterceptor retry) { this.retry = retry; } diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java index 29cbc848399f..e662f6265a0a 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java @@ -43,7 +43,7 @@ public Set getConvertibleTypes() { answer.add(new ConvertiblePair(String.class, org.springframework.amqp.rabbit.connection.ConnectionFactory.class)); answer.add(new ConvertiblePair(String.class, org.springframework.util.ErrorHandler.class)); answer.add(new ConvertiblePair(String.class, org.apache.camel.component.springrabbit.ListenerContainerFactory.class)); - answer.add(new ConvertiblePair(String.class, org.springframework.retry.interceptor.RetryOperationsInterceptor.class)); + answer.add(new ConvertiblePair(String.class, org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class)); answer.add(new ConvertiblePair(String.class, org.springframework.amqp.support.converter.MessageConverter.class)); answer.add(new ConvertiblePair(String.class, org.apache.camel.component.springrabbit.MessagePropertiesConverter.class)); answer.add(new ConvertiblePair(String.class, org.apache.camel.spi.HeaderFilterStrategy.class)); @@ -67,7 +67,7 @@ public Object convert( case "org.springframework.amqp.rabbit.connection.ConnectionFactory": return applicationContext.getBean(ref, org.springframework.amqp.rabbit.connection.ConnectionFactory.class); case "org.springframework.util.ErrorHandler": return applicationContext.getBean(ref, org.springframework.util.ErrorHandler.class); case "org.apache.camel.component.springrabbit.ListenerContainerFactory": return applicationContext.getBean(ref, org.apache.camel.component.springrabbit.ListenerContainerFactory.class); - case "org.springframework.retry.interceptor.RetryOperationsInterceptor": return applicationContext.getBean(ref, org.springframework.retry.interceptor.RetryOperationsInterceptor.class); + case "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor": return applicationContext.getBean(ref, org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class); case "org.springframework.amqp.support.converter.MessageConverter": return applicationContext.getBean(ref, org.springframework.amqp.support.converter.MessageConverter.class); case "org.apache.camel.component.springrabbit.MessagePropertiesConverter": return applicationContext.getBean(ref, org.apache.camel.component.springrabbit.MessagePropertiesConverter.class); case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); diff --git a/components-starter/camel-spring-redis-starter/pom.xml b/components-starter/camel-spring-redis-starter/pom.xml index 3c5272c1a543..97d0f4ef702c 100644 --- a/components-starter/camel-spring-redis-starter/pom.xml +++ b/components-starter/camel-spring-redis-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-spring-redis ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-spring-starter/pom.xml b/components-starter/camel-spring-starter/pom.xml index dc6cb0acbc33..5c82b67a779e 100644 --- a/components-starter/camel-spring-starter/pom.xml +++ b/components-starter/camel-spring-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-spring ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-spring-ws-starter/pom.xml b/components-starter/camel-spring-ws-starter/pom.xml index 5fa2184649c2..88f1bcd7c6d9 100644 --- a/components-starter/camel-spring-ws-starter/pom.xml +++ b/components-starter/camel-spring-ws-starter/pom.xml @@ -43,6 +43,14 @@ org.apache.camel camel-spring-ws ${camel-version} + + + + commons-logging + commons-logging + + + diff --git a/components-starter/camel-sql-starter/pom.xml b/components-starter/camel-sql-starter/pom.xml index e0f32ecb7a12..257ed49c15d1 100644 --- a/components-starter/camel-sql-starter/pom.xml +++ b/components-starter/camel-sql-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-sql ${camel-version} + + + + commons-logging + commons-logging + + + org.springframework.boot diff --git a/components-starter/camel-undertow-spring-security-starter/pom.xml b/components-starter/camel-undertow-spring-security-starter/pom.xml index 4bd7be246ec8..32c52a31aa7d 100644 --- a/components-starter/camel-undertow-spring-security-starter/pom.xml +++ b/components-starter/camel-undertow-spring-security-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-undertow-spring-security ${camel-version} + + + + commons-logging + commons-logging + + + org.apache.camel.springboot diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml index 6d10d2424a30..73d6977f147d 100644 --- a/core/camel-spring-boot/pom.xml +++ b/core/camel-spring-boot/pom.xml @@ -95,6 +95,12 @@ + + org.springframework.boot + spring-boot-starter-restclient + ${spring-boot-version} + test + org.apache.camel camel-spring-xml diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json b/core/camel-spring-boot/src/main/docs/spring-boot.json index ae91b5590947..2705f05a5ee7 100644 --- a/core/camel-spring-boot/src/main/docs/spring-boot.json +++ b/core/camel-spring-boot/src/main/docs/spring-boot.json @@ -2164,42 +2164,6 @@ "replacement": "camel.main.run-controller", "since": "4.14.0" } - }, - { - "name": "management.endpoint.camel.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable the camel endpoint.", - "sourceType": "org.apache.camel.spring.boot.actuate.console.CamelDevConsoleEndpoint", - "defaultValue": true, - "deprecated": true, - "deprecation": { - "replacement": "management.endpoint.camel.access", - "since": "3.4.0" - } - }, - { - "name": "management.endpoint.camelroutecontroller.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable the camelroutecontroller endpoint.", - "sourceType": "org.apache.camel.spring.boot.actuate.endpoint.CamelRouteControllerEndpoint", - "defaultValue": true, - "deprecated": true, - "deprecation": { - "replacement": "management.endpoint.camelroutecontroller.access", - "since": "3.4.0" - } - }, - { - "name": "management.endpoint.camelroutes.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable the camelroutes endpoint.", - "sourceType": "org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint", - "defaultValue": true, - "deprecated": true, - "deprecation": { - "replacement": "management.endpoint.camelroutes.access", - "since": "3.4.0" - } } ], "hints": [], diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java index 44d42afe3774..0b776ef4c15d 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java @@ -16,22 +16,23 @@ */ package org.apache.camel.spring.boot.actuate.health; -import java.time.Duration; -import java.time.ZonedDateTime; import org.apache.camel.spring.boot.actuate.health.liveness.CamelLivenessStateHealthIndicator; import org.apache.camel.spring.boot.actuate.health.readiness.CamelReadinessStateHealthIndicator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.HealthContributorRegistry; -import org.springframework.boot.actuate.health.HealthIndicator; -import org.springframework.boot.actuate.health.NamedContributor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.HealthContributors; +import org.springframework.boot.health.contributor.HealthIndicator; +import org.springframework.boot.health.registry.HealthContributorRegistry; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import java.time.Duration; +import java.time.ZonedDateTime; + /** * Configuration class that replace synchronous Camel Health Checks with asynchronous ones. * @@ -63,9 +64,9 @@ public AsyncHealthIndicatorAutoConfiguration(HealthContributorRegistry healthCon @Override public void afterPropertiesSet() throws Exception { - for (NamedContributor namedContributor : healthContributorRegistry) { - final String name = namedContributor.getName(); - final Object contributor = namedContributor.getContributor(); + for (HealthContributors.Entry entryContributor : healthContributorRegistry) { + final String name = entryContributor.name(); + final Object contributor = entryContributor.contributor(); if (contributor instanceof CamelHealthCheckIndicator || contributor instanceof CamelLivenessStateHealthIndicator || contributor instanceof CamelReadinessStateHealthIndicator) { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelAvailabilityCheckAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelAvailabilityCheckAutoConfiguration.java index fe7d2bb6c1fe..acdc5a980e17 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelAvailabilityCheckAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelAvailabilityCheckAutoConfiguration.java @@ -21,12 +21,12 @@ import org.apache.camel.spring.boot.actuate.health.liveness.CamelLivenessStateHealthIndicator; import org.apache.camel.spring.boot.actuate.health.readiness.CamelReadinessStateHealthIndicator; -import org.springframework.boot.actuate.availability.LivenessStateHealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.availability.ApplicationAvailabilityAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.availability.ApplicationAvailability; +import org.springframework.boot.health.application.LivenessStateHealthIndicator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java index 3df41a361d73..df64e3bab670 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java @@ -24,12 +24,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java index 4d4ca4c7dfe2..cc481dacb71c 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java @@ -16,17 +16,17 @@ */ package org.apache.camel.spring.boot.actuate.health; -import java.util.Collection; -import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckHelper; import org.apache.camel.impl.health.AbstractHealthCheck; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import org.springframework.context.ApplicationContext; +import java.util.Collection; +import java.util.Map; + /** * Camel {@link HealthIndicator}. */ diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java index ac64499765c8..0f761f85c533 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java @@ -16,14 +16,14 @@ */ package org.apache.camel.spring.boot.actuate.health; +import org.apache.camel.health.HealthCheck; +import org.springframework.boot.health.contributor.Health; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import java.util.TreeMap; -import org.apache.camel.health.HealthCheck; -import org.springframework.boot.actuate.health.Health; final class CamelHealthHelper { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java index a9771efce91a..9f9ad805077f 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java @@ -23,10 +23,10 @@ import org.apache.camel.spring.boot.actuate.health.CamelProbesHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.actuate.availability.LivenessStateHealthIndicator; import org.springframework.boot.availability.ApplicationAvailability; import org.springframework.boot.availability.AvailabilityState; import org.springframework.boot.availability.LivenessState; +import org.springframework.boot.health.application.LivenessStateHealthIndicator; public class CamelLivenessStateHealthIndicator extends LivenessStateHealthIndicator { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java index b4a034a89394..cce7f3f36f6a 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java @@ -23,10 +23,10 @@ import org.apache.camel.spring.boot.actuate.health.CamelProbesHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.actuate.availability.ReadinessStateHealthIndicator; import org.springframework.boot.availability.ApplicationAvailability; import org.springframework.boot.availability.AvailabilityState; import org.springframework.boot.availability.ReadinessState; +import org.springframework.boot.health.application.ReadinessStateHealthIndicator; public class CamelReadinessStateHealthIndicator extends ReadinessStateHealthIndicator { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java index 637e29fb3f7b..bd673b75683f 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java @@ -36,6 +36,7 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.ClassMetadata; @@ -247,5 +248,10 @@ public MetadataReader getMetadataReader(Resource resource) { } return DEFAULT; } + + @Override + public ResourceLoader getResourceLoader() { + return delegate.getResourceLoader(); + } } } diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java index b8f2dafa7bdc..d8279e4c6abf 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java @@ -22,9 +22,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.health.Health; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.health.contributor.Health; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java index 3f974e928c9e..a9804ea22135 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.spring.boot.actuate.health; -import java.io.IOException; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; @@ -24,9 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalManagementPort; -import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatusCode; @@ -34,6 +33,8 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.ResponseErrorHandler; +import java.io.IOException; + @CamelSpringBootTest @EnableAutoConfiguration @SpringBootApplication @@ -55,15 +56,15 @@ public class CamelProbesTest { public void testMetrics() { ResponseEntity livenessResponse = restTemplateBuilder .rootUri("http://localhost:" + managementPort + "/actuator").build() - .exchange("/health/liveness", HttpMethod.GET, new HttpEntity<>(null), String.class); + .exchange("/health/liveness", HttpMethod.GET, HttpEntity.EMPTY, String.class); ResponseEntity readinessResponse = restTemplateBuilder.errorHandler(new NoOpErrorHandler()) .rootUri("http://localhost:" + managementPort + "/actuator").build() - .exchange("/health/readiness", HttpMethod.GET, new HttpEntity<>(null), String.class); + .exchange("/health/readiness", HttpMethod.GET, HttpEntity.EMPTY, String.class); ResponseEntity healthResponse = restTemplateBuilder.errorHandler(new NoOpErrorHandler()) .rootUri("http://localhost:" + managementPort + "/actuator").build() - .exchange("/health", HttpMethod.GET, new HttpEntity<>(null), String.class); + .exchange("/health", HttpMethod.GET, HttpEntity.EMPTY, String.class); Assertions.assertThat(livenessResponse.getStatusCode()).isEqualTo(HttpStatusCode.valueOf(200)); Assertions.assertThat(livenessResponse.getBody()).isEqualTo("{\"status\":\"UP\"}"); From 7a097cbb5487c22301a78644194d6193e2de2c89 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Wed, 17 Dec 2025 15:22:20 -0500 Subject: [PATCH 3/7] Related to spring boot 4.0 upgrade - search through directories for jaxb.index --- .../org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java b/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java index 62540ac7381d..b04852d313c5 100644 --- a/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java +++ b/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java @@ -183,7 +183,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) { return; } // Register all JAXB indexes - hints.resources().registerPattern("*/jaxb.index"); + hints.resources().registerPattern("**/jaxb.index"); hints.reflection().registerTypeIfPresent(classLoader, "jakarta.xml.bind.annotation.W3CDomHandler", MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS); From 3f3378d869072c133695d515571ce3621c242765 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Wed, 17 Dec 2025 15:35:52 -0500 Subject: [PATCH 4/7] Add jackson-databind dependency needed by spring boot 4 --- components-starter/camel-hashicorp-vault-starter/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components-starter/camel-hashicorp-vault-starter/pom.xml b/components-starter/camel-hashicorp-vault-starter/pom.xml index 74a05afda3a4..00bf89897f34 100644 --- a/components-starter/camel-hashicorp-vault-starter/pom.xml +++ b/components-starter/camel-hashicorp-vault-starter/pom.xml @@ -47,6 +47,11 @@ + + com.fasterxml.jackson.core + jackson-databind + test + org.awaitility awaitility From d77f63adf1a7f3d5103b178e9d51b153994aa040 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Wed, 17 Dec 2025 18:40:15 -0500 Subject: [PATCH 5/7] Fix RuntimeHints pattern to respond to Spring Boot 4 changes --- .../org/apache/camel/spring/boot/aot/CamelRuntimeHints.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java index ed6682ff1692..96bcd61ab334 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java @@ -63,7 +63,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) { * loader at the time of actual resource access */ private static void registerCamelServices(RuntimeHints hints, ClassLoader classLoader) { - hints.resources().registerPattern("META-INF/services/org/apache/camel/*"); + hints.resources().registerPattern("META-INF/services/org/apache/camel/**"); PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(classLoader); try { for (Resource resource : resolver.getResources("classpath*:META-INF/services/org/apache/camel/**")) { From 9af712d98d2912124d41686fe0a32fe6f0d69ed8 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Wed, 17 Dec 2025 18:40:43 -0500 Subject: [PATCH 6/7] Add pom template for spring-boot 4 --- .../test/resources/application-pom-sb4.xml | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 tests/camel-itest-spring-boot/src/test/resources/application-pom-sb4.xml diff --git a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb4.xml b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb4.xml new file mode 100644 index 000000000000..b62cd7fb4aae --- /dev/null +++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb4.xml @@ -0,0 +1,124 @@ + + + + + 4.0.0 + + com.company + spring-boot-application + 1.0 + + Spring-Boot Application + This a the base pom of spring-boot applications launched by the users + + + + + + + org.apache.camel.springboot + camel-spring-boot-bom + ${project.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot-version} + pom + import + + + + + + + + + org.apache.camel.springboot + camel-spring-boot-starter + + + org.springframework.boot + spring-boot-actuator + + + + org.apache.camel.springboot + #{module}-starter + + + + + org.junit.jupiter + junit-jupiter + 6.0.1 + test + + + + org.junit.platform + junit-platform-launcher + 6.0.1 + test + + + + + + + + + central + Maven Central + https://repo1.maven.org/maven2/ + + true + + + false + + + + apache-snapshots + Apache Snapshots + https://repository.apache.org/snapshots + + false + + + true + + + + atlassian-public + Atlassian Public + https://maven.atlassian.com/repository/public + + true + + + false + + + + From 50c5aa08fa8034d4fa4024f1d4701958ccb9240a Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Fri, 19 Dec 2025 17:09:22 -0500 Subject: [PATCH 7/7] spring-boot 4 changes for camel-platfrom-http-starter tests - TestRestTemplate has been deprecated in spring-boot 4, need to use RestTestClient --- .../camel-platform-http-starter/pom.xml | 16 +++++++++++ .../SpringBootPlatformHttpConsumer.java | 2 +- .../PlatformHttpAsyncRequestHandlingTest.java | 14 +++++++--- .../http/springboot/PlatformHttpBase.java | 20 +++++++++++--- .../springboot/PlatformHttpStreamingTest.java | 14 +++++++--- ...ngBootPlatformHttpBridgedEndpointTest.java | 15 ++++++++--- ...BootPlatformHttpCamelIntegrationsTest.java | 19 +++++++++---- ...otPlatformHttpCamelVirtualThreadsTest.java | 13 ++++++--- ...ringBootPlatformHttpCertificationTest.java | 26 +++++++++++++----- .../SpringBootPlatformHttpCookiesTest.java | 21 ++++++++++----- ...ngBootPlatformHttpCorsCredentialsTest.java | 14 +++++++--- .../SpringBootPlatformHttpCorsTest.java | 14 +++++++--- .../SpringBootPlatformHttpEngineTest.java | 19 +++++++++---- ...gBootPlatformHttpHandleWriteErrorTest.java | 25 ++++++++++++++--- ...gBootPlatformHttpJacksonConverterTest.java | 19 +++++++++---- ...BootPlatformHttpMultipleExecutorsTest.java | 25 +++++++++++++---- ...tpMultipleExecutorsVirtualThreadsTest.java | 25 +++++++++++++---- .../SpringBootPlatformHttpOptionsTest.java | 14 +++++++--- .../SpringBootPlatformHttpProxyTest.java | 21 +++++++++++---- ...ingBootPlatformHttpRequestTimeoutTest.java | 27 ++++++++++++++----- .../SpringBootPlatformHttpRestDSLTest.java | 15 +++++++---- .../SpringBootPlatformHttpSessionTest.java | 6 +++-- .../SpringBootPlatformHttpTest.java | 13 ++++++--- ...ringBootPlatformHttpTypeConverterTest.java | 19 +++++++++---- .../SpringBootPlatformHttpValidationTest.java | 19 +++++++++---- ...atformHttpVirtualThreadsOptimizedTest.java | 13 ++++++--- ...ingBootPlatformHttpVirtualThreadsTest.java | 13 ++++++--- 27 files changed, 356 insertions(+), 105 deletions(-) diff --git a/components-starter/camel-platform-http-starter/pom.xml b/components-starter/camel-platform-http-starter/pom.xml index 38cabb97d6c0..5972cd54d4b7 100644 --- a/components-starter/camel-platform-http-starter/pom.xml +++ b/components-starter/camel-platform-http-starter/pom.xml @@ -82,6 +82,12 @@ ${rest-assured-version} test + + org.springframework.boot + spring-boot-starter-test + ${spring-boot-version} + test + org.springframework.boot spring-boot-starter-security @@ -106,6 +112,11 @@ ${spring-boot-version} test + + org.springframework.boot + spring-boot-starter-restclient-test + test + org.springframework.boot spring-boot-webmvc-test @@ -122,6 +133,11 @@ org.springframework spring-aop + + org.springframework + spring-test + test + org.apache.camel.springboot camel-jackson-starter diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java index 271425e3e06c..0755375c58b5 100644 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java +++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java @@ -210,7 +210,7 @@ public void addCookie(String cookieName, String cookieValue) { @Override public String removeCookie(String cookieName) { - Cookie cookieToRemove = new Cookie(cookieName, null); + Cookie cookieToRemove = new Cookie(cookieName, ""); cookieToRemove.setPath(cookieConfiguration.getCookiePath()); // set max age to 0 to delete the cookie cookieToRemove.setMaxAge(0); diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java index ff9decdb39d1..52b60757dde9 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpAsyncRequestHandlingTest.java @@ -23,12 +23,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; @@ -39,7 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpRestDSLTest.class, PlatformHttpAsyncRequestHandlingTest.TestConfiguration.class, @@ -91,6 +91,14 @@ public void testPostAsync() throws Exception { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()) + .headers(headers -> headers.disable()); + return http.build(); + } + @Bean public RouteBuilder servletPlatformHttpRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java index 8deeee78eab1..448a2d02ae3a 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBase.java @@ -22,17 +22,20 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.http.HttpStatusCode; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; +import org.springframework.test.web.servlet.client.EntityExchangeResult; import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.assertEquals; +@AutoConfigureRestTestClient abstract class PlatformHttpBase { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -41,14 +44,23 @@ abstract class PlatformHttpBase { public void testGet() throws Exception { waitUntilRouteIsStarted(1, getGetRouteId()); - Assertions.assertThat(restTemplate.getForEntity("/myget", String.class).getStatusCode()).isEqualTo(HttpStatusCode.valueOf(200)); + EntityExchangeResult result = restTestClient.get().uri("/myget") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getStatus()).isEqualTo(HttpStatusCode.valueOf(200)); } @Test public void testPost() throws Exception { waitUntilRouteIsStarted(1, getPostRouteId()); - Assertions.assertThat(restTemplate.postForEntity("/mypost", "test", String.class).getBody()).isEqualTo("TEST"); + EntityExchangeResult result = restTestClient.post().uri("/mypost") + .body("test") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getResponseBody()).isEqualTo("TEST"); } protected void waitUntilRouteIsStarted(int atMostSeconds, String routeId) { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java index d0797f6a626d..1d92e987d5ae 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java @@ -25,12 +25,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpTest.class, PlatformHttpStreamingTest.TestConfiguration.class, @@ -157,6 +157,14 @@ void testStreamingWithSpecificEncoding() throws Exception { @Configuration public static class TestConfiguration { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder routeBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java index 98e412e2fe5f..c2d1b71afa89 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java @@ -23,15 +23,16 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import org.wiremock.spring.ConfigureWireMock; import org.wiremock.spring.EnableWireMock; @@ -39,12 +40,13 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpBridgedEndpointTest.class, SpringBootPlatformHttpBridgedEndpointTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, HttpComponentAutoConfiguration.class}) @EnableWireMock(@ConfigureWireMock(portProperties = "customPort")) +@Disabled("WireMock 3.10.6 has Jetty compatibility issues with Spring Boot 4 - requires WireMock upgrade to support Jetty 12") public class SpringBootPlatformHttpBridgedEndpointTest { @LocalServerPort @@ -64,6 +66,13 @@ public static class TestConfiguration { @Value("${wiremock.server.baseUrl}") private String wiremockUrl; + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java index 8df70edf2845..fc22bd5a0420 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java @@ -26,17 +26,19 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import static io.restassured.RestAssured.given; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration +@AutoConfigureRestTestClient @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpCamelIntegrationsTest.class, SpringBootPlatformHttpCamelIntegrationsTest.TestConfiguration.class, @@ -44,7 +46,7 @@ public class SpringBootPlatformHttpCamelIntegrationsTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -60,6 +62,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java index 8d2a071a19b7..039271d09f65 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelVirtualThreadsTest.java @@ -23,15 +23,15 @@ import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import static org.assertj.core.api.Assertions.assertThat; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpCamelVirtualThreadsTest.class, SpringBootPlatformHttpCamelVirtualThreadsTest.TestConfiguration.class, @@ -49,6 +49,13 @@ public class SpringBootPlatformHttpCamelVirtualThreadsTest extends PlatformHttpB @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder servletPlatformHttpRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java index d4eccd8df7ba..8a9b519dacca 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java @@ -51,12 +51,14 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.test.web.servlet.client.EntityExchangeResult; import static io.restassured.RestAssured.given; import static io.restassured.matcher.RestAssuredMatchers.detailedCookie; @@ -64,7 +66,8 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration +@AutoConfigureRestTestClient @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpCertificationTest.class, SpringBootPlatformHttpCertificationTest.TestConfiguration.class, @@ -84,6 +87,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { @@ -172,9 +182,13 @@ public void testLoad() throws Exception { ExecutorService es = Executors.newFixedThreadPool(10); List tasks = new ArrayList(); for (int i = 0; i < 1_000; i++) { - tasks.add(CompletableFuture.runAsync(() -> - Assertions.assertThat(restTemplate.getForEntity("/myget", String.class) - .getStatusCode().value()).isEqualTo(200), es)); + tasks.add(CompletableFuture.runAsync(() -> { + EntityExchangeResult result = restTestClient.get().uri("/myget") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getStatus().value()).isEqualTo(200); + }, es)); } for (CompletableFuture task : tasks) { task.get(); diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java index d4980bbc1fe4..53228b76db5f 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java @@ -30,9 +30,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -44,15 +45,16 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpCookiesTest.class, SpringBootPlatformHttpCookiesTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpCookiesTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -67,6 +69,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { @@ -137,7 +146,7 @@ public void testRemoveCookie() { .statusCode(200) .cookie("foo", detailedCookie() - .maxAge(equalTo(0L))) + .maxAge(equalTo(-1L))) .body(equalTo("remove")); } diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java index 9bf7c671483f..0cfe482f0f20 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java @@ -24,17 +24,17 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.*; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpCorsCredentialsTest.class, SpringBootPlatformHttpCorsCredentialsTest.TestConfiguration.class, @@ -52,6 +52,14 @@ void setUp() { @Configuration public static class TestConfiguration { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java index fb18cd56955f..21586af58c2d 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java @@ -24,19 +24,19 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpCorsTest.class, SpringBootPlatformHttpCorsTest.TestConfiguration.class, @@ -54,6 +54,14 @@ void setUp() { @Configuration public static class TestConfiguration { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java index bcbcb01fe53a..fbf08364a7f1 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java @@ -30,9 +30,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -53,16 +54,17 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpEngineTest.class, SpringBootPlatformHttpEngineTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpEngineTest { private final static String attachmentId = "myTestFile"; @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -79,6 +81,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java index 145d99c44c67..1923bfa9fa93 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHandleWriteErrorTest.java @@ -29,9 +29,13 @@ import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; +import org.springframework.test.web.servlet.client.EntityExchangeResult; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -39,11 +43,12 @@ import java.io.IOException; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpHandleWriteErrorTest.class, SpringBootPlatformHttpHandleWriteErrorTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpHandleWriteErrorTest extends PlatformHttpBase { private static final String postRouteId = "SpringBootPlatformHttpHandleWriteErrorTest_mypost"; @@ -67,7 +72,12 @@ public void testPost() throws Exception { me.expectedMessageCount(1); waitUntilRouteIsStarted(1, getPostRouteId()); - Assertions.assertThat(restTemplate.postForEntity("/mypost", "test", String.class).getStatusCode().value()).isEqualTo(500); + EntityExchangeResult result = restTestClient.post().uri("/mypost") + .body("test") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getStatus().value()).isEqualTo(500); me.assertIsSatisfied(); } @@ -77,6 +87,13 @@ public void testPost() throws Exception { // ************************************* @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean(name = "platform-http-engine") public PlatformHttpEngine myHttpEngine(Environment env) { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java index 4222e80fd036..b6c78cd0d949 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java @@ -26,9 +26,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -37,15 +38,16 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpJacksonConverterTest.class, SpringBootPlatformHttpJacksonConverterTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpJacksonConverterTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -60,6 +62,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java index 7dac85cd4bad..e53f5cf3c5f5 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsTest.java @@ -23,8 +23,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; +import org.springframework.test.web.servlet.client.EntityExchangeResult; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,12 +37,13 @@ import java.util.List; import java.util.concurrent.Executor; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpMultipleExecutorsTest.class, SpringBootPlatformHttpMultipleExecutorsTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class }) @EnableScheduling +@AutoConfigureRestTestClient public class SpringBootPlatformHttpMultipleExecutorsTest extends PlatformHttpBase { private static final String postRouteId = "SpringBootPlatformHttpMultipleExecutorsTest_mypost"; @@ -53,6 +57,13 @@ public class SpringBootPlatformHttpMultipleExecutorsTest extends PlatformHttpBas // ************************************* @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean(name = "customPoolTaskExecutor") public Executor customPoolTaskExecutor() { @@ -96,7 +107,11 @@ protected String getGetRouteId() { public void checkCustomExecutorIsPickedWhenMultipleExecutorsAreDefined() { Assertions.assertThat(executors).hasSizeGreaterThan(1); - Assertions.assertThat(restTemplate.postForEntity("/executor", "test", String.class).getBody()) - .contains(THREAD_PREFIX); + EntityExchangeResult result = restTestClient.post().uri("/executor") + .body("test") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getResponseBody()).contains(THREAD_PREFIX); } } diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java index 5f003baf5423..2b2b130c5954 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java @@ -25,8 +25,11 @@ import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; +import org.springframework.test.web.servlet.client.EntityExchangeResult; import org.springframework.boot.task.SimpleAsyncTaskExecutorBuilder; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; @@ -37,7 +40,7 @@ import java.util.List; import java.util.concurrent.Executor; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.class, @@ -46,6 +49,7 @@ properties = "spring.threads.virtual.enabled=true") @EnableScheduling @DisabledOnJre({JRE.JAVA_17, JRE.JAVA_18, JRE.JAVA_19, JRE.JAVA_20}) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest extends PlatformHttpBase { private static final String THREAD_PREFIX = "myThread-"; @@ -59,6 +63,13 @@ public class SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest extends P // ************************************* @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public SimpleAsyncTaskExecutor simpleAsyncTaskExecutor(SimpleAsyncTaskExecutorBuilder simpleAsyncTaskExecutorBuilder) { @@ -98,7 +109,11 @@ protected String getGetRouteId() { public void checkCustomExecutorIsPickedWhenMultipleExecutorsAreDefined() { Assertions.assertThat(executors).hasSizeGreaterThan(1); - Assertions.assertThat(restTemplate.postForEntity("/executor", "test", String.class).getBody()) - .contains(THREAD_PREFIX); + EntityExchangeResult result = restTestClient.post().uri("/executor") + .body("test") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getResponseBody()).contains(THREAD_PREFIX); } } diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java index 5f95a1d23f02..6205aee1c0c0 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java @@ -23,18 +23,18 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpOptionsTest.class, SpringBootPlatformHttpOptionsTest.TestConfiguration.class, @@ -52,6 +52,14 @@ void setUp() { @Configuration public static class TestConfiguration { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java index b36ff89ca250..62048aceed16 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java @@ -25,13 +25,15 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -45,19 +47,21 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpProxyTest.class, SpringBootPlatformHttpProxyTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) @EnableWireMock(@ConfigureWireMock(portProperties = "customPort")) +@AutoConfigureRestTestClient +@Disabled("WireMock 3.10.6 has Jetty compatibility issues with Spring Boot 4 - requires WireMock upgrade to support Jetty 12") public class SpringBootPlatformHttpProxyTest { @Value("${wiremock.server.baseUrl}") private String wiremockUrl; @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -76,6 +80,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java index 025529a93220..e2a4686ec0a4 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRequestTimeoutTest.java @@ -23,35 +23,48 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; +import org.springframework.test.web.servlet.client.EntityExchangeResult; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatusCode; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpRequestTimeoutTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }, properties = {"camel.component.platform-http.request-timeout=10"}) @AutoConfigureMockMvc +@AutoConfigureRestTestClient public class SpringBootPlatformHttpRequestTimeoutTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Test public void testGetAsync() throws Exception { - Assertions.assertThat(restTemplate.getForEntity("/slow-get", String.class).getStatusCode()) - .isEqualTo(HttpStatusCode.valueOf(503)); + EntityExchangeResult result = restTestClient.get().uri("/slow-get") + .exchange() + .expectBody(String.class) + .returnResult(); + Assertions.assertThat(result.getStatus()).isEqualTo(HttpStatusCode.valueOf(503)); } @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder platformHttpRouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java index 29acb0c2348d..edbf65e0bcc5 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpRestDSLTest.java @@ -20,15 +20,13 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpRestDSLTest.class, SpringBootPlatformHttpRestDSLTest.TestConfiguration.class, @@ -45,6 +43,13 @@ public class SpringBootPlatformHttpRestDSLTest extends PlatformHttpBase { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java index f92d8f82de57..d47f233518fd 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java @@ -29,7 +29,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -50,10 +51,11 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpSessionTest.class, SpringBootPlatformHttpSessionTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpSessionTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java index d79c41323e19..bab08b7e7f2c 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTest.java @@ -20,13 +20,13 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit6.CamelSpringBootTest; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpTest.class, SpringBootPlatformHttpTest.TestConfiguration.class, @@ -43,6 +43,13 @@ public class SpringBootPlatformHttpTest extends PlatformHttpBase { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder servletPlatformHttpRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java index 987739e34aa1..5a02ac59a70e 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java @@ -25,9 +25,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -42,15 +43,16 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpTypeConverterTest.class, SpringBootPlatformHttpTypeConverterTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpTypeConverterTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -65,6 +67,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java index be1b4b8f5bab..205576f91390 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java @@ -31,9 +31,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.resttestclient.TestRestTemplate; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; +import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; @@ -46,15 +47,16 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpValidationTest.class, SpringBootPlatformHttpValidationTest.TestConfiguration.class, PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) +@AutoConfigureRestTestClient public class SpringBootPlatformHttpValidationTest { @Autowired - TestRestTemplate restTemplate; + RestTestClient restTestClient; @Autowired CamelContext camelContext; @@ -69,6 +71,13 @@ void setUp() { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder springBootPlatformHttpRestDSLRouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java index e12f131b2b75..cdab352d3738 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsOptimizedTest.java @@ -24,19 +24,19 @@ import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.task.SimpleAsyncTaskExecutor; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import java.util.List; import java.util.concurrent.Executor; import static org.assertj.core.api.Assertions.assertThat; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpVirtualThreadsOptimizedTest.class, SpringBootPlatformHttpVirtualThreadsOptimizedTest.TestConfiguration.class, @@ -57,6 +57,13 @@ public class SpringBootPlatformHttpVirtualThreadsOptimizedTest extends PlatformH @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder servletPlatformHttpRouteBuilder() { return new RouteBuilder() { diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java index 7fc3f4e9995d..c60a131c0393 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java @@ -22,13 +22,13 @@ import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.JRE; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; -import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; -@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class, SecurityAutoConfiguration.class}) +@EnableAutoConfiguration @CamelSpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class, SpringBootPlatformHttpVirtualThreadsTest.class, SpringBootPlatformHttpVirtualThreadsTest.TestConfiguration.class, @@ -47,6 +47,13 @@ public class SpringBootPlatformHttpVirtualThreadsTest extends PlatformHttpBase { @Configuration public static class TestConfiguration { + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .csrf(csrf -> csrf.disable()); + return http.build(); + } + @Bean public RouteBuilder servletPlatformHttpRouteBuilder() { return new RouteBuilder() {