diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json index 0f88ca53f9745..8e82912060256 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json @@ -16,15 +16,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSConfigLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "config" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -52,15 +43,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-iggy", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEventBridgeLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "event-bridge" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -70,15 +52,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSSecretsManagerLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "secrets-manager" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.zookeeper.services.ZooKeeperInfraService", "description" : "Zookeeper is a server for highly reliable distributed coordination of cloud applications", @@ -88,15 +61,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-zookeeper", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.cassandra.services.CassandraInfraService", - "description" : "Apache Cassandra NoSQL Database", - "implementation" : "org.apache.camel.test.infra.cassandra.services.CassandraLocalContainerInfraService", - "alias" : [ "cassandra" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-cassandra", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -124,15 +88,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-elasticsearch", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEC2LocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "ec2" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", "description" : "Apache Kafka, Distributed event streaming platform", @@ -169,15 +124,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.hazelcast.services.HazelcastInfraService", - "description" : "In Memory Database Hazelcast", - "implementation" : "org.apache.camel.test.infra.hazelcast.services.HazelcastEmbeddedInfraService", - "alias" : [ "hazelcast" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-hazelcast", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.postgres.services.PostgresInfraService", "description" : "Postgres SQL Database", @@ -187,15 +133,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-postgres", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.hivemq.services.HiveMQInfraService", - "description" : "MQTT Platform HiveMQ", - "implementation" : "org.apache.camel.test.infra.hivemq.services.LocalHiveMQSparkplugTCKInfraService", - "alias" : [ "hive-mq" ], - "aliasImplementation" : [ "sparkplug" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-hivemq", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", "description" : "Apache Kafka, Distributed event streaming platform", @@ -232,24 +169,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-artemis", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRAInfraService", - "description" : "Transaction Manager for microservices that is based on the SAGA pattern for distributed transaction.", - "implementation" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRALocalContainerInfraService", - "alias" : [ "microprofile" ], - "aliasImplementation" : [ "lra" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-microprofile-lra", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.minio.services.MinioInfraService", - "description" : "MinIO Object Storage, S3 compatible", - "implementation" : "org.apache.camel.test.infra.minio.services.MinioLocalContainerInfraService", - "alias" : [ "minio" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-minio", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.solr.services.SolrInfraService", "description" : "Apache Solr is a Search Platform", @@ -268,33 +187,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-couchbase", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", - "description" : "Apache Kafka, Distributed event streaming platform", - "implementation" : "org.apache.camel.test.infra.kafka.services.ContainerLocalKafkaInfraService", - "alias" : [ "kafka" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-kafka", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", - "description" : "Local Azure services with Azurite", - "implementation" : "org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueLocalContainerInfraService", - "alias" : [ "azure" ], - "aliasImplementation" : [ "storage-queue" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-azure-storage-queue", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", - "description" : "Embedded SFTP Server", - "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.SftpEmbeddedInfraService", - "alias" : [ "sftp" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ftp", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -331,15 +223,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-hivemq", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.infinispan.services.InfinispanInfraService", - "description" : "Distributed Database For High‑Performance Applications With In‑Memory Speed", - "implementation" : "org.apache.camel.test.infra.infinispan.services.InfinispanLocalContainerInfraService", - "alias" : [ "infinispan" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-infinispan", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.ibmmq.services.IbmMQInfraService", "description" : "IBM MQ messaging middleware", @@ -385,24 +268,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-xmpp", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.weaviate.services.WeaviateInfraService", - "description" : "Weaviate Vector Database", - "implementation" : "org.apache.camel.test.infra.weaviate.services.WeaviateLocalContainerInfraService", - "alias" : [ "weaviate" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-weaviate", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.consul.services.ConsulInfraService", - "description" : "Consul is a service networking solution", - "implementation" : "org.apache.camel.test.infra.consul.services.ConsulLocalContainerInfraService", - "alias" : [ "consul" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-consul", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.pulsar.services.PulsarInfraService", "description" : "Distributed messaging and streaming platform", @@ -412,33 +277,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-pulsar", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.qdrant.services.QdrantInfraService", - "description" : "Vector Database and Vector Search Engine", - "implementation" : "org.apache.camel.test.infra.qdrant.services.QdrantLocalContainerInfraService", - "alias" : [ "qdrant" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-qdrant", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", - "description" : "Embedded FTPS Server", - "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpsEmbeddedInfraService", - "alias" : [ "ftps" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ftp", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ollama.services.OllamaInfraService", - "description" : "Build and run LLMs with Ollama", - "implementation" : "org.apache.camel.test.infra.ollama.services.OllamaLocalContainerInfraService", - "alias" : [ "ollama" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ollama", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService", "description" : "Apache Artemis is an open source message broker", @@ -448,33 +286,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-artemis", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", - "description" : "Local Azure services with Azurite", - "implementation" : "org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobLocalContainerInfraService", - "alias" : [ "azure" ], - "aliasImplementation" : [ "storage-blob" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-azure-storage-blob", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.torchserve.services.TorchServeInfraService", - "description" : "TorchServe is a flexible tool for serving PyTorch", - "implementation" : "org.apache.camel.test.infra.torchserve.services.TorchServeLocalContainerInfraService", - "alias" : [ "torch-serve" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-torchserve", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.docling.services.DoclingInfraService", - "description" : "Document processing and conversion service", - "implementation" : "org.apache.camel.test.infra.docling.services.DoclingLocalContainerInfraService", - "alias" : [ "docling" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-docling", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -484,24 +295,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSIAMLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "iam" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.fhir.services.FhirInfraService", - "description" : "HAPI FHIR RESTful test server", - "implementation" : "org.apache.camel.test.infra.fhir.services.FhirLocalContainerInfraService", - "alias" : [ "fhir" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-fhir", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -511,15 +304,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.pinecone.services.PineconeInfraService", - "description" : "Pinecone Vector Database", - "implementation" : "org.apache.camel.test.infra.pinecone.services.PineconeLocalContainerInfraService", - "alias" : [ "pinecone" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-pinecone", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.google.pubsub.services.GooglePubSubInfraService", "description" : "Google Cloud SDK Tool", @@ -556,15 +340,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-ignite", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", - "description" : "Embedded FTP Server", - "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedInfraService", - "alias" : [ "ftp" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ftp", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.rabbitmq.services.RabbitMQInfraService", "description" : "Messaging and streaming broker", @@ -601,6 +376,231 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-rocketmq", "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSConfigLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "config" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEventBridgeLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "event-bridge" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSSecretsManagerLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "secrets-manager" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.cassandra.services.CassandraInfraService", + "description" : "Apache Cassandra NoSQL Database", + "implementation" : "org.apache.camel.test.infra.cassandra.services.CassandraLocalContainerInfraService", + "alias" : [ "cassandra" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-cassandra", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEC2LocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "ec2" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.hazelcast.services.HazelcastInfraService", + "description" : "In Memory Database Hazelcast", + "implementation" : "org.apache.camel.test.infra.hazelcast.services.HazelcastEmbeddedInfraService", + "alias" : [ "hazelcast" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-hazelcast", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.hivemq.services.HiveMQInfraService", + "description" : "MQTT Platform HiveMQ", + "implementation" : "org.apache.camel.test.infra.hivemq.services.LocalHiveMQSparkplugTCKInfraService", + "alias" : [ "hive-mq" ], + "aliasImplementation" : [ "sparkplug" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-hivemq", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRAInfraService", + "description" : "Transaction Manager for microservices that is based on the SAGA pattern for distributed transaction.", + "implementation" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRALocalContainerInfraService", + "alias" : [ "microprofile" ], + "aliasImplementation" : [ "lra" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-microprofile-lra", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.minio.services.MinioInfraService", + "description" : "MinIO Object Storage, S3 compatible", + "implementation" : "org.apache.camel.test.infra.minio.services.MinioLocalContainerInfraService", + "alias" : [ "minio" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-minio", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", + "description" : "Apache Kafka, Distributed event streaming platform", + "implementation" : "org.apache.camel.test.infra.kafka.services.ContainerLocalKafkaInfraService", + "alias" : [ "kafka" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-kafka", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", + "description" : "Local Azure services with Azurite", + "implementation" : "org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueLocalContainerInfraService", + "alias" : [ "azure" ], + "aliasImplementation" : [ "storage-queue" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-azure-storage-queue", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", + "description" : "Embedded SFTP Server", + "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.SftpEmbeddedInfraService", + "alias" : [ "sftp" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ftp", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.infinispan.services.InfinispanInfraService", + "description" : "Distributed Database For High‑Performance Applications With In‑Memory Speed", + "implementation" : "org.apache.camel.test.infra.infinispan.services.InfinispanLocalContainerInfraService", + "alias" : [ "infinispan" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-infinispan", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.weaviate.services.WeaviateInfraService", + "description" : "Weaviate Vector Database", + "implementation" : "org.apache.camel.test.infra.weaviate.services.WeaviateLocalContainerInfraService", + "alias" : [ "weaviate" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-weaviate", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.consul.services.ConsulInfraService", + "description" : "Consul is a service networking solution", + "implementation" : "org.apache.camel.test.infra.consul.services.ConsulLocalContainerInfraService", + "alias" : [ "consul" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-consul", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.qdrant.services.QdrantInfraService", + "description" : "Vector Database and Vector Search Engine", + "implementation" : "org.apache.camel.test.infra.qdrant.services.QdrantLocalContainerInfraService", + "alias" : [ "qdrant" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-qdrant", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", + "description" : "Embedded FTPS Server", + "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpsEmbeddedInfraService", + "alias" : [ "ftps" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ftp", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ollama.services.OllamaInfraService", + "description" : "Build and run LLMs with Ollama", + "implementation" : "org.apache.camel.test.infra.ollama.services.OllamaLocalContainerInfraService", + "alias" : [ "ollama" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ollama", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", + "description" : "Local Azure services with Azurite", + "implementation" : "org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobLocalContainerInfraService", + "alias" : [ "azure" ], + "aliasImplementation" : [ "storage-blob" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-azure-storage-blob", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.torchserve.services.TorchServeInfraService", + "description" : "TorchServe is a flexible tool for serving PyTorch", + "implementation" : "org.apache.camel.test.infra.torchserve.services.TorchServeLocalContainerInfraService", + "alias" : [ "torch-serve" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-torchserve", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.docling.services.DoclingInfraService", + "description" : "Document processing and conversion service", + "implementation" : "org.apache.camel.test.infra.docling.services.DoclingLocalContainerInfraService", + "alias" : [ "docling" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-docling", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSIAMLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "iam" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.fhir.services.FhirInfraService", + "description" : "HAPI FHIR RESTful test server", + "implementation" : "org.apache.camel.test.infra.fhir.services.FhirLocalContainerInfraService", + "alias" : [ "fhir" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-fhir", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.pinecone.services.PineconeInfraService", + "description" : "Pinecone Vector Database", + "implementation" : "org.apache.camel.test.infra.pinecone.services.PineconeLocalContainerInfraService", + "alias" : [ "pinecone" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-pinecone", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", + "description" : "Embedded FTP Server", + "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedInfraService", + "alias" : [ "ftp" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ftp", + "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.mongodb.services.MongoDBInfraService", "description" : "MongoDB NoSql Database", diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml index a8e825548a865..9e1ecc6967064 100644 --- a/components/camel-activemq/pom.xml +++ b/components/camel-activemq/pom.xml @@ -50,14 +50,6 @@ activemq-client-jakarta ${activemq-version} - - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -71,21 +63,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - - - - org.apache.camel - camel-test-infra-messaging-common - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-messaging-common diff --git a/components/camel-activemq6/pom.xml b/components/camel-activemq6/pom.xml index 9fe2772f63cc4..651b735e08bf4 100644 --- a/components/camel-activemq6/pom.xml +++ b/components/camel-activemq6/pom.xml @@ -51,14 +51,6 @@ activemq-client ${activemq6-version} - - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -72,21 +64,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - - - - org.apache.camel - camel-test-infra-messaging-common - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-messaging-common diff --git a/components/camel-ai/camel-chatscript/pom.xml b/components/camel-ai/camel-chatscript/pom.xml index 55af2e0c08716..c648b2f1bb5d7 100644 --- a/components/camel-ai/camel-chatscript/pom.xml +++ b/components/camel-ai/camel-chatscript/pom.xml @@ -55,15 +55,7 @@ test - - - org.apache.camel - camel-test-infra-chatscript - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-chatscript diff --git a/components/camel-ai/camel-docling/pom.xml b/components/camel-ai/camel-docling/pom.xml index 36b6fcd16d367..afef1ed606158 100644 --- a/components/camel-ai/camel-docling/pom.xml +++ b/components/camel-ai/camel-docling/pom.xml @@ -76,13 +76,6 @@ ${json-unit-version} test - - org.apache.camel - camel-test-infra-docling - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-docling diff --git a/components/camel-ai/camel-kserve/pom.xml b/components/camel-ai/camel-kserve/pom.xml index bf13dc0f9d598..be2c831703f07 100644 --- a/components/camel-ai/camel-kserve/pom.xml +++ b/components/camel-ai/camel-kserve/pom.xml @@ -89,13 +89,6 @@ - - org.apache.camel - camel-test-infra-triton - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-triton diff --git a/components/camel-ai/camel-langchain4j-agent/pom.xml b/components/camel-ai/camel-langchain4j-agent/pom.xml index 8dee38795233a..35ca9854931f4 100644 --- a/components/camel-ai/camel-langchain4j-agent/pom.xml +++ b/components/camel-ai/camel-langchain4j-agent/pom.xml @@ -109,13 +109,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml b/components/camel-ai/camel-langchain4j-chat/pom.xml index bab75ea9abb1e..8e4c7f5bc45c0 100644 --- a/components/camel-ai/camel-langchain4j-chat/pom.xml +++ b/components/camel-ai/camel-langchain4j-chat/pom.xml @@ -81,13 +81,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - org.assertj assertj-core diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml b/components/camel-ai/camel-langchain4j-embeddings/pom.xml index 5e9a6cd45a226..9ea004fe94ca0 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/pom.xml +++ b/components/camel-ai/camel-langchain4j-embeddings/pom.xml @@ -136,20 +136,6 @@ org.apache.camel camel-test-infra-infinispan ${project.version} - test-jar - test - - - org.apache.camel - camel-test-infra-infinispan - ${project.version} - test - - - org.apache.camel - camel-test-infra-qdrant - ${project.version} - test-jar test @@ -158,13 +144,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-milvus - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-milvus @@ -175,20 +154,6 @@ org.apache.camel camel-test-infra-neo4j ${project.version} - test-jar - test - - - org.apache.camel - camel-test-infra-neo4j - ${project.version} - test - - - org.apache.camel - camel-test-infra-weaviate - ${project.version} - test-jar test diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml b/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml index e35719812050b..49cfac24637e1 100644 --- a/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml +++ b/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml @@ -110,46 +110,18 @@ org.apache.camel camel-test-infra-infinispan ${project.version} - test-jar test - org.apache.camel - camel-test-infra-infinispan - ${project.version} - test - - org.apache.camel camel-test-infra-qdrant ${project.version} - test-jar test - org.apache.camel - camel-test-infra-qdrant - ${project.version} - test - - org.apache.camel camel-test-infra-milvus ${project.version} - test-jar - test - - - org.apache.camel - camel-test-infra-milvus - ${project.version} - test - - - org.apache.camel - camel-test-infra-neo4j - ${project.version} - test-jar test @@ -162,16 +134,8 @@ org.apache.camel camel-test-infra-weaviate ${project.version} - test-jar test - - org.apache.camel - camel-test-infra-weaviate - ${project.version} - test - - diff --git a/components/camel-ai/camel-langchain4j-tools/pom.xml b/components/camel-ai/camel-langchain4j-tools/pom.xml index 40984ff5c2aa2..8928e6fc31f8b 100644 --- a/components/camel-ai/camel-langchain4j-tools/pom.xml +++ b/components/camel-ai/camel-langchain4j-tools/pom.xml @@ -97,13 +97,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - dev.langchain4j langchain4j-open-ai diff --git a/components/camel-ai/camel-milvus/pom.xml b/components/camel-ai/camel-milvus/pom.xml index 243db18df6af6..209a2942bc99a 100644 --- a/components/camel-ai/camel-milvus/pom.xml +++ b/components/camel-ai/camel-milvus/pom.xml @@ -125,13 +125,6 @@ - - org.apache.camel - camel-test-infra-milvus - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-milvus diff --git a/components/camel-ai/camel-neo4j/pom.xml b/components/camel-ai/camel-neo4j/pom.xml index 15cb012d976c0..8fee9f775dffe 100644 --- a/components/camel-ai/camel-neo4j/pom.xml +++ b/components/camel-ai/camel-neo4j/pom.xml @@ -85,13 +85,6 @@ - - org.apache.camel - camel-test-infra-neo4j - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-neo4j diff --git a/components/camel-ai/camel-openai/pom.xml b/components/camel-ai/camel-openai/pom.xml index 36f8b5646aa57..d6bdb1917fa3b 100644 --- a/components/camel-ai/camel-openai/pom.xml +++ b/components/camel-ai/camel-openai/pom.xml @@ -76,13 +76,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - org.assertj assertj-core diff --git a/components/camel-ai/camel-pinecone/pom.xml b/components/camel-ai/camel-pinecone/pom.xml index dac6f171015f4..e7d20cf553232 100644 --- a/components/camel-ai/camel-pinecone/pom.xml +++ b/components/camel-ai/camel-pinecone/pom.xml @@ -63,13 +63,6 @@ - - org.apache.camel - camel-test-infra-pinecone - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-pinecone diff --git a/components/camel-ai/camel-qdrant/pom.xml b/components/camel-ai/camel-qdrant/pom.xml index c2ef3848d2b64..97c339043b6f0 100644 --- a/components/camel-ai/camel-qdrant/pom.xml +++ b/components/camel-ai/camel-qdrant/pom.xml @@ -135,13 +135,6 @@ - - org.apache.camel - camel-test-infra-qdrant - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-qdrant diff --git a/components/camel-ai/camel-tensorflow-serving/pom.xml b/components/camel-ai/camel-tensorflow-serving/pom.xml index c7f45085b2569..93528aaaaaff0 100644 --- a/components/camel-ai/camel-tensorflow-serving/pom.xml +++ b/components/camel-ai/camel-tensorflow-serving/pom.xml @@ -89,13 +89,6 @@ - - org.apache.camel - camel-test-infra-tensorflow-serving - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-tensorflow-serving diff --git a/components/camel-ai/camel-torchserve/pom.xml b/components/camel-ai/camel-torchserve/pom.xml index aed6f643b6cf6..97dfcf7ec2dba 100644 --- a/components/camel-ai/camel-torchserve/pom.xml +++ b/components/camel-ai/camel-torchserve/pom.xml @@ -104,13 +104,6 @@ - - org.apache.camel - camel-test-infra-torchserve - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-torchserve diff --git a/components/camel-ai/camel-weaviate/pom.xml b/components/camel-ai/camel-weaviate/pom.xml index ec3363ae0838b..4acec463a7396 100644 --- a/components/camel-ai/camel-weaviate/pom.xml +++ b/components/camel-ai/camel-weaviate/pom.xml @@ -59,13 +59,6 @@ - - org.apache.camel - camel-test-infra-weaviate - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-weaviate diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml index f643c72151531..bbe4110fd204d 100644 --- a/components/camel-amqp/pom.xml +++ b/components/camel-amqp/pom.xml @@ -81,13 +81,6 @@ - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -101,13 +94,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - org.apache.camel diff --git a/components/camel-arangodb/pom.xml b/components/camel-arangodb/pom.xml index 3b1ea821d362e..08631a958d9ce 100644 --- a/components/camel-arangodb/pom.xml +++ b/components/camel-arangodb/pom.xml @@ -64,26 +64,12 @@ - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core ${project.version} test - - org.apache.camel - camel-test-infra-arangodb - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-arangodb @@ -92,5 +78,4 @@ - diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index c897fcad44bdf..0bbc0cb503b45 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -58,7 +58,6 @@ ${atmosphere-version} - org.apache.camel @@ -85,13 +84,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - test - org.apache.camel @@ -99,12 +91,5 @@ ${project.version} test - - org.apache.camel - camel-test-infra-jetty - ${project.version} - test-jar - test - diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index ead80498f365a..06c224d0582fc 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -64,13 +64,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - test - org.apache.camel @@ -78,12 +71,5 @@ ${project.version} test - - org.apache.camel - camel-test-infra-jetty - ${project.version} - test-jar - test - diff --git a/components/camel-aws/camel-aws-bedrock/pom.xml b/components/camel-aws/camel-aws-bedrock/pom.xml index 1c4d9998c433e..3f1853860f6b7 100644 --- a/components/camel-aws/camel-aws-bedrock/pom.xml +++ b/components/camel-aws/camel-aws-bedrock/pom.xml @@ -95,14 +95,6 @@ camel-base64 test - - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml index 7feeab2c70232..c8dacb6868a4c 100644 --- a/components/camel-aws/camel-aws-cloudtrail/pom.xml +++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws-config/pom.xml b/components/camel-aws/camel-aws-config/pom.xml index 23fb675f98c5a..1cfa82d424e5c 100644 --- a/components/camel-aws/camel-aws-config/pom.xml +++ b/components/camel-aws/camel-aws-config/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws-parameter-store/pom.xml b/components/camel-aws/camel-aws-parameter-store/pom.xml index c20d83549602f..dcd35b2acbc33 100644 --- a/components/camel-aws/camel-aws-parameter-store/pom.xml +++ b/components/camel-aws/camel-aws-parameter-store/pom.xml @@ -74,13 +74,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml index 44e6d6619eb9b..91f2e8cbc6bf2 100644 --- a/components/camel-aws/camel-aws-secrets-manager/pom.xml +++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml @@ -92,13 +92,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws-security-hub/pom.xml b/components/camel-aws/camel-aws-security-hub/pom.xml index 67db52b5f85f7..dc0ba259431f2 100644 --- a/components/camel-aws/camel-aws-security-hub/pom.xml +++ b/components/camel-aws/camel-aws-security-hub/pom.xml @@ -71,13 +71,6 @@ test - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-athena/pom.xml b/components/camel-aws/camel-aws2-athena/pom.xml index 2ad09ee43d8b5..09ebe5a8fd3a8 100644 --- a/components/camel-aws/camel-aws2-athena/pom.xml +++ b/components/camel-aws/camel-aws2-athena/pom.xml @@ -78,13 +78,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-comprehend/pom.xml b/components/camel-aws/camel-aws2-comprehend/pom.xml index 38993af1c805e..fe7d2bd631a03 100644 --- a/components/camel-aws/camel-aws2-comprehend/pom.xml +++ b/components/camel-aws/camel-aws2-comprehend/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml index 46c80934301ad..a201960578922 100644 --- a/components/camel-aws/camel-aws2-cw/pom.xml +++ b/components/camel-aws/camel-aws2-cw/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml b/components/camel-aws/camel-aws2-ddb/pom.xml index 7d27596d04534..5b8cd32d219cc 100644 --- a/components/camel-aws/camel-aws2-ddb/pom.xml +++ b/components/camel-aws/camel-aws2-ddb/pom.xml @@ -95,13 +95,6 @@ test - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-ec2/pom.xml b/components/camel-aws/camel-aws2-ec2/pom.xml index 9dad0ec40f0c9..e2075a0fda43a 100644 --- a/components/camel-aws/camel-aws2-ec2/pom.xml +++ b/components/camel-aws/camel-aws2-ec2/pom.xml @@ -71,13 +71,6 @@ test - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-eks/pom.xml b/components/camel-aws/camel-aws2-eks/pom.xml index 601975ce70f2f..9df7fbe0dca3c 100644 --- a/components/camel-aws/camel-aws2-eks/pom.xml +++ b/components/camel-aws/camel-aws2-eks/pom.xml @@ -71,14 +71,6 @@ camel-test-spring-junit6 test - - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-eventbridge/pom.xml b/components/camel-aws/camel-aws2-eventbridge/pom.xml index a6e9374c86403..35027af3ecc1c 100644 --- a/components/camel-aws/camel-aws2-eventbridge/pom.xml +++ b/components/camel-aws/camel-aws2-eventbridge/pom.xml @@ -86,13 +86,6 @@ test - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-iam/pom.xml b/components/camel-aws/camel-aws2-iam/pom.xml index 3b55669207442..64df18cb81838 100644 --- a/components/camel-aws/camel-aws2-iam/pom.xml +++ b/components/camel-aws/camel-aws2-iam/pom.xml @@ -71,13 +71,6 @@ test - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-kinesis/pom.xml b/components/camel-aws/camel-aws2-kinesis/pom.xml index 0b0c3a397d6fe..70aaa6a9c5f36 100644 --- a/components/camel-aws/camel-aws2-kinesis/pom.xml +++ b/components/camel-aws/camel-aws2-kinesis/pom.xml @@ -112,13 +112,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml index 9e1ad05caafa0..d8b2b72eba288 100644 --- a/components/camel-aws/camel-aws2-kms/pom.xml +++ b/components/camel-aws/camel-aws2-kms/pom.xml @@ -75,13 +75,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml index 9c1f796dd6948..f6f6ca7a14011 100644 --- a/components/camel-aws/camel-aws2-lambda/pom.xml +++ b/components/camel-aws/camel-aws2-lambda/pom.xml @@ -74,13 +74,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-mq/pom.xml b/components/camel-aws/camel-aws2-mq/pom.xml index 0c0ea45347820..784b99654333f 100644 --- a/components/camel-aws/camel-aws2-mq/pom.xml +++ b/components/camel-aws/camel-aws2-mq/pom.xml @@ -70,13 +70,6 @@ camel-test-spring-junit6 test - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-msk/pom.xml b/components/camel-aws/camel-aws2-msk/pom.xml index 631243d329eab..1a41f67456f1d 100644 --- a/components/camel-aws/camel-aws2-msk/pom.xml +++ b/components/camel-aws/camel-aws2-msk/pom.xml @@ -65,13 +65,6 @@ camel-health - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-polly/pom.xml b/components/camel-aws/camel-aws2-polly/pom.xml index f416e5c8192ae..335ab4a40680a 100644 --- a/components/camel-aws/camel-aws2-polly/pom.xml +++ b/components/camel-aws/camel-aws2-polly/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-rekognition/pom.xml b/components/camel-aws/camel-aws2-rekognition/pom.xml index 765aab61306af..8ebf331be45af 100644 --- a/components/camel-aws/camel-aws2-rekognition/pom.xml +++ b/components/camel-aws/camel-aws2-rekognition/pom.xml @@ -74,13 +74,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-s3-vectors/pom.xml b/components/camel-aws/camel-aws2-s3-vectors/pom.xml index 2f5850adeada8..9cc021da28b86 100644 --- a/components/camel-aws/camel-aws2-s3-vectors/pom.xml +++ b/components/camel-aws/camel-aws2-s3-vectors/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-s3/pom.xml b/components/camel-aws/camel-aws2-s3/pom.xml index bad36b9c34f8f..b462888057e63 100644 --- a/components/camel-aws/camel-aws2-s3/pom.xml +++ b/components/camel-aws/camel-aws2-s3/pom.xml @@ -82,13 +82,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-ses/pom.xml b/components/camel-aws/camel-aws2-ses/pom.xml index e0c1175e6a218..2c30385d9d639 100644 --- a/components/camel-aws/camel-aws2-ses/pom.xml +++ b/components/camel-aws/camel-aws2-ses/pom.xml @@ -70,13 +70,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-sns/pom.xml b/components/camel-aws/camel-aws2-sns/pom.xml index 1480daaaf05c0..6d696d99c5cb2 100644 --- a/components/camel-aws/camel-aws2-sns/pom.xml +++ b/components/camel-aws/camel-aws2-sns/pom.xml @@ -77,13 +77,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-sqs/pom.xml b/components/camel-aws/camel-aws2-sqs/pom.xml index 4b5814e4bcdfd..6f2c5d75920cb 100644 --- a/components/camel-aws/camel-aws2-sqs/pom.xml +++ b/components/camel-aws/camel-aws2-sqs/pom.xml @@ -70,13 +70,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 @@ -84,7 +77,6 @@ test - org.apache.camel diff --git a/components/camel-aws/camel-aws2-step-functions/pom.xml b/components/camel-aws/camel-aws2-step-functions/pom.xml index de0e95db7b1ec..5a297c92ef89d 100644 --- a/components/camel-aws/camel-aws2-step-functions/pom.xml +++ b/components/camel-aws/camel-aws2-step-functions/pom.xml @@ -74,13 +74,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-sts/pom.xml b/components/camel-aws/camel-aws2-sts/pom.xml index ff000748dac82..76f761ce30ca5 100644 --- a/components/camel-aws/camel-aws2-sts/pom.xml +++ b/components/camel-aws/camel-aws2-sts/pom.xml @@ -68,13 +68,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-textract/pom.xml b/components/camel-aws/camel-aws2-textract/pom.xml index 34dde46728536..d2f47f7af3a9b 100644 --- a/components/camel-aws/camel-aws2-textract/pom.xml +++ b/components/camel-aws/camel-aws2-textract/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-timestream/pom.xml b/components/camel-aws/camel-aws2-timestream/pom.xml index c066dc8e0abc8..1ba91d63cdc97 100644 --- a/components/camel-aws/camel-aws2-timestream/pom.xml +++ b/components/camel-aws/camel-aws2-timestream/pom.xml @@ -79,13 +79,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-transcribe/pom.xml b/components/camel-aws/camel-aws2-transcribe/pom.xml index f4cd0f39700c0..1477c6a2ab7b8 100644 --- a/components/camel-aws/camel-aws2-transcribe/pom.xml +++ b/components/camel-aws/camel-aws2-transcribe/pom.xml @@ -56,13 +56,6 @@ apache-client ${aws-java-sdk2-version} - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-aws/camel-aws2-translate/pom.xml b/components/camel-aws/camel-aws2-translate/pom.xml index 16493c8acc775..ee77b19ff459c 100644 --- a/components/camel-aws/camel-aws2-translate/pom.xml +++ b/components/camel-aws/camel-aws2-translate/pom.xml @@ -72,13 +72,6 @@ - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-aws-v2 diff --git a/components/camel-azure/camel-azure-functions/pom.xml b/components/camel-azure/camel-azure-functions/pom.xml index 354f15b25b459..36395060871ff 100644 --- a/components/camel-azure/camel-azure-functions/pom.xml +++ b/components/camel-azure/camel-azure-functions/pom.xml @@ -56,13 +56,6 @@ camel-test-junit5 test - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml index 390caf25bd9f3..63559d4caefdd 100644 --- a/components/camel-azure/camel-azure-servicebus/pom.xml +++ b/components/camel-azure/camel-azure-servicebus/pom.xml @@ -68,13 +68,6 @@ ${mockito-version} test - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml b/components/camel-azure/camel-azure-storage-blob/pom.xml index f6eef95e0f1ec..d1041a9e9e999 100644 --- a/components/camel-azure/camel-azure-storage-blob/pom.xml +++ b/components/camel-azure/camel-azure-storage-blob/pom.xml @@ -102,13 +102,6 @@ test - - org.apache.camel - camel-test-infra-azure-storage-blob - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-azure-storage-blob diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml index 4a68faf33c414..a0413132d9994 100644 --- a/components/camel-azure/camel-azure-storage-datalake/pom.xml +++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml @@ -75,13 +75,6 @@ assertj-core test - - org.apache.camel - camel-test-infra-azure-storage-datalake - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-azure-storage-datalake diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml b/components/camel-azure/camel-azure-storage-queue/pom.xml index b5cdbc22e1de1..d383b3ee324d0 100644 --- a/components/camel-azure/camel-azure-storage-queue/pom.xml +++ b/components/camel-azure/camel-azure-storage-queue/pom.xml @@ -98,13 +98,6 @@ test - - org.apache.camel - camel-test-infra-azure-storage-queue - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-azure-storage-queue diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml index 7ce1f6d38f1f5..3c37289fc70f1 100644 --- a/components/camel-cassandraql/pom.xml +++ b/components/camel-cassandraql/pom.xml @@ -85,27 +85,12 @@ - - org.apache.camel - camel-test-infra-core - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-core ${project.version} test - - - org.apache.camel - camel-test-infra-cassandra - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-cassandra diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml index b5e4dfa9656d0..6d8f256748f00 100644 --- a/components/camel-consul/pom.xml +++ b/components/camel-consul/pom.xml @@ -147,13 +147,6 @@ - - org.apache.camel - camel-test-infra-consul - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-consul diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml index a0ae10e26219e..7b1e59bd320e1 100644 --- a/components/camel-couchbase/pom.xml +++ b/components/camel-couchbase/pom.xml @@ -63,13 +63,6 @@ - - org.apache.camel - camel-test-infra-couchbase - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-couchbase diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml index 4113f03ad2b9a..4bd16e9844311 100644 --- a/components/camel-couchdb/pom.xml +++ b/components/camel-couchdb/pom.xml @@ -69,13 +69,6 @@ - - org.apache.camel - camel-test-infra-couchdb - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-couchdb diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml index 6fc3971b039f6..dc1dd3b5b918d 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml +++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml @@ -58,7 +58,6 @@ camel-spring - org.apache.camel @@ -104,13 +103,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - diff --git a/components/camel-dynamic-router/pom.xml b/components/camel-dynamic-router/pom.xml index 027c0f0029565..f75da0bf24407 100644 --- a/components/camel-dynamic-router/pom.xml +++ b/components/camel-dynamic-router/pom.xml @@ -53,13 +53,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-spring-junit6 diff --git a/components/camel-elasticsearch-rest-client/pom.xml b/components/camel-elasticsearch-rest-client/pom.xml index 958c1b7acc10b..e1957adbe7d89 100644 --- a/components/camel-elasticsearch-rest-client/pom.xml +++ b/components/camel-elasticsearch-rest-client/pom.xml @@ -80,13 +80,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-elasticsearch - ${project.version} - test-jar - test - diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml index cbf4ce680462a..7cdb837c54e6c 100644 --- a/components/camel-elasticsearch/pom.xml +++ b/components/camel-elasticsearch/pom.xml @@ -75,13 +75,6 @@ - - org.apache.camel - camel-test-infra-elasticsearch - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-elasticsearch diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml index 67c1647107331..03707a9de96bf 100644 --- a/components/camel-fhir/camel-fhir-component/pom.xml +++ b/components/camel-fhir/camel-fhir-component/pom.xml @@ -168,13 +168,6 @@ - - org.apache.camel - camel-test-infra-fhir - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-fhir diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml index 7321ba3d8a4d6..6074c92947937 100644 --- a/components/camel-ftp/pom.xml +++ b/components/camel-ftp/pom.xml @@ -96,7 +96,6 @@ test - io.github.littleproxy @@ -155,15 +154,7 @@ test - - - org.apache.camel - camel-test-infra-ftp - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-ftp diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml index 2228f5608514f..179c1110ee789 100644 --- a/components/camel-google/camel-google-pubsub/pom.xml +++ b/components/camel-google/camel-google-pubsub/pom.xml @@ -78,13 +78,6 @@ - - org.apache.camel - camel-test-infra-google-pubsub - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-google-pubsub diff --git a/components/camel-hashicorp-vault/pom.xml b/components/camel-hashicorp-vault/pom.xml index bf90eae3178bd..29d485f4bd358 100644 --- a/components/camel-hashicorp-vault/pom.xml +++ b/components/camel-hashicorp-vault/pom.xml @@ -55,13 +55,6 @@ camel-test-junit6 test - - org.apache.camel - camel-test-infra-hashicorp-vault - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-hashicorp-vault diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml index 1cfe350ab06bb..2511a42c396d7 100644 --- a/components/camel-hazelcast/pom.xml +++ b/components/camel-hazelcast/pom.xml @@ -73,13 +73,6 @@ camel-spring-main test - - org.apache.camel - camel-test-infra-hazelcast - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-hazelcast diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index e3a431f362879..0d8abb121d343 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -82,7 +82,6 @@ - org.apache.camel @@ -124,7 +123,6 @@ - org.apache.camel @@ -132,13 +130,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - test - org.apache.camel @@ -146,13 +137,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-jetty - ${project.version} - test-jar - test - org.assertj diff --git a/components/camel-iggy/pom.xml b/components/camel-iggy/pom.xml index 94833fc3f6f84..a851be769ccd3 100644 --- a/components/camel-iggy/pom.xml +++ b/components/camel-iggy/pom.xml @@ -75,20 +75,6 @@ camel-test-infra-core ${project.version} test - test-jar - - - org.apache.camel - camel-test-infra-core - ${project.version} - test - - - org.apache.camel - camel-test-infra-iggy - ${project.version} - test - test-jar org.apache.camel diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml index 0a9175fa4fce8..127ea61c4744b 100644 --- a/components/camel-ignite/pom.xml +++ b/components/camel-ignite/pom.xml @@ -81,14 +81,6 @@ guava test - - - org.apache.camel - camel-test-infra-ignite - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-ignite diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml index e564911fc2b7e..860428eea6d4e 100644 --- a/components/camel-infinispan/camel-infinispan/pom.xml +++ b/components/camel-infinispan/camel-infinispan/pom.xml @@ -85,14 +85,6 @@ test-jar test - - - org.apache.camel - camel-test-infra-infinispan - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-infinispan diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index b5353cead0b78..79f0e74e9b6ba 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -112,13 +112,6 @@ - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -132,21 +125,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - - - - org.apache.camel - camel-test-infra-ibmmq - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-ibmmq diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index f42b8b2e62103..86cb27a63019a 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -79,14 +79,6 @@ ${spring-version} test - - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -103,13 +95,6 @@ camel-sql test - - org.apache.camel - camel-test-infra-kafka - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-kafka diff --git a/components/camel-keycloak/pom.xml b/components/camel-keycloak/pom.xml index 836d17810e86f..1565a93bba2ef 100644 --- a/components/camel-keycloak/pom.xml +++ b/components/camel-keycloak/pom.xml @@ -85,13 +85,6 @@ test ${mockito-version} - - org.apache.camel - camel-test-infra-keycloak - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-keycloak diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml index bd6c9fc1b81f2..c2e0670e330fe 100644 --- a/components/camel-ldif/pom.xml +++ b/components/camel-ldif/pom.xml @@ -86,14 +86,6 @@ ${mina-version} test - - - org.apache.camel - camel-test-infra-openldap - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-openldap diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml index 22f392489963b..d072c41a112df 100644 --- a/components/camel-lra/pom.xml +++ b/components/camel-lra/pom.xml @@ -75,13 +75,6 @@ junit-jupiter test - - org.apache.camel - camel-test-infra-microprofile-lra - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-microprofile-lra diff --git a/components/camel-mina-sftp/pom.xml b/components/camel-mina-sftp/pom.xml index 73b23ef0c1b5a..891f30e479d60 100644 --- a/components/camel-mina-sftp/pom.xml +++ b/components/camel-mina-sftp/pom.xml @@ -109,13 +109,6 @@ - - org.apache.camel - camel-test-infra-ftp - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-ftp diff --git a/components/camel-minio/pom.xml b/components/camel-minio/pom.xml index 51dce09c971ef..1b64015a0955c 100644 --- a/components/camel-minio/pom.xml +++ b/components/camel-minio/pom.xml @@ -91,13 +91,6 @@ - - org.apache.camel - camel-test-infra-minio - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-minio diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml index b0a52b8dc9014..b743f43aefb6a 100644 --- a/components/camel-mllp/pom.xml +++ b/components/camel-mllp/pom.xml @@ -84,12 +84,5 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml index cd1c2088ef1a5..711d94b3920d1 100644 --- a/components/camel-mongodb-gridfs/pom.xml +++ b/components/camel-mongodb-gridfs/pom.xml @@ -72,13 +72,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-mongodb - ${project.version} - test-jar - test - diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 2f97f993b388c..58533ba4d7e49 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -66,27 +66,12 @@ - - org.apache.camel - camel-test-infra-core - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-core ${project.version} test - - - org.apache.camel - camel-test-infra-mongodb - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-mongodb diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml index f384de0a98dd2..df6a9e270d8d8 100644 --- a/components/camel-nats/pom.xml +++ b/components/camel-nats/pom.xml @@ -54,13 +54,6 @@ - - org.apache.camel - camel-test-infra-nats - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-nats diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 2f324c2e452a7..3599a8c3ea4f4 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -106,13 +106,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - test - org.apache.camel @@ -120,13 +113,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-jetty - ${project.version} - test-jar - test - org.apache.groovy groovy-ant diff --git a/components/camel-opensearch/pom.xml b/components/camel-opensearch/pom.xml index 283dbf6e1903e..4fc87f5c3f946 100644 --- a/components/camel-opensearch/pom.xml +++ b/components/camel-opensearch/pom.xml @@ -78,26 +78,12 @@ - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core ${project.version} test - - org.apache.camel - camel-test-infra-opensearch - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-opensearch diff --git a/components/camel-paho-mqtt5/pom.xml b/components/camel-paho-mqtt5/pom.xml index f4cd46b7a8617..6e7142edcd87d 100644 --- a/components/camel-paho-mqtt5/pom.xml +++ b/components/camel-paho-mqtt5/pom.xml @@ -54,13 +54,6 @@ - - org.apache.camel - camel-test-infra-mosquitto - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-mosquitto diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml index 8322edcabda58..e0fce225486a6 100644 --- a/components/camel-paho/pom.xml +++ b/components/camel-paho/pom.xml @@ -55,13 +55,6 @@ test - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -80,13 +73,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - diff --git a/components/camel-pg-replication-slot/pom.xml b/components/camel-pg-replication-slot/pom.xml index 7e217260fd6a5..1c0d852ee03db 100644 --- a/components/camel-pg-replication-slot/pom.xml +++ b/components/camel-pg-replication-slot/pom.xml @@ -60,13 +60,6 @@ - - org.apache.camel - camel-test-infra-postgres - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-postgres diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml index 19edf2daf5654..d1124efbd5f89 100644 --- a/components/camel-pgevent/pom.xml +++ b/components/camel-pgevent/pom.xml @@ -62,13 +62,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-jdbc - ${project.version} - test-jar - test - org.testcontainers diff --git a/components/camel-platform-http/pom.xml b/components/camel-platform-http/pom.xml index c6ae0e982f3f0..b1b7deb188ead 100644 --- a/components/camel-platform-http/pom.xml +++ b/components/camel-platform-http/pom.xml @@ -43,13 +43,6 @@ - - org.apache.camel - camel-test-infra-jetty - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-jetty diff --git a/components/camel-pqc/pom.xml b/components/camel-pqc/pom.xml index b26bafc6a90b7..17c0dca90481d 100644 --- a/components/camel-pqc/pom.xml +++ b/components/camel-pqc/pom.xml @@ -91,20 +91,6 @@ org.apache.camel camel-test-infra-hashicorp-vault ${project.version} - test-jar - test - - - org.apache.camel - camel-test-infra-hashicorp-vault - ${project.version} - test - - - org.apache.camel - camel-test-infra-aws-v2 - ${project.version} - test-jar test diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml index 122dc662991b2..f7f832b987c9b 100644 --- a/components/camel-pulsar/pom.xml +++ b/components/camel-pulsar/pom.xml @@ -78,13 +78,6 @@ - - org.apache.camel - camel-test-infra-pulsar - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-pulsar diff --git a/components/camel-redis/pom.xml b/components/camel-redis/pom.xml index f8f24537eafc2..8b55f6f4383c9 100644 --- a/components/camel-redis/pom.xml +++ b/components/camel-redis/pom.xml @@ -58,13 +58,6 @@ - - org.apache.camel - camel-test-infra-redis - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-redis diff --git a/components/camel-rocketmq/pom.xml b/components/camel-rocketmq/pom.xml index 3eeb0696178f4..0d6493527f17b 100644 --- a/components/camel-rocketmq/pom.xml +++ b/components/camel-rocketmq/pom.xml @@ -42,7 +42,6 @@ true - org.apache.camel @@ -76,14 +75,6 @@ ${logback-version} test - - - org.apache.camel - camel-test-infra-rocketmq - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-rocketmq diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml index 22b51a33c72c2..f6cbb9cede00d 100644 --- a/components/camel-rss/pom.xml +++ b/components/camel-rss/pom.xml @@ -78,13 +78,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-jetty - ${project.version} - test-jar - test - diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml index 865f9c92c0aaf..9002df2e3b87f 100644 --- a/components/camel-sjms/pom.xml +++ b/components/camel-sjms/pom.xml @@ -69,13 +69,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - org.messaginghub pooled-jms diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml index 05bac442f5d67..6242ab7b36a6c 100644 --- a/components/camel-sjms2/pom.xml +++ b/components/camel-sjms2/pom.xml @@ -67,13 +67,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - org.messaginghub diff --git a/components/camel-smb/pom.xml b/components/camel-smb/pom.xml index 9c8d7d24bc713..4afb65bbd9f97 100644 --- a/components/camel-smb/pom.xml +++ b/components/camel-smb/pom.xml @@ -66,14 +66,6 @@ ${commons-io-version} test - - - org.apache.camel - camel-test-infra-smb - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-smb diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml index fb29e55bef5aa..f97b722909462 100644 --- a/components/camel-solr/pom.xml +++ b/components/camel-solr/pom.xml @@ -82,20 +82,6 @@ camel-test-infra-core ${project.version} test - test-jar - - - org.apache.camel - camel-test-infra-core - ${project.version} - test - - - org.apache.camel - camel-test-infra-solr - ${project.version} - test-jar - test org.apache.logging.log4j diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml index 6edec337951cb..4e8d6bd388859 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml @@ -110,13 +110,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml index 94114937fd0ca..220f09468b880 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml @@ -77,13 +77,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml index 43e0f54bafe71..36f29ae372112 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml @@ -95,13 +95,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-qdrant - ${project.version} - test-jar - test - org.apache.camel @@ -109,13 +102,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-ollama - ${project.version} - test-jar - test - org.awaitility awaitility diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml b/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml index 977fb7fb9013b..4af0ce7fab1d2 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml +++ b/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml @@ -45,13 +45,6 @@ - - org.apache.camel - camel-test-infra-rabbitmq - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-rabbitmq diff --git a/components/camel-spring-parent/camel-spring-redis/pom.xml b/components/camel-spring-parent/camel-spring-redis/pom.xml index 4750b8f55b6ae..d3913c340219c 100644 --- a/components/camel-spring-parent/camel-spring-redis/pom.xml +++ b/components/camel-spring-parent/camel-spring-redis/pom.xml @@ -76,13 +76,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-redis - ${project.version} - test-jar - test - diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml index 5272607f2490e..5c50ce2aa5621 100644 --- a/components/camel-stomp/pom.xml +++ b/components/camel-stomp/pom.xml @@ -67,13 +67,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-artemis - ${project.version} - test - test-jar - org.junit.jupiter junit-jupiter diff --git a/components/camel-tahu/pom.xml b/components/camel-tahu/pom.xml index 7364ef12f04b4..a37e2d02035a7 100644 --- a/components/camel-tahu/pom.xml +++ b/components/camel-tahu/pom.xml @@ -165,13 +165,6 @@ test - - org.apache.camel - camel-test-infra-core - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-core @@ -184,20 +177,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test - test-jar - - - org.apache.camel - camel-test-infra-hivemq - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-hivemq diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml index c596d2bd4ca50..5c7e38d367c09 100644 --- a/components/camel-undertow/pom.xml +++ b/components/camel-undertow/pom.xml @@ -120,13 +120,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - test - io.netty diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index 50c2deb38fde8..7f61b0e618f0e 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -90,13 +90,6 @@ - - org.apache.camel - camel-test-infra-xmpp - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-xmpp diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml index 7c3909c418a52..877be1c2dfcc9 100644 --- a/components/camel-zookeeper-master/pom.xml +++ b/components/camel-zookeeper-master/pom.xml @@ -111,13 +111,6 @@ - - org.apache.camel - camel-test-infra-zookeeper - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-zookeeper diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml index 7f93b1e2c486a..03e78dab649bb 100644 --- a/components/camel-zookeeper/pom.xml +++ b/components/camel-zookeeper/pom.xml @@ -161,13 +161,6 @@ - - org.apache.camel - camel-test-infra-zookeeper - ${project.version} - test-jar - test - org.apache.camel camel-test-infra-zookeeper diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc index 1db893eae6661..9f1b84137b58f 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc @@ -57,6 +57,38 @@ Should be changed to have semicolons as shown below: ---- +=== camel-test-infra + +The test infrastructure modules no longer produce `test-jar` artifacts. All classes (service interfaces, +container implementations, JUnit extensions, and service factories) are now packaged in the regular JAR artifact. + +If your project depends on `camel-test-infra-*` modules with `test-jar`, remove the `` element: + +Before: +[source,xml] +---- + + org.apache.camel + camel-test-infra-kafka + ${camel.version} + test-jar + test + +---- + +After: +[source,xml] +---- + + org.apache.camel + camel-test-infra-kafka + ${camel.version} + test + +---- + +This applies to all `camel-test-infra-*` artifacts, including `camel-test-infra-common`. + === camel-yaml-io / camel-xml-io In the YAML DSL we have renamed `routePolicy` to `routePolicyRef` on the `route` node, diff --git a/docs/user-manual/modules/ROOT/pages/test-infra.adoc b/docs/user-manual/modules/ROOT/pages/test-infra.adoc index 9bea32f6b7ce3..2c4168bb30402 100644 --- a/docs/user-manual/modules/ROOT/pages/test-infra.adoc +++ b/docs/user-manual/modules/ROOT/pages/test-infra.adoc @@ -60,9 +60,8 @@ NOTE: support for embeddable components may be removed in future versions. ==== Recommended Structure for Test Infrastructure Modules -The actual Service interface and implementation should be added under `src/main`, while the actual integration with JUnit -can be added to `src/test`, in this way the classes needed to run the service (most of them, with testcontainers) are decoupled -by JUnit and can be run separately. +All classes (service interfaces, container implementations, JUnit extensions, and service factories) are placed under `src/main`. +This allows the modules to be consumed as regular JAR dependencies without requiring `test-jar` packaging. ===== Main Sources @@ -91,9 +90,7 @@ service to choose between running as a local container or as remote instance, a as `.`. More complex services may use the builder available through the factory classes to compose the service accordingly. -===== Test Sources - -Once the main sources are implemented, https://github.com/apache/camel/blob/main/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestService.java[TestService] +The https://github.com/apache/camel/blob/main/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestService.java[TestService] interface can be used to integrate the actual Service implementation with JUnit and its lifecycle. The services should try to minimize the test execution time and resource usage when running. As such, the https://junit.org/junit5/docs/5.1.1/api/org/junit/jupiter/api/extension/BeforeAllCallback.html[BeforeAllCallback] @@ -148,13 +145,13 @@ Then, when referring these properties in Camel routes or Spring XML properties, ==== Packaging Recommendations -This is infrastructure code for testing, therefore, it should be package as test type artifacts. The +The test infrastructure modules are packaged as regular JAR artifacts. The https://github.com/apache/camel/blob/main/test-infra/camel-test-infra-parent[parent pom] should provide all the necessary bits for packaging the test infrastructure. === Using The Test Infrastructure in Tests Using the test infra in a new component test is rather straightforward, similar to using any other reusable component. -You start by declaring the test infra dependencies in your pom file. +You start by declaring the test infra dependencies in your pom file. This should be similar to: @@ -165,7 +162,6 @@ This should be similar to: org.apache.camel camel-test-infra-myservice ${project.version} - test-jar test ---- diff --git a/dsl/camel-jbang/camel-jbang-it/pom.xml b/dsl/camel-jbang/camel-jbang-it/pom.xml index 6dadde3772f50..f2199c15032fe 100644 --- a/dsl/camel-jbang/camel-jbang-it/pom.xml +++ b/dsl/camel-jbang/camel-jbang-it/pom.xml @@ -55,18 +55,6 @@ logback-classic ${logback-version} - - org.apache.camel - camel-test-infra-cli - ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-mosquitto - ${project.version} - test-jar - org.apache.camel camel-jbang-core @@ -113,19 +101,6 @@ test - - org.apache.camel - camel-test-infra-cli - test-jar - test - - - org.apache.camel - camel-test-infra-mosquitto - test-jar - test - - org.apache.camel camel-jbang-core diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml index 1e4fdf6dc13a7..32de0f46c4161 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml @@ -252,13 +252,6 @@ ${project.version} test - - org.apache.camel - camel-test-infra-common - ${project.version} - test - test-jar - org.apache.camel camel-test-infra-common diff --git a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json index 0f88ca53f9745..8e82912060256 100644 --- a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json +++ b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json @@ -16,15 +16,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSConfigLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "config" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -52,15 +43,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-iggy", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEventBridgeLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "event-bridge" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -70,15 +52,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSSecretsManagerLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "secrets-manager" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.zookeeper.services.ZooKeeperInfraService", "description" : "Zookeeper is a server for highly reliable distributed coordination of cloud applications", @@ -88,15 +61,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-zookeeper", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.cassandra.services.CassandraInfraService", - "description" : "Apache Cassandra NoSQL Database", - "implementation" : "org.apache.camel.test.infra.cassandra.services.CassandraLocalContainerInfraService", - "alias" : [ "cassandra" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-cassandra", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -124,15 +88,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-elasticsearch", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEC2LocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "ec2" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", "description" : "Apache Kafka, Distributed event streaming platform", @@ -169,15 +124,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.hazelcast.services.HazelcastInfraService", - "description" : "In Memory Database Hazelcast", - "implementation" : "org.apache.camel.test.infra.hazelcast.services.HazelcastEmbeddedInfraService", - "alias" : [ "hazelcast" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-hazelcast", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.postgres.services.PostgresInfraService", "description" : "Postgres SQL Database", @@ -187,15 +133,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-postgres", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.hivemq.services.HiveMQInfraService", - "description" : "MQTT Platform HiveMQ", - "implementation" : "org.apache.camel.test.infra.hivemq.services.LocalHiveMQSparkplugTCKInfraService", - "alias" : [ "hive-mq" ], - "aliasImplementation" : [ "sparkplug" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-hivemq", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", "description" : "Apache Kafka, Distributed event streaming platform", @@ -232,24 +169,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-artemis", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRAInfraService", - "description" : "Transaction Manager for microservices that is based on the SAGA pattern for distributed transaction.", - "implementation" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRALocalContainerInfraService", - "alias" : [ "microprofile" ], - "aliasImplementation" : [ "lra" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-microprofile-lra", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.minio.services.MinioInfraService", - "description" : "MinIO Object Storage, S3 compatible", - "implementation" : "org.apache.camel.test.infra.minio.services.MinioLocalContainerInfraService", - "alias" : [ "minio" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-minio", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.solr.services.SolrInfraService", "description" : "Apache Solr is a Search Platform", @@ -268,33 +187,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-couchbase", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", - "description" : "Apache Kafka, Distributed event streaming platform", - "implementation" : "org.apache.camel.test.infra.kafka.services.ContainerLocalKafkaInfraService", - "alias" : [ "kafka" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-kafka", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", - "description" : "Local Azure services with Azurite", - "implementation" : "org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueLocalContainerInfraService", - "alias" : [ "azure" ], - "aliasImplementation" : [ "storage-queue" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-azure-storage-queue", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", - "description" : "Embedded SFTP Server", - "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.SftpEmbeddedInfraService", - "alias" : [ "sftp" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ftp", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -331,15 +223,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-hivemq", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.infinispan.services.InfinispanInfraService", - "description" : "Distributed Database For High‑Performance Applications With In‑Memory Speed", - "implementation" : "org.apache.camel.test.infra.infinispan.services.InfinispanLocalContainerInfraService", - "alias" : [ "infinispan" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-infinispan", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.ibmmq.services.IbmMQInfraService", "description" : "IBM MQ messaging middleware", @@ -385,24 +268,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-xmpp", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.weaviate.services.WeaviateInfraService", - "description" : "Weaviate Vector Database", - "implementation" : "org.apache.camel.test.infra.weaviate.services.WeaviateLocalContainerInfraService", - "alias" : [ "weaviate" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-weaviate", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.consul.services.ConsulInfraService", - "description" : "Consul is a service networking solution", - "implementation" : "org.apache.camel.test.infra.consul.services.ConsulLocalContainerInfraService", - "alias" : [ "consul" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-consul", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.pulsar.services.PulsarInfraService", "description" : "Distributed messaging and streaming platform", @@ -412,33 +277,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-pulsar", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.qdrant.services.QdrantInfraService", - "description" : "Vector Database and Vector Search Engine", - "implementation" : "org.apache.camel.test.infra.qdrant.services.QdrantLocalContainerInfraService", - "alias" : [ "qdrant" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-qdrant", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", - "description" : "Embedded FTPS Server", - "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpsEmbeddedInfraService", - "alias" : [ "ftps" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ftp", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ollama.services.OllamaInfraService", - "description" : "Build and run LLMs with Ollama", - "implementation" : "org.apache.camel.test.infra.ollama.services.OllamaLocalContainerInfraService", - "alias" : [ "ollama" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ollama", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService", "description" : "Apache Artemis is an open source message broker", @@ -448,33 +286,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-artemis", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", - "description" : "Local Azure services with Azurite", - "implementation" : "org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobLocalContainerInfraService", - "alias" : [ "azure" ], - "aliasImplementation" : [ "storage-blob" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-azure-storage-blob", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.torchserve.services.TorchServeInfraService", - "description" : "TorchServe is a flexible tool for serving PyTorch", - "implementation" : "org.apache.camel.test.infra.torchserve.services.TorchServeLocalContainerInfraService", - "alias" : [ "torch-serve" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-torchserve", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.docling.services.DoclingInfraService", - "description" : "Document processing and conversion service", - "implementation" : "org.apache.camel.test.infra.docling.services.DoclingLocalContainerInfraService", - "alias" : [ "docling" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-docling", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -484,24 +295,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", - "description" : "Local AWS Services with LocalStack", - "implementation" : "org.apache.camel.test.infra.aws2.services.AWSIAMLocalContainerInfraService", - "alias" : [ "aws" ], - "aliasImplementation" : [ "iam" ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-aws-v2", - "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.fhir.services.FhirInfraService", - "description" : "HAPI FHIR RESTful test server", - "implementation" : "org.apache.camel.test.infra.fhir.services.FhirLocalContainerInfraService", - "alias" : [ "fhir" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-fhir", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", "description" : "Local AWS Services with LocalStack", @@ -511,15 +304,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-aws-v2", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.pinecone.services.PineconeInfraService", - "description" : "Pinecone Vector Database", - "implementation" : "org.apache.camel.test.infra.pinecone.services.PineconeLocalContainerInfraService", - "alias" : [ "pinecone" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-pinecone", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.google.pubsub.services.GooglePubSubInfraService", "description" : "Google Cloud SDK Tool", @@ -556,15 +340,6 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-ignite", "version" : "4.19.0-SNAPSHOT" -}, { - "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", - "description" : "Embedded FTP Server", - "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedInfraService", - "alias" : [ "ftp" ], - "aliasImplementation" : [ ], - "groupId" : "org.apache.camel", - "artifactId" : "camel-test-infra-ftp", - "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.rabbitmq.services.RabbitMQInfraService", "description" : "Messaging and streaming broker", @@ -601,6 +376,231 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-rocketmq", "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSConfigLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "config" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEventBridgeLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "event-bridge" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSSecretsManagerLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "secrets-manager" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.cassandra.services.CassandraInfraService", + "description" : "Apache Cassandra NoSQL Database", + "implementation" : "org.apache.camel.test.infra.cassandra.services.CassandraLocalContainerInfraService", + "alias" : [ "cassandra" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-cassandra", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSEC2LocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "ec2" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.hazelcast.services.HazelcastInfraService", + "description" : "In Memory Database Hazelcast", + "implementation" : "org.apache.camel.test.infra.hazelcast.services.HazelcastEmbeddedInfraService", + "alias" : [ "hazelcast" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-hazelcast", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.hivemq.services.HiveMQInfraService", + "description" : "MQTT Platform HiveMQ", + "implementation" : "org.apache.camel.test.infra.hivemq.services.LocalHiveMQSparkplugTCKInfraService", + "alias" : [ "hive-mq" ], + "aliasImplementation" : [ "sparkplug" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-hivemq", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRAInfraService", + "description" : "Transaction Manager for microservices that is based on the SAGA pattern for distributed transaction.", + "implementation" : "org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRALocalContainerInfraService", + "alias" : [ "microprofile" ], + "aliasImplementation" : [ "lra" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-microprofile-lra", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.minio.services.MinioInfraService", + "description" : "MinIO Object Storage, S3 compatible", + "implementation" : "org.apache.camel.test.infra.minio.services.MinioLocalContainerInfraService", + "alias" : [ "minio" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-minio", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.kafka.services.KafkaInfraService", + "description" : "Apache Kafka, Distributed event streaming platform", + "implementation" : "org.apache.camel.test.infra.kafka.services.ContainerLocalKafkaInfraService", + "alias" : [ "kafka" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-kafka", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", + "description" : "Local Azure services with Azurite", + "implementation" : "org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueLocalContainerInfraService", + "alias" : [ "azure" ], + "aliasImplementation" : [ "storage-queue" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-azure-storage-queue", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", + "description" : "Embedded SFTP Server", + "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.SftpEmbeddedInfraService", + "alias" : [ "sftp" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ftp", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.infinispan.services.InfinispanInfraService", + "description" : "Distributed Database For High‑Performance Applications With In‑Memory Speed", + "implementation" : "org.apache.camel.test.infra.infinispan.services.InfinispanLocalContainerInfraService", + "alias" : [ "infinispan" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-infinispan", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.weaviate.services.WeaviateInfraService", + "description" : "Weaviate Vector Database", + "implementation" : "org.apache.camel.test.infra.weaviate.services.WeaviateLocalContainerInfraService", + "alias" : [ "weaviate" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-weaviate", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.consul.services.ConsulInfraService", + "description" : "Consul is a service networking solution", + "implementation" : "org.apache.camel.test.infra.consul.services.ConsulLocalContainerInfraService", + "alias" : [ "consul" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-consul", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.qdrant.services.QdrantInfraService", + "description" : "Vector Database and Vector Search Engine", + "implementation" : "org.apache.camel.test.infra.qdrant.services.QdrantLocalContainerInfraService", + "alias" : [ "qdrant" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-qdrant", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", + "description" : "Embedded FTPS Server", + "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpsEmbeddedInfraService", + "alias" : [ "ftps" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ftp", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ollama.services.OllamaInfraService", + "description" : "Build and run LLMs with Ollama", + "implementation" : "org.apache.camel.test.infra.ollama.services.OllamaLocalContainerInfraService", + "alias" : [ "ollama" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ollama", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.azure.common.services.AzureInfraService", + "description" : "Local Azure services with Azurite", + "implementation" : "org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobLocalContainerInfraService", + "alias" : [ "azure" ], + "aliasImplementation" : [ "storage-blob" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-azure-storage-blob", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.torchserve.services.TorchServeInfraService", + "description" : "TorchServe is a flexible tool for serving PyTorch", + "implementation" : "org.apache.camel.test.infra.torchserve.services.TorchServeLocalContainerInfraService", + "alias" : [ "torch-serve" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-torchserve", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.docling.services.DoclingInfraService", + "description" : "Document processing and conversion service", + "implementation" : "org.apache.camel.test.infra.docling.services.DoclingLocalContainerInfraService", + "alias" : [ "docling" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-docling", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", + "description" : "Local AWS Services with LocalStack", + "implementation" : "org.apache.camel.test.infra.aws2.services.AWSIAMLocalContainerInfraService", + "alias" : [ "aws" ], + "aliasImplementation" : [ "iam" ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-aws-v2", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.fhir.services.FhirInfraService", + "description" : "HAPI FHIR RESTful test server", + "implementation" : "org.apache.camel.test.infra.fhir.services.FhirLocalContainerInfraService", + "alias" : [ "fhir" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-fhir", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.pinecone.services.PineconeInfraService", + "description" : "Pinecone Vector Database", + "implementation" : "org.apache.camel.test.infra.pinecone.services.PineconeLocalContainerInfraService", + "alias" : [ "pinecone" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-pinecone", + "version" : "4.19.0-SNAPSHOT" +}, { + "service" : "org.apache.camel.test.infra.ftp.services.FtpInfraService", + "description" : "Embedded FTP Server", + "implementation" : "org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedInfraService", + "alias" : [ "ftp" ], + "aliasImplementation" : [ ], + "groupId" : "org.apache.camel", + "artifactId" : "camel-test-infra-ftp", + "version" : "4.19.0-SNAPSHOT" }, { "service" : "org.apache.camel.test.infra.mongodb.services.MongoDBInfraService", "description" : "MongoDB NoSql Database", diff --git a/test-infra/camel-test-infra-arangodb/pom.xml b/test-infra/camel-test-infra-arangodb/pom.xml index bf00113b43370..d0eb2bf25d211 100644 --- a/test-infra/camel-test-infra-arangodb/pom.xml +++ b/test-infra/camel-test-infra-arangodb/pom.xml @@ -30,17 +30,7 @@ camel-test-infra-arangodb Camel :: Test Infra :: ArangoDB - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common @@ -51,12 +41,6 @@ arangodb-java-driver ${arangodb-java-version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - diff --git a/test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDBService.java b/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBService.java similarity index 100% rename from test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDBService.java rename to test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBService.java diff --git a/test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDBServiceFactory.java b/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDBServiceFactory.java rename to test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBServiceFactory.java diff --git a/test-infra/camel-test-infra-artemis/pom.xml b/test-infra/camel-test-infra-artemis/pom.xml index c13ae472ab9b4..bb67a64bee794 100644 --- a/test-infra/camel-test-infra-artemis/pom.xml +++ b/test-infra/camel-test-infra-artemis/pom.xml @@ -30,39 +30,16 @@ Camel :: Test Infra :: Artemis Apache Artemis test infrastructure for Camel - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - org.apache.camel camel-test-infra-messaging-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-messaging-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} org.apache.activemq diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPService.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPService.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPService.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisEmbeddedServiceBuilder.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisEmbeddedServiceBuilder.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisEmbeddedServiceBuilder.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisEmbeddedServiceBuilder.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTService.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTService.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTService.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMService.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMService.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMService.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisService.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisService.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisService.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisServiceFactory.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisServiceFactory.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisServiceFactory.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisTCPAllProtocolsService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisTCPAllProtocolsService.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisTCPAllProtocolsService.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisTCPAllProtocolsService.java diff --git a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisVMService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisVMService.java similarity index 100% rename from test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisVMService.java rename to test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisVMService.java diff --git a/test-infra/camel-test-infra-aws-common/pom.xml b/test-infra/camel-test-infra-aws-common/pom.xml index 519cbc7410e20..e29a5c5702951 100644 --- a/test-infra/camel-test-infra-aws-common/pom.xml +++ b/test-infra/camel-test-infra-aws-common/pom.xml @@ -30,17 +30,7 @@ Camel :: Test Infra :: AWS Common camel-test-infra-aws-common - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common diff --git a/test-infra/camel-test-infra-aws-common/src/test/java/org/apache/camel/test/infra/aws/common/services/AWSService.java b/test-infra/camel-test-infra-aws-common/src/main/java/org/apache/camel/test/infra/aws/common/services/AWSService.java similarity index 100% rename from test-infra/camel-test-infra-aws-common/src/test/java/org/apache/camel/test/infra/aws/common/services/AWSService.java rename to test-infra/camel-test-infra-aws-common/src/main/java/org/apache/camel/test/infra/aws/common/services/AWSService.java diff --git a/test-infra/camel-test-infra-aws-v2/pom.xml b/test-infra/camel-test-infra-aws-v2/pom.xml index 1157d195a32be..acb351a0d26b4 100644 --- a/test-infra/camel-test-infra-aws-v2/pom.xml +++ b/test-infra/camel-test-infra-aws-v2/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-aws-v2 Camel :: Test Infra :: AWS SDK v2 - - false - - org.apache.camel camel-test-infra-aws-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-aws-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java rename to test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSTestServices.java b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSTestServices.java similarity index 100% rename from test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSTestServices.java rename to test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSTestServices.java diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/SystemPropertiesAWSCredentialsProvider.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/SystemPropertiesAWSCredentialsProvider.java deleted file mode 100644 index d2ad24808d926..0000000000000 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/SystemPropertiesAWSCredentialsProvider.java +++ /dev/null @@ -1,27 +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.test.infra.aws2.common; - -import org.apache.camel.test.infra.aws.common.AWSConfigs; - -public class SystemPropertiesAWSCredentialsProvider extends TestAWSCredentialsProvider { - - public SystemPropertiesAWSCredentialsProvider() { - super(System.getProperty(AWSConfigs.ACCESS_KEY), System.getProperty(AWSConfigs.SECRET_KEY)); - } -} diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/TestAWSCredentials.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/TestAWSCredentials.java deleted file mode 100644 index dccc8c6ea1bfb..0000000000000 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/TestAWSCredentials.java +++ /dev/null @@ -1,43 +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.test.infra.aws2.common; - -import java.util.Objects; - -import software.amazon.awssdk.auth.credentials.AwsCredentials; - -public class TestAWSCredentials implements AwsCredentials { - private final String accessKey; - private final String secretKey; - - public TestAWSCredentials(String accessKey, String secretKey) { - this.accessKey = Objects.requireNonNull(accessKey); - this.secretKey = Objects.requireNonNull(secretKey); - } - - @Override - public String accessKeyId() { - return accessKey; - } - - @Override - public String secretAccessKey() { - return secretKey; - } - -}; diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/TestAWSCredentialsProvider.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/TestAWSCredentialsProvider.java deleted file mode 100644 index 7f5b5116f5268..0000000000000 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/common/TestAWSCredentialsProvider.java +++ /dev/null @@ -1,36 +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.test.infra.aws2.common; - -import software.amazon.awssdk.auth.credentials.AwsCredentials; -import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; - -public class TestAWSCredentialsProvider implements AwsCredentialsProvider { - public static final TestAWSCredentialsProvider CONTAINER_LOCAL_DEFAULT_PROVIDER - = new TestAWSCredentialsProvider("accesskey", "secretkey"); - - private AwsCredentials credentials; - - public TestAWSCredentialsProvider(String accessKey, String secretKey) { - credentials = new TestAWSCredentials(accessKey, secretKey); - } - - @Override - public AwsCredentials resolveCredentials() { - return credentials; - } -} diff --git a/test-infra/camel-test-infra-azure-common/pom.xml b/test-infra/camel-test-infra-azure-common/pom.xml index 0999cdf381cd0..92bac458b1307 100644 --- a/test-infra/camel-test-infra-azure-common/pom.xml +++ b/test-infra/camel-test-infra-azure-common/pom.xml @@ -29,26 +29,11 @@ Camel :: Test Infra :: Azure Common camel-test-infra-azure-common - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureService.java b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureService.java similarity index 100% rename from test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureService.java rename to test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureService.java diff --git a/test-infra/camel-test-infra-azure-storage-blob/pom.xml b/test-infra/camel-test-infra-azure-storage-blob/pom.xml index e81fe33c1d24e..f988d3972637c 100644 --- a/test-infra/camel-test-infra-azure-storage-blob/pom.xml +++ b/test-infra/camel-test-infra-azure-storage-blob/pom.xml @@ -29,10 +29,6 @@ Camel :: Test Infra :: Azure Storage Blob camel-test-infra-azure-storage-blob - - false - - @@ -50,18 +46,6 @@ org.apache.camel camel-test-infra-azure-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-azure-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java b/test-infra/camel-test-infra-azure-storage-blob/src/main/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java rename to test-infra/camel-test-infra-azure-storage-blob/src/main/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java diff --git a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml index e4077dbb769c3..dae58181f6fe8 100644 --- a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml +++ b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml @@ -29,10 +29,6 @@ Camel :: Test Infra :: Azure Storage Datalake camel-test-infra-azure-storage-datalake - - false - - @@ -46,12 +42,6 @@ - - org.apache.camel - camel-test-infra-azure-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-azure-common diff --git a/test-infra/camel-test-infra-azure-storage-datalake/src/test/java/org/apache/camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java b/test-infra/camel-test-infra-azure-storage-datalake/src/main/java/org/apache/camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-azure-storage-datalake/src/test/java/org/apache/camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java rename to test-infra/camel-test-infra-azure-storage-datalake/src/main/java/org/apache/camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java diff --git a/test-infra/camel-test-infra-azure-storage-queue/pom.xml b/test-infra/camel-test-infra-azure-storage-queue/pom.xml index d14af7e997cbc..e0bc5c8729e02 100644 --- a/test-infra/camel-test-infra-azure-storage-queue/pom.xml +++ b/test-infra/camel-test-infra-azure-storage-queue/pom.xml @@ -29,10 +29,6 @@ Camel :: Test Infra :: Azure Storage Queue camel-test-infra-azure-storage-queue - - false - - @@ -50,18 +46,6 @@ org.apache.camel camel-test-infra-azure-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-azure-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java b/test-infra/camel-test-infra-azure-storage-queue/src/main/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java rename to test-infra/camel-test-infra-azure-storage-queue/src/main/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java diff --git a/test-infra/camel-test-infra-cassandra/pom.xml b/test-infra/camel-test-infra-cassandra/pom.xml index 57b662bd177bf..c6ab2278f45f6 100644 --- a/test-infra/camel-test-infra-cassandra/pom.xml +++ b/test-infra/camel-test-infra-cassandra/pom.xml @@ -29,27 +29,11 @@ camel-test-infra-cassandra Camel :: Test Infra :: Cassandra - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java rename to test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java diff --git a/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraService.java b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraService.java similarity index 100% rename from test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraService.java rename to test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraService.java diff --git a/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraServiceFactory.java b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraServiceFactory.java rename to test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraServiceFactory.java diff --git a/test-infra/camel-test-infra-chatscript/pom.xml b/test-infra/camel-test-infra-chatscript/pom.xml index 3d57e14f7c29e..be40e16f0ca73 100644 --- a/test-infra/camel-test-infra-chatscript/pom.xml +++ b/test-infra/camel-test-infra-chatscript/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-chatscript Camel :: Test Infra :: ChatScript - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java b/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java similarity index 100% rename from test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java rename to test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptService.java diff --git a/test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptServiceFactory.java b/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-chatscript/src/test/java/org/apache/camel/test/infra/chatscript/services/ChatScriptServiceFactory.java rename to test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptServiceFactory.java diff --git a/test-infra/camel-test-infra-cli/pom.xml b/test-infra/camel-test-infra-cli/pom.xml index 615c86326bf15..5aa285babad50 100644 --- a/test-infra/camel-test-infra-cli/pom.xml +++ b/test-infra/camel-test-infra-cli/pom.xml @@ -35,12 +35,6 @@ - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common @@ -49,43 +43,31 @@ org.apache.camel camel-util - test org.apache.camel camel-support - test - - - - org.testcontainers - testcontainers - ${testcontainers-version} org.junit-pioneer junit-pioneer ${junit-pioneer-version} - test org.slf4j slf4j-api - test ch.qos.logback logback-core ${logback-version} - test ch.qos.logback logback-classic ${logback-version} - test diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/common/CliProperties.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/common/CliProperties.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/common/CliProperties.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/common/CliProperties.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/AbstractTestSupport.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/it/AbstractTestSupport.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/AbstractTestSupport.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/it/AbstractTestSupport.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/it/RunITCase.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/it/RunITCase.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliService.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliService.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliService.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliService.java diff --git a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliServiceFactory.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliServiceFactory.java rename to test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliServiceFactory.java diff --git a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/99-ssh-jbang.conf b/test-infra/camel-test-infra-cli/src/main/resources/org/apache/camel/test/infra/cli/services/99-ssh-jbang.conf similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/99-ssh-jbang.conf rename to test-infra/camel-test-infra-cli/src/main/resources/org/apache/camel/test/infra/cli/services/99-ssh-jbang.conf diff --git a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile b/test-infra/camel-test-infra-cli/src/main/resources/org/apache/camel/test/infra/cli/services/Dockerfile similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile rename to test-infra/camel-test-infra-cli/src/main/resources/org/apache/camel/test/infra/cli/services/Dockerfile diff --git a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/entrypoint.sh b/test-infra/camel-test-infra-cli/src/main/resources/org/apache/camel/test/infra/cli/services/entrypoint.sh similarity index 100% rename from test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/entrypoint.sh rename to test-infra/camel-test-infra-cli/src/main/resources/org/apache/camel/test/infra/cli/services/entrypoint.sh diff --git a/test-infra/camel-test-infra-cli/src/test/resources/logback-test.xml b/test-infra/camel-test-infra-cli/src/test/resources/logback-test.xml deleted file mode 100644 index 169e12ec2f53a..0000000000000 --- a/test-infra/camel-test-infra-cli/src/test/resources/logback-test.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - [%highlight(%level)] %logger{36}.%M - %msg%n - - - - - - - - - - - - - diff --git a/test-infra/camel-test-infra-common/pom.xml b/test-infra/camel-test-infra-common/pom.xml index 1339cdbcb9e66..e7494b75f0bb9 100644 --- a/test-infra/camel-test-infra-common/pom.xml +++ b/test-infra/camel-test-infra-common/pom.xml @@ -31,16 +31,4 @@ Camel :: Test Infra :: Common Common test infrastructure code for Camel - - false - - - - - org.testcontainers - testcontainers - ${testcontainers-version} - - - diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/SharedNameGenerator.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/SharedNameGenerator.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/SharedNameGenerator.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/SharedNameGenerator.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/SharedNameRegistry.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/SharedNameRegistry.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/SharedNameRegistry.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/SharedNameRegistry.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestEntityNameGenerator.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/TestEntityNameGenerator.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestEntityNameGenerator.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/TestEntityNameGenerator.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestUtils.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/TestUtils.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestUtils.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/TestUtils.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/http/WebsocketTestClient.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/AbstractTestService.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/AbstractTestService.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/ContainerTestService.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerTestService.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/ContainerTestService.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerTestService.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SimpleTestServiceBuilder.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/SimpleTestServiceBuilder.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SimpleTestServiceBuilder.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/SimpleTestServiceBuilder.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/SingletonService.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/SingletonService.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestService.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestService.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestService.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestService.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestServiceBuilder.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestServiceBuilder.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestServiceBuilder.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestServiceBuilder.java diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestServiceUtil.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestServiceUtil.java similarity index 100% rename from test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/TestServiceUtil.java rename to test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/TestServiceUtil.java diff --git a/test-infra/camel-test-infra-common/src/test/resources/log4j2.properties b/test-infra/camel-test-infra-common/src/test/resources/log4j2.properties deleted file mode 100644 index 863dbd2a2a4ee..0000000000000 --- a/test-infra/camel-test-infra-common/src/test/resources/log4j2.properties +++ /dev/null @@ -1,28 +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. -## --------------------------------------------------------------------------- - -appender.file.type = File -appender.file.name = file -appender.file.fileName = target/camel-test-infra-common-test.log -appender.file.layout.type = PatternLayout -appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -appender.out.type = Console -appender.out.name = out -appender.out.layout.type = PatternLayout -appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -rootLogger.level = INFO -rootLogger.appenderRef.file.ref = file diff --git a/test-infra/camel-test-infra-consul/pom.xml b/test-infra/camel-test-infra-consul/pom.xml index e12f92c6cff0e..8cb2b2203cd38 100644 --- a/test-infra/camel-test-infra-consul/pom.xml +++ b/test-infra/camel-test-infra-consul/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-consul Camel :: Test Infra :: Consul - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.kiwiproject consul-client @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulService.java b/test-infra/camel-test-infra-consul/src/main/java/org/apache/camel/test/infra/consul/services/ConsulService.java similarity index 100% rename from test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulService.java rename to test-infra/camel-test-infra-consul/src/main/java/org/apache/camel/test/infra/consul/services/ConsulService.java diff --git a/test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java b/test-infra/camel-test-infra-consul/src/main/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-consul/src/test/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java rename to test-infra/camel-test-infra-consul/src/main/java/org/apache/camel/test/infra/consul/services/ConsulServiceFactory.java diff --git a/test-infra/camel-test-infra-core/pom.xml b/test-infra/camel-test-infra-core/pom.xml index 889a290862e7f..b65912df47fe5 100644 --- a/test-infra/camel-test-infra-core/pom.xml +++ b/test-infra/camel-test-infra-core/pom.xml @@ -40,41 +40,20 @@ org.apache.camel camel-core - test - + org.junit.jupiter junit-jupiter-api - test org.junit.jupiter junit-jupiter-engine - test org.junit.jupiter junit-jupiter-params - test - - - - - org.apache.maven.plugins - maven-jar-plugin - - - test-compile - - test-jar - - - - - - diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/AbstractCamelContextExtension.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/AbstractCamelContextExtension.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/AbstractCamelContextExtension.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/AbstractCamelContextExtension.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/AnnotationProcessor.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/AnnotationProcessor.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/AnnotationProcessor.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/AnnotationProcessor.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/CamelContextExtension.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/CamelContextExtension.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/CamelContextExtension.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/CamelContextExtension.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/ContextLifeCycleManager.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/ContextLifeCycleManager.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/ContextLifeCycleManager.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/ContextLifeCycleManager.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultCamelContextExtension.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/DefaultCamelContextExtension.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultCamelContextExtension.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/DefaultCamelContextExtension.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultContextLifeCycleManager.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/DefaultContextLifeCycleManager.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultContextLifeCycleManager.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/DefaultContextLifeCycleManager.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/ExtensionUtils.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/ExtensionUtils.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/ExtensionUtils.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/ExtensionUtils.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/MockUtils.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/MockUtils.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/MockUtils.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/MockUtils.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/TransientCamelContextExtension.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/TransientCamelContextExtension.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/TransientCamelContextExtension.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/TransientCamelContextExtension.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/annotations/ContextFixture.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/annotations/ContextFixture.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/annotations/ContextFixture.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/annotations/ContextFixture.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/annotations/ContextProvider.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/annotations/ContextProvider.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/annotations/ContextProvider.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/annotations/ContextProvider.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/annotations/RouteFixture.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/annotations/RouteFixture.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/annotations/RouteFixture.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/annotations/RouteFixture.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/ConfigurableContext.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/api/ConfigurableContext.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/ConfigurableContext.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/api/ConfigurableContext.java diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/ConfigurableRoute.java b/test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/api/ConfigurableRoute.java similarity index 100% rename from test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/ConfigurableRoute.java rename to test-infra/camel-test-infra-core/src/main/java/org/apache/camel/test/infra/core/api/ConfigurableRoute.java diff --git a/test-infra/camel-test-infra-couchbase/pom.xml b/test-infra/camel-test-infra-couchbase/pom.xml index 64ec02cfad1e6..a2b07e860df49 100644 --- a/test-infra/camel-test-infra-couchbase/pom.xml +++ b/test-infra/camel-test-infra-couchbase/pom.xml @@ -29,17 +29,7 @@ camel-test-infra-couchbase Camel :: Test Infra :: Couchbase - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common @@ -51,12 +41,6 @@ ${couchbase-client-version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-couchbase @@ -64,5 +48,4 @@ - diff --git a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseService.java b/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseService.java similarity index 100% rename from test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseService.java rename to test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseService.java diff --git a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseServiceFactory.java b/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseServiceFactory.java rename to test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseServiceFactory.java diff --git a/test-infra/camel-test-infra-couchdb/pom.xml b/test-infra/camel-test-infra-couchdb/pom.xml index 38f632d23aac1..509f1c1f4a28d 100644 --- a/test-infra/camel-test-infra-couchdb/pom.xml +++ b/test-infra/camel-test-infra-couchdb/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-couchdb Camel :: Test Infra :: CouchDb - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbService.java b/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbService.java similarity index 100% rename from test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbService.java rename to test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbService.java diff --git a/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java b/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java rename to test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java diff --git a/test-infra/camel-test-infra-dispatch-router/pom.xml b/test-infra/camel-test-infra-dispatch-router/pom.xml index 93d75f1fd0090..cf5ae49675f58 100644 --- a/test-infra/camel-test-infra-dispatch-router/pom.xml +++ b/test-infra/camel-test-infra-dispatch-router/pom.xml @@ -42,12 +42,6 @@ camel-test-infra-messaging-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - diff --git a/test-infra/camel-test-infra-dispatch-router/src/test/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java b/test-infra/camel-test-infra-dispatch-router/src/main/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java similarity index 100% rename from test-infra/camel-test-infra-dispatch-router/src/test/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java rename to test-infra/camel-test-infra-dispatch-router/src/main/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java diff --git a/test-infra/camel-test-infra-docling/pom.xml b/test-infra/camel-test-infra-docling/pom.xml index fdaee659df1a6..fd86d74ee9cc9 100644 --- a/test-infra/camel-test-infra-docling/pom.xml +++ b/test-infra/camel-test-infra-docling/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-docling Camel :: Test Infra :: Docling - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-docling/src/test/java/org/apache/camel/test/infra/docling/DoclingInfraServiceTest.java b/test-infra/camel-test-infra-docling/src/main/java/org/apache/camel/test/infra/docling/DoclingInfraServiceTest.java similarity index 100% rename from test-infra/camel-test-infra-docling/src/test/java/org/apache/camel/test/infra/docling/DoclingInfraServiceTest.java rename to test-infra/camel-test-infra-docling/src/main/java/org/apache/camel/test/infra/docling/DoclingInfraServiceTest.java diff --git a/test-infra/camel-test-infra-docling/src/test/java/org/apache/camel/test/infra/docling/services/DoclingService.java b/test-infra/camel-test-infra-docling/src/main/java/org/apache/camel/test/infra/docling/services/DoclingService.java similarity index 100% rename from test-infra/camel-test-infra-docling/src/test/java/org/apache/camel/test/infra/docling/services/DoclingService.java rename to test-infra/camel-test-infra-docling/src/main/java/org/apache/camel/test/infra/docling/services/DoclingService.java diff --git a/test-infra/camel-test-infra-docling/src/test/java/org/apache/camel/test/infra/docling/services/DoclingServiceFactory.java b/test-infra/camel-test-infra-docling/src/main/java/org/apache/camel/test/infra/docling/services/DoclingServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-docling/src/test/java/org/apache/camel/test/infra/docling/services/DoclingServiceFactory.java rename to test-infra/camel-test-infra-docling/src/main/java/org/apache/camel/test/infra/docling/services/DoclingServiceFactory.java diff --git a/test-infra/camel-test-infra-docling/src/test/resources/log4j2.properties b/test-infra/camel-test-infra-docling/src/test/resources/log4j2.properties deleted file mode 100644 index 230a4af1179cf..0000000000000 --- a/test-infra/camel-test-infra-docling/src/test/resources/log4j2.properties +++ /dev/null @@ -1,28 +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. -## --------------------------------------------------------------------------- -appender.file.type = File -appender.file.name = file -appender.file.fileName = target/camel-test-infra-docling-test.log -appender.file.layout.type = PatternLayout -appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -appender.out.type = Console -appender.out.name = out -appender.out.layout.type = PatternLayout -appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n - -rootLogger.level = INFO -rootLogger.appenderRef.file.ref = file \ No newline at end of file diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml b/test-infra/camel-test-infra-elasticsearch/pom.xml index 5476f05bfbc42..f0673decf9fb8 100644 --- a/test-infra/camel-test-infra-elasticsearch/pom.xml +++ b/test-infra/camel-test-infra-elasticsearch/pom.xml @@ -29,29 +29,13 @@ camel-test-infra-elasticsearch Camel :: Test Infra :: Elasticsearch - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-elasticsearch @@ -59,5 +43,4 @@ - diff --git a/test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchService.java b/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchService.java similarity index 100% rename from test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchService.java rename to test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchService.java diff --git a/test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchServiceFactory.java b/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchServiceFactory.java rename to test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchServiceFactory.java diff --git a/test-infra/camel-test-infra-fhir/pom.xml b/test-infra/camel-test-infra-fhir/pom.xml index dc37552bc9299..55f753fe32f27 100644 --- a/test-infra/camel-test-infra-fhir/pom.xml +++ b/test-infra/camel-test-infra-fhir/pom.xml @@ -31,27 +31,11 @@ Camel :: Test Infra :: FHIR FHIR test infrastructure for Camel - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java rename to test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java diff --git a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java similarity index 100% rename from test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java rename to test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java diff --git a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirService.java b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirService.java similarity index 100% rename from test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirService.java rename to test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirService.java diff --git a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirServiceFactory.java b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirServiceFactory.java rename to test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirServiceFactory.java diff --git a/test-infra/camel-test-infra-ftp/pom.xml b/test-infra/camel-test-infra-ftp/pom.xml index 134a22ebe9d27..db152a2476401 100644 --- a/test-infra/camel-test-infra-ftp/pom.xml +++ b/test-infra/camel-test-infra-ftp/pom.xml @@ -30,10 +30,6 @@ camel-test-infra-ftp Camel :: Test Infra :: Ftp - - false - - commons-io @@ -59,13 +55,6 @@ sshd-scp ${sshd-version} - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common @@ -73,5 +62,4 @@ - diff --git a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java b/test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/FtpService.java similarity index 100% rename from test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java rename to test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/FtpService.java diff --git a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java b/test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java rename to test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java diff --git a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java b/test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java similarity index 100% rename from test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java rename to test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java diff --git a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpsEmbeddedService.java b/test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/embedded/FtpsEmbeddedService.java similarity index 100% rename from test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpsEmbeddedService.java rename to test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/embedded/FtpsEmbeddedService.java diff --git a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java b/test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java similarity index 100% rename from test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java rename to test-infra/camel-test-infra-ftp/src/main/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java diff --git a/test-infra/camel-test-infra-google-pubsub/pom.xml b/test-infra/camel-test-infra-google-pubsub/pom.xml index b5d1e7505cd4a..1a927be8d63bc 100644 --- a/test-infra/camel-test-infra-google-pubsub/pom.xml +++ b/test-infra/camel-test-infra-google-pubsub/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-google-pubsub Camel :: Test Infra :: Google Pub/Sub - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubService.java b/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubService.java similarity index 100% rename from test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubService.java rename to test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubService.java diff --git a/test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubServiceFactory.java b/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubServiceFactory.java rename to test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubServiceFactory.java diff --git a/test-infra/camel-test-infra-hashicorp-vault/pom.xml b/test-infra/camel-test-infra-hashicorp-vault/pom.xml index b4cdded71e43f..f6172fa27fadb 100644 --- a/test-infra/camel-test-infra-hashicorp-vault/pom.xml +++ b/test-infra/camel-test-infra-hashicorp-vault/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-hashicorp-vault Camel :: Test Infra :: Hashicorp Vault - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpServiceFactory.java b/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpServiceFactory.java rename to test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpServiceFactory.java diff --git a/test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultService.java b/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultService.java similarity index 100% rename from test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultService.java rename to test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultService.java diff --git a/test-infra/camel-test-infra-hazelcast/pom.xml b/test-infra/camel-test-infra-hazelcast/pom.xml index 5f3eb6f7a68d4..80e7f1c95c361 100644 --- a/test-infra/camel-test-infra-hazelcast/pom.xml +++ b/test-infra/camel-test-infra-hazelcast/pom.xml @@ -30,17 +30,7 @@ camel-test-infra-hazelcast Camel :: Test Infra :: Hazelcast - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common diff --git a/test-infra/camel-test-infra-hazelcast/src/test/java/org/apache/camel/test/infra/hazelcast/services/HazelcastService.java b/test-infra/camel-test-infra-hazelcast/src/main/java/org/apache/camel/test/infra/hazelcast/services/HazelcastService.java similarity index 100% rename from test-infra/camel-test-infra-hazelcast/src/test/java/org/apache/camel/test/infra/hazelcast/services/HazelcastService.java rename to test-infra/camel-test-infra-hazelcast/src/main/java/org/apache/camel/test/infra/hazelcast/services/HazelcastService.java diff --git a/test-infra/camel-test-infra-hazelcast/src/test/java/org/apache/camel/test/infra/hazelcast/services/HazelcastServiceFactory.java b/test-infra/camel-test-infra-hazelcast/src/main/java/org/apache/camel/test/infra/hazelcast/services/HazelcastServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-hazelcast/src/test/java/org/apache/camel/test/infra/hazelcast/services/HazelcastServiceFactory.java rename to test-infra/camel-test-infra-hazelcast/src/main/java/org/apache/camel/test/infra/hazelcast/services/HazelcastServiceFactory.java diff --git a/test-infra/camel-test-infra-hivemq/pom.xml b/test-infra/camel-test-infra-hivemq/pom.xml index 6ff41c1ea1c66..a24faa88636a7 100644 --- a/test-infra/camel-test-infra-hivemq/pom.xml +++ b/test-infra/camel-test-infra-hivemq/pom.xml @@ -31,27 +31,11 @@ Camel :: Test Infra :: HiveMQ HiveMQ test infrastructure for Camel - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/HiveMQService.java b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/HiveMQService.java similarity index 100% rename from test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/HiveMQService.java rename to test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/HiveMQService.java diff --git a/test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/HiveMQServiceFactory.java b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/HiveMQServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/HiveMQServiceFactory.java rename to test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/HiveMQServiceFactory.java diff --git a/test-infra/camel-test-infra-ibmmq/pom.xml b/test-infra/camel-test-infra-ibmmq/pom.xml index ca2a86fe7428d..f33b83e85d743 100644 --- a/test-infra/camel-test-infra-ibmmq/pom.xml +++ b/test-infra/camel-test-infra-ibmmq/pom.xml @@ -29,28 +29,11 @@ camel-test-infra-ibmmq Camel :: Test Infra :: IBM MQ - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.apache.camel - camel-test-infra-messaging-common - ${project.version} - test-jar org.apache.camel @@ -63,12 +46,6 @@ com.ibm.mq.jakarta.client ${com-ibm-mq-jakarta-client-version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - diff --git a/test-infra/camel-test-infra-ibmmq/src/test/java/org/apache/camel/test/infra/ibmmq/services/IbmMQService.java b/test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQService.java similarity index 100% rename from test-infra/camel-test-infra-ibmmq/src/test/java/org/apache/camel/test/infra/ibmmq/services/IbmMQService.java rename to test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQService.java diff --git a/test-infra/camel-test-infra-ibmmq/src/test/java/org/apache/camel/test/infra/ibmmq/services/IbmMQServiceFactory.java b/test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-ibmmq/src/test/java/org/apache/camel/test/infra/ibmmq/services/IbmMQServiceFactory.java rename to test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQServiceFactory.java diff --git a/test-infra/camel-test-infra-iggy/pom.xml b/test-infra/camel-test-infra-iggy/pom.xml index 917c4f3580406..74d9aa0208d4d 100644 --- a/test-infra/camel-test-infra-iggy/pom.xml +++ b/test-infra/camel-test-infra-iggy/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-iggy Camel :: Test Infra :: Iggy - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-iggy/src/test/java/org/apache/camel/test/infra/iggy/services/IggyService.java b/test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyService.java similarity index 100% rename from test-infra/camel-test-infra-iggy/src/test/java/org/apache/camel/test/infra/iggy/services/IggyService.java rename to test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyService.java diff --git a/test-infra/camel-test-infra-iggy/src/test/java/org/apache/camel/test/infra/iggy/services/IggyServiceFactory.java b/test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-iggy/src/test/java/org/apache/camel/test/infra/iggy/services/IggyServiceFactory.java rename to test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyServiceFactory.java diff --git a/test-infra/camel-test-infra-ignite/pom.xml b/test-infra/camel-test-infra-ignite/pom.xml index c89c7ec2b3481..782df96a8f9b8 100644 --- a/test-infra/camel-test-infra-ignite/pom.xml +++ b/test-infra/camel-test-infra-ignite/pom.xml @@ -30,17 +30,7 @@ camel-test-infra-ignite Camel :: Test Infra :: Ignite - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common diff --git a/test-infra/camel-test-infra-ignite/src/test/java/org/apache/camel/test/infra/ignite/services/IgniteService.java b/test-infra/camel-test-infra-ignite/src/main/java/org/apache/camel/test/infra/ignite/services/IgniteService.java similarity index 100% rename from test-infra/camel-test-infra-ignite/src/test/java/org/apache/camel/test/infra/ignite/services/IgniteService.java rename to test-infra/camel-test-infra-ignite/src/main/java/org/apache/camel/test/infra/ignite/services/IgniteService.java diff --git a/test-infra/camel-test-infra-ignite/src/test/java/org/apache/camel/test/infra/ignite/services/IgniteServiceFactory.java b/test-infra/camel-test-infra-ignite/src/main/java/org/apache/camel/test/infra/ignite/services/IgniteServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-ignite/src/test/java/org/apache/camel/test/infra/ignite/services/IgniteServiceFactory.java rename to test-infra/camel-test-infra-ignite/src/main/java/org/apache/camel/test/infra/ignite/services/IgniteServiceFactory.java diff --git a/test-infra/camel-test-infra-infinispan/pom.xml b/test-infra/camel-test-infra-infinispan/pom.xml index ea80271c114e3..7661b24246537 100644 --- a/test-infra/camel-test-infra-infinispan/pom.xml +++ b/test-infra/camel-test-infra-infinispan/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-infinispan Camel :: Test Infra :: Infinispan - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanService.java b/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanService.java similarity index 100% rename from test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanService.java rename to test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanService.java diff --git a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanServiceFactory.java b/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanServiceFactory.java rename to test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanServiceFactory.java diff --git a/test-infra/camel-test-infra-jdbc/pom.xml b/test-infra/camel-test-infra-jdbc/pom.xml index 298f7b52c4d27..0692fe0ac6f1e 100644 --- a/test-infra/camel-test-infra-jdbc/pom.xml +++ b/test-infra/camel-test-infra-jdbc/pom.xml @@ -34,18 +34,6 @@ org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/common/JDBCProperties.java b/test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/common/JDBCProperties.java similarity index 100% rename from test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/common/JDBCProperties.java rename to test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/common/JDBCProperties.java diff --git a/test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCLocalContainerService.java b/test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCLocalContainerService.java rename to test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCLocalContainerService.java diff --git a/test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCRemoteService.java b/test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCRemoteService.java similarity index 100% rename from test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCRemoteService.java rename to test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCRemoteService.java diff --git a/test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCService.java b/test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCService.java similarity index 100% rename from test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCService.java rename to test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCService.java diff --git a/test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceBuilder.java b/test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceBuilder.java similarity index 100% rename from test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceBuilder.java rename to test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceBuilder.java diff --git a/test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceFactory.java b/test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-jdbc/src/test/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceFactory.java rename to test-infra/camel-test-infra-jdbc/src/main/java/org/apache/camel/test/infra/jdbc/services/JDBCServiceFactory.java diff --git a/test-infra/camel-test-infra-jetty/pom.xml b/test-infra/camel-test-infra-jetty/pom.xml index 97cdddb890dfd..606b1fdcfb57f 100644 --- a/test-infra/camel-test-infra-jetty/pom.xml +++ b/test-infra/camel-test-infra-jetty/pom.xml @@ -40,12 +40,6 @@ camel-test-infra-common ${project.version} - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel @@ -88,5 +82,4 @@ - diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java b/test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java similarity index 100% rename from test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java rename to test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java b/test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java similarity index 100% rename from test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java rename to test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java b/test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java similarity index 100% rename from test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java rename to test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java b/test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java similarity index 100% rename from test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java rename to test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyService.java b/test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyService.java similarity index 100% rename from test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyService.java rename to test-infra/camel-test-infra-jetty/src/main/java/org/apache/camel/test/infra/jetty/services/JettyService.java diff --git a/test-infra/camel-test-infra-kafka/pom.xml b/test-infra/camel-test-infra-kafka/pom.xml index 94b47b37ca8e9..f89a0beeedb7d 100644 --- a/test-infra/camel-test-infra-kafka/pom.xml +++ b/test-infra/camel-test-infra-kafka/pom.xml @@ -31,27 +31,11 @@ Camel :: Test Infra :: Kafka Kafka test infrastructure for Camel - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java similarity index 100% rename from test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java rename to test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaService.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/KafkaService.java similarity index 100% rename from test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaService.java rename to test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/KafkaService.java diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java rename to test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java diff --git a/test-infra/camel-test-infra-keycloak/pom.xml b/test-infra/camel-test-infra-keycloak/pom.xml index 47739f06ec7e1..2a2cd35405f36 100644 --- a/test-infra/camel-test-infra-keycloak/pom.xml +++ b/test-infra/camel-test-infra-keycloak/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-keycloak Camel :: Test Infra :: Keycloak - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.keycloak keycloak-admin-client @@ -72,5 +56,4 @@ - diff --git a/test-infra/camel-test-infra-keycloak/src/test/java/org/apache/camel/test/infra/keycloak/KeycloakInfraServiceTest.java b/test-infra/camel-test-infra-keycloak/src/main/java/org/apache/camel/test/infra/keycloak/KeycloakInfraServiceTest.java similarity index 100% rename from test-infra/camel-test-infra-keycloak/src/test/java/org/apache/camel/test/infra/keycloak/KeycloakInfraServiceTest.java rename to test-infra/camel-test-infra-keycloak/src/main/java/org/apache/camel/test/infra/keycloak/KeycloakInfraServiceTest.java diff --git a/test-infra/camel-test-infra-keycloak/src/test/java/org/apache/camel/test/infra/keycloak/services/KeycloakService.java b/test-infra/camel-test-infra-keycloak/src/main/java/org/apache/camel/test/infra/keycloak/services/KeycloakService.java similarity index 100% rename from test-infra/camel-test-infra-keycloak/src/test/java/org/apache/camel/test/infra/keycloak/services/KeycloakService.java rename to test-infra/camel-test-infra-keycloak/src/main/java/org/apache/camel/test/infra/keycloak/services/KeycloakService.java diff --git a/test-infra/camel-test-infra-keycloak/src/test/java/org/apache/camel/test/infra/keycloak/services/KeycloakServiceFactory.java b/test-infra/camel-test-infra-keycloak/src/main/java/org/apache/camel/test/infra/keycloak/services/KeycloakServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-keycloak/src/test/java/org/apache/camel/test/infra/keycloak/services/KeycloakServiceFactory.java rename to test-infra/camel-test-infra-keycloak/src/main/java/org/apache/camel/test/infra/keycloak/services/KeycloakServiceFactory.java diff --git a/test-infra/camel-test-infra-keycloak/src/test/resources/log4j2.properties b/test-infra/camel-test-infra-keycloak/src/test/resources/log4j2.properties deleted file mode 100644 index 61a8d6a56a2ab..0000000000000 --- a/test-infra/camel-test-infra-keycloak/src/test/resources/log4j2.properties +++ /dev/null @@ -1,28 +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. -## --------------------------------------------------------------------------- -appender.file.type = File -appender.file.name = file -appender.file.fileName = target/camel-test-infra-keycloak-test.log -appender.file.layout.type = PatternLayout -appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -appender.out.type = Console -appender.out.name = out -appender.out.layout.type = PatternLayout -appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n - -rootLogger.level = INFO -rootLogger.appenderRef.file.ref = file \ No newline at end of file diff --git a/test-infra/camel-test-infra-messaging-common/pom.xml b/test-infra/camel-test-infra-messaging-common/pom.xml index 583d03ad7798f..33b826131910b 100644 --- a/test-infra/camel-test-infra-messaging-common/pom.xml +++ b/test-infra/camel-test-infra-messaging-common/pom.xml @@ -29,27 +29,11 @@ Camel :: Test Infra :: Messaging Common camel-test-infra-messaging-common - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-messaging-common/src/test/java/org/apache/camel/test/infra/messaging/services/MessagingService.java b/test-infra/camel-test-infra-messaging-common/src/main/java/org/apache/camel/test/infra/messaging/services/MessagingService.java similarity index 100% rename from test-infra/camel-test-infra-messaging-common/src/test/java/org/apache/camel/test/infra/messaging/services/MessagingService.java rename to test-infra/camel-test-infra-messaging-common/src/main/java/org/apache/camel/test/infra/messaging/services/MessagingService.java diff --git a/test-infra/camel-test-infra-messaging-common/src/test/java/org/apache/camel/test/infra/messaging/services/MessagingServiceFactory.java b/test-infra/camel-test-infra-messaging-common/src/main/java/org/apache/camel/test/infra/messaging/services/MessagingServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-messaging-common/src/test/java/org/apache/camel/test/infra/messaging/services/MessagingServiceFactory.java rename to test-infra/camel-test-infra-messaging-common/src/main/java/org/apache/camel/test/infra/messaging/services/MessagingServiceFactory.java diff --git a/test-infra/camel-test-infra-microprofile-lra/pom.xml b/test-infra/camel-test-infra-microprofile-lra/pom.xml index ea827d584db06..f07b1e3579075 100644 --- a/test-infra/camel-test-infra-microprofile-lra/pom.xml +++ b/test-infra/camel-test-infra-microprofile-lra/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-microprofile-lra Camel :: Test Infra :: Microprofile LRA - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-microprofile-lra/src/test/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAService.java b/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAService.java similarity index 100% rename from test-infra/camel-test-infra-microprofile-lra/src/test/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAService.java rename to test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAService.java diff --git a/test-infra/camel-test-infra-microprofile-lra/src/test/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAServiceFactory.java b/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-microprofile-lra/src/test/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAServiceFactory.java rename to test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRAServiceFactory.java diff --git a/test-infra/camel-test-infra-milvus/pom.xml b/test-infra/camel-test-infra-milvus/pom.xml index 92fbfca98d703..094ebcde52a9c 100644 --- a/test-infra/camel-test-infra-milvus/pom.xml +++ b/test-infra/camel-test-infra-milvus/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-milvus Camel :: Test Infra :: Milvus - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-milvus @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusService.java b/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusService.java similarity index 100% rename from test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusService.java rename to test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusService.java diff --git a/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusServiceFactory.java b/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusServiceFactory.java rename to test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusServiceFactory.java diff --git a/test-infra/camel-test-infra-minio/pom.xml b/test-infra/camel-test-infra-minio/pom.xml index 191edd52178bc..ab9480fad3dac 100644 --- a/test-infra/camel-test-infra-minio/pom.xml +++ b/test-infra/camel-test-infra-minio/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-minio Camel :: Test Infra :: Minio - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioService.java b/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioService.java similarity index 100% rename from test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioService.java rename to test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioService.java diff --git a/test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioServiceFactory.java b/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioServiceFactory.java rename to test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioServiceFactory.java diff --git a/test-infra/camel-test-infra-mongodb/pom.xml b/test-infra/camel-test-infra-mongodb/pom.xml index 45186bf9c85ff..be3a651d2c57e 100644 --- a/test-infra/camel-test-infra-mongodb/pom.xml +++ b/test-infra/camel-test-infra-mongodb/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-mongodb Camel :: Test Infra :: MongoDB - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java rename to test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java diff --git a/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBService.java b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBService.java similarity index 100% rename from test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBService.java rename to test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBService.java diff --git a/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBServiceFactory.java b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBServiceFactory.java rename to test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBServiceFactory.java diff --git a/test-infra/camel-test-infra-mosquitto/pom.xml b/test-infra/camel-test-infra-mosquitto/pom.xml index 91328dfc45f3d..a6a392e330641 100644 --- a/test-infra/camel-test-infra-mosquitto/pom.xml +++ b/test-infra/camel-test-infra-mosquitto/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-mosquitto Camel :: Test Infra :: Mosquitto - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerService.java b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerService.java rename to test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerService.java diff --git a/test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoRemoteService.java b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoRemoteService.java similarity index 100% rename from test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoRemoteService.java rename to test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoRemoteService.java diff --git a/test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoService.java b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoService.java similarity index 100% rename from test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoService.java rename to test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoService.java diff --git a/test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoServiceFactory.java b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-mosquitto/src/test/java/org/apache/camel/test/infra/mosquitto/services/MosquittoServiceFactory.java rename to test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoServiceFactory.java diff --git a/test-infra/camel-test-infra-nats/pom.xml b/test-infra/camel-test-infra-nats/pom.xml index 9d5f37c3bba8a..896c8a0f18aa5 100644 --- a/test-infra/camel-test-infra-nats/pom.xml +++ b/test-infra/camel-test-infra-nats/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-nats Camel :: Test Infra :: Nats - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthService.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthService.java similarity index 100% rename from test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthService.java rename to test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthService.java diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthTokenService.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthTokenService.java similarity index 100% rename from test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthTokenService.java rename to test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerAuthTokenService.java diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java rename to test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerTLSAuthService.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerTLSAuthService.java similarity index 100% rename from test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerTLSAuthService.java rename to test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerTLSAuthService.java diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsService.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsService.java similarity index 100% rename from test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsService.java rename to test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsService.java diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsServiceFactory.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsServiceFactory.java rename to test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsServiceFactory.java diff --git a/test-infra/camel-test-infra-neo4j/pom.xml b/test-infra/camel-test-infra-neo4j/pom.xml index 714c68fb4fc59..aeca0cf82b568 100644 --- a/test-infra/camel-test-infra-neo4j/pom.xml +++ b/test-infra/camel-test-infra-neo4j/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-neo4j Camel :: Test Infra :: Neo4j - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-neo4j @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-neo4j/src/test/java/org/apache/camel/test/infra/neo4j/services/Neo4jService.java b/test-infra/camel-test-infra-neo4j/src/main/java/org/apache/camel/test/infra/neo4j/services/Neo4jService.java similarity index 100% rename from test-infra/camel-test-infra-neo4j/src/test/java/org/apache/camel/test/infra/neo4j/services/Neo4jService.java rename to test-infra/camel-test-infra-neo4j/src/main/java/org/apache/camel/test/infra/neo4j/services/Neo4jService.java diff --git a/test-infra/camel-test-infra-neo4j/src/test/java/org/apache/camel/test/infra/neo4j/services/Neo4jServiceFactory.java b/test-infra/camel-test-infra-neo4j/src/main/java/org/apache/camel/test/infra/neo4j/services/Neo4jServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-neo4j/src/test/java/org/apache/camel/test/infra/neo4j/services/Neo4jServiceFactory.java rename to test-infra/camel-test-infra-neo4j/src/main/java/org/apache/camel/test/infra/neo4j/services/Neo4jServiceFactory.java diff --git a/test-infra/camel-test-infra-ollama/pom.xml b/test-infra/camel-test-infra-ollama/pom.xml index 6834972db0c27..33dac15887919 100644 --- a/test-infra/camel-test-infra-ollama/pom.xml +++ b/test-infra/camel-test-infra-ollama/pom.xml @@ -30,17 +30,7 @@ camel-test-infra-ollama Camel :: Test Infra :: Ollama - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common @@ -51,13 +41,6 @@ commons-lang3 - - org.testcontainers - testcontainers - ${testcontainers-version} - - - org.testcontainers testcontainers-ollama diff --git a/test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerService.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerService.java rename to test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerService.java diff --git a/test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaLocalHostService.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalHostService.java similarity index 100% rename from test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaLocalHostService.java rename to test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalHostService.java diff --git a/test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaRemoteService.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaRemoteService.java similarity index 100% rename from test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaRemoteService.java rename to test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaRemoteService.java diff --git a/test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaService.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaService.java similarity index 100% rename from test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaService.java rename to test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaService.java diff --git a/test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaServiceFactory.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OllamaServiceFactory.java rename to test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaServiceFactory.java diff --git a/test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OpenAIService.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OpenAIService.java similarity index 100% rename from test-infra/camel-test-infra-ollama/src/test/java/org/apache/camel/test/infra/ollama/services/OpenAIService.java rename to test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OpenAIService.java diff --git a/test-infra/camel-test-infra-openai-mock/pom.xml b/test-infra/camel-test-infra-openai-mock/pom.xml index 5257bbd1a5ef6..1a461194af5ff 100644 --- a/test-infra/camel-test-infra-openai-mock/pom.xml +++ b/test-infra/camel-test-infra-openai-mock/pom.xml @@ -29,17 +29,7 @@ camel-test-infra-openai-mock Camel :: Test Infra :: OpenAI Mock - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockConversationHistoryTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockConversationHistoryTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockConversationHistoryTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockConversationHistoryTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockEmbeddingTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockEmbeddingTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockEmbeddingTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockEmbeddingTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockFailuresTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockFailuresTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockFailuresTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockFailuresTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockMultipleToolsTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockMultipleToolsTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockMultipleToolsTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockMultipleToolsTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithAfterToolTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithAfterToolTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithAfterToolTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithAfterToolTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithToolContentTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithToolContentTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithToolContentTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockReplyWithToolContentTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockSimpleAssertionTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockSimpleAssertionTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockSimpleAssertionTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockSimpleAssertionTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockTest.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockTest.java similarity index 100% rename from test-infra/camel-test-infra-openai-mock/src/test/java/org/apache/camel/test/infra/openai/mock/OpenAIMockTest.java rename to test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/OpenAIMockTest.java diff --git a/test-infra/camel-test-infra-openai-mock/src/test/resources/log4j2.properties b/test-infra/camel-test-infra-openai-mock/src/test/resources/log4j2.properties deleted file mode 100644 index fe43ebf00060b..0000000000000 --- a/test-infra/camel-test-infra-openai-mock/src/test/resources/log4j2.properties +++ /dev/null @@ -1,28 +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. -## --------------------------------------------------------------------------- -appender.file.type = File -appender.file.name = file -appender.file.fileName = target/camel-test-infra-openapi-mock-test.log -appender.file.layout.type = PatternLayout -appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n -appender.out.type = Console -appender.out.name = out -appender.out.layout.type = PatternLayout -appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n - -rootLogger.level = INFO -rootLogger.appenderRef.file.ref = file \ No newline at end of file diff --git a/test-infra/camel-test-infra-openldap/pom.xml b/test-infra/camel-test-infra-openldap/pom.xml index bf3651cc6ee17..2c25fbf1b7ace 100644 --- a/test-infra/camel-test-infra-openldap/pom.xml +++ b/test-infra/camel-test-infra-openldap/pom.xml @@ -29,27 +29,11 @@ camel-test-infra-openldap Camel :: Test Infra :: Openladp - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapService.java b/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapService.java similarity index 100% rename from test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapService.java rename to test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapService.java diff --git a/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapServiceFactory.java b/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapServiceFactory.java rename to test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapServiceFactory.java diff --git a/test-infra/camel-test-infra-opensearch/pom.xml b/test-infra/camel-test-infra-opensearch/pom.xml index 1f5ef1dd684a1..a180eb16e8e0a 100644 --- a/test-infra/camel-test-infra-opensearch/pom.xml +++ b/test-infra/camel-test-infra-opensearch/pom.xml @@ -29,27 +29,11 @@ camel-test-infra-opensearch Camel :: Test Infra :: opensearch - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchService.java b/test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchService.java similarity index 100% rename from test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchService.java rename to test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchService.java diff --git a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchServiceFactory.java b/test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchServiceFactory.java rename to test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchServiceFactory.java diff --git a/test-infra/camel-test-infra-parent/pom.xml b/test-infra/camel-test-infra-parent/pom.xml index 6be3351ddb7fb..c6e3b5f724c25 100644 --- a/test-infra/camel-test-infra-parent/pom.xml +++ b/test-infra/camel-test-infra-parent/pom.xml @@ -31,55 +31,29 @@ Parent pom for the test infrastructure for Camel - + org.junit.jupiter junit-jupiter-api - test org.junit.jupiter junit-jupiter-engine - test org.junit.jupiter junit-jupiter-params - test org.testcontainers testcontainers ${testcontainers-version} - test org.testcontainers testcontainers-junit-jupiter ${testcontainers-version} - test - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - test-compile - - test-jar - - - - - - - diff --git a/test-infra/camel-test-infra-pinecone/pom.xml b/test-infra/camel-test-infra-pinecone/pom.xml index e68f554c404cf..7a9057447ac87 100644 --- a/test-infra/camel-test-infra-pinecone/pom.xml +++ b/test-infra/camel-test-infra-pinecone/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-pinecone Camel :: Test Infra :: Pinecone - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-pinecone @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-pinecone/src/test/java/org/apache/camel/test/infra/pinecone/services/PineconeService.java b/test-infra/camel-test-infra-pinecone/src/main/java/org/apache/camel/test/infra/pinecone/services/PineconeService.java similarity index 100% rename from test-infra/camel-test-infra-pinecone/src/test/java/org/apache/camel/test/infra/pinecone/services/PineconeService.java rename to test-infra/camel-test-infra-pinecone/src/main/java/org/apache/camel/test/infra/pinecone/services/PineconeService.java diff --git a/test-infra/camel-test-infra-pinecone/src/test/java/org/apache/camel/test/infra/pinecone/services/PineconeServiceFactory.java b/test-infra/camel-test-infra-pinecone/src/main/java/org/apache/camel/test/infra/pinecone/services/PineconeServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-pinecone/src/test/java/org/apache/camel/test/infra/pinecone/services/PineconeServiceFactory.java rename to test-infra/camel-test-infra-pinecone/src/main/java/org/apache/camel/test/infra/pinecone/services/PineconeServiceFactory.java diff --git a/test-infra/camel-test-infra-postgres/pom.xml b/test-infra/camel-test-infra-postgres/pom.xml index d48c89ea0b365..c0e2c950ee3e3 100644 --- a/test-infra/camel-test-infra-postgres/pom.xml +++ b/test-infra/camel-test-infra-postgres/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-postgres Camel :: Test Infra :: Postgres - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-postgresql @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java rename to test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java diff --git a/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresService.java b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresService.java similarity index 100% rename from test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresService.java rename to test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresService.java diff --git a/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresServiceFactory.java b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresServiceFactory.java rename to test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresServiceFactory.java diff --git a/test-infra/camel-test-infra-pulsar/pom.xml b/test-infra/camel-test-infra-pulsar/pom.xml index 7e33b437fe577..0fdaaa05c2f49 100644 --- a/test-infra/camel-test-infra-pulsar/pom.xml +++ b/test-infra/camel-test-infra-pulsar/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-pulsar Camel :: Test Infra :: Pulsar - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-pulsar @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarService.java b/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarService.java similarity index 100% rename from test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarService.java rename to test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarService.java diff --git a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarServiceFactory.java b/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarServiceFactory.java rename to test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarServiceFactory.java diff --git a/test-infra/camel-test-infra-qdrant/pom.xml b/test-infra/camel-test-infra-qdrant/pom.xml index 4497f187270b6..ef2ba4ecffdfc 100644 --- a/test-infra/camel-test-infra-qdrant/pom.xml +++ b/test-infra/camel-test-infra-qdrant/pom.xml @@ -31,27 +31,11 @@ Camel :: Test Infra :: qdrant Qdrant test infrastructure for Camel - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} org.testcontainers diff --git a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantService.java b/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantService.java similarity index 100% rename from test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantService.java rename to test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantService.java diff --git a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantServiceFactory.java b/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantServiceFactory.java rename to test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantServiceFactory.java diff --git a/test-infra/camel-test-infra-rabbitmq/pom.xml b/test-infra/camel-test-infra-rabbitmq/pom.xml index b7106cdd96765..cb57f98461075 100644 --- a/test-infra/camel-test-infra-rabbitmq/pom.xml +++ b/test-infra/camel-test-infra-rabbitmq/pom.xml @@ -29,26 +29,11 @@ camel-test-infra-rabbitmq Camel :: Test Infra :: RabbitMQ - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQService.java b/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQService.java similarity index 100% rename from test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQService.java rename to test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQService.java diff --git a/test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQServiceFactory.java b/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQServiceFactory.java rename to test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQServiceFactory.java diff --git a/test-infra/camel-test-infra-redis/pom.xml b/test-infra/camel-test-infra-redis/pom.xml index b84cc994641b8..34e6dea16e9f3 100644 --- a/test-infra/camel-test-infra-redis/pom.xml +++ b/test-infra/camel-test-infra-redis/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-redis Camel :: Test Infra :: Redis - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisService.java b/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisService.java similarity index 100% rename from test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisService.java rename to test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisService.java diff --git a/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisServiceFactory.java b/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisServiceFactory.java rename to test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisServiceFactory.java diff --git a/test-infra/camel-test-infra-rocketmq/pom.xml b/test-infra/camel-test-infra-rocketmq/pom.xml index e4dc8eb0e6a5a..a3208264a76a4 100644 --- a/test-infra/camel-test-infra-rocketmq/pom.xml +++ b/test-infra/camel-test-infra-rocketmq/pom.xml @@ -30,17 +30,7 @@ camel-test-infra-rocketmq Camel :: Test Infra :: RocketMQ - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common @@ -51,12 +41,6 @@ awaitility ${awaitility-version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java similarity index 100% rename from test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java rename to test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java diff --git a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java rename to test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java diff --git a/test-infra/camel-test-infra-smb/pom.xml b/test-infra/camel-test-infra-smb/pom.xml index f3d9d4247d20f..659aeacba7ab5 100644 --- a/test-infra/camel-test-infra-smb/pom.xml +++ b/test-infra/camel-test-infra-smb/pom.xml @@ -33,17 +33,7 @@ Camel :: Test Infra :: Server Message Block Server Message Block test infrastructure for Camel - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel @@ -51,17 +41,10 @@ ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.apache.camel camel-test-junit6 - \ No newline at end of file diff --git a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbService.java b/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbService.java similarity index 100% rename from test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbService.java rename to test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbService.java diff --git a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java b/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java rename to test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java diff --git a/test-infra/camel-test-infra-solr/pom.xml b/test-infra/camel-test-infra-solr/pom.xml index b490d9c92396c..d77b9c515e473 100644 --- a/test-infra/camel-test-infra-solr/pom.xml +++ b/test-infra/camel-test-infra-solr/pom.xml @@ -30,10 +30,6 @@ camel-test-infra-solr Camel :: Test Infra :: Solr - - false - - @@ -41,19 +37,6 @@ camel-test-infra-common ${project.version} - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - - - - org.testcontainers - testcontainers - ${testcontainers-version} - diff --git a/test-infra/camel-test-infra-solr/src/test/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerService.java b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-solr/src/test/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerService.java rename to test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerService.java diff --git a/test-infra/camel-test-infra-solr/src/test/java/org/apache/camel/test/infra/solr/services/SolrService.java b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrService.java similarity index 100% rename from test-infra/camel-test-infra-solr/src/test/java/org/apache/camel/test/infra/solr/services/SolrService.java rename to test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrService.java diff --git a/test-infra/camel-test-infra-solr/src/test/java/org/apache/camel/test/infra/solr/services/SolrServiceFactory.java b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-solr/src/test/java/org/apache/camel/test/infra/solr/services/SolrServiceFactory.java rename to test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrServiceFactory.java diff --git a/test-infra/camel-test-infra-tensorflow-serving/pom.xml b/test-infra/camel-test-infra-tensorflow-serving/pom.xml index dba9c074e7d86..c0c9a935f74ac 100644 --- a/test-infra/camel-test-infra-tensorflow-serving/pom.xml +++ b/test-infra/camel-test-infra-tensorflow-serving/pom.xml @@ -36,18 +36,6 @@ org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/common/TensorFlowServingProperties.java b/test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/common/TensorFlowServingProperties.java similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/common/TensorFlowServingProperties.java rename to test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/common/TensorFlowServingProperties.java diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingLocalContainerService.java b/test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingLocalContainerService.java similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingLocalContainerService.java rename to test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingLocalContainerService.java diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingRemoteService.java b/test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingRemoteService.java similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingRemoteService.java rename to test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingRemoteService.java diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingService.java b/test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingService.java similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingService.java rename to test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingService.java diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingServiceFactory.java b/test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingServiceFactory.java rename to test-infra/camel-test-infra-tensorflow-serving/src/main/java/org/apache/camel/test/infra/tensorflow/serving/services/TensorFlowServingServiceFactory.java diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties b/test-infra/camel-test-infra-tensorflow-serving/src/main/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties rename to test-infra/camel-test-infra-tensorflow-serving/src/main/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/assets/foo.txt b/test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/assets/foo.txt similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/assets/foo.txt rename to test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/assets/foo.txt diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/saved_model.pb b/test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/saved_model.pb similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/saved_model.pb rename to test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/saved_model.pb diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.data-00000-of-00001 b/test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.data-00000-of-00001 similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.data-00000-of-00001 rename to test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.data-00000-of-00001 diff --git a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.index b/test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.index similarity index 100% rename from test-infra/camel-test-infra-tensorflow-serving/src/test/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.index rename to test-infra/camel-test-infra-tensorflow-serving/src/main/resources/testdata/saved_model_half_plus_two_cpu/00000123/variables/variables.index diff --git a/test-infra/camel-test-infra-torchserve/pom.xml b/test-infra/camel-test-infra-torchserve/pom.xml index d95d7e69a556c..50500d537cb71 100644 --- a/test-infra/camel-test-infra-torchserve/pom.xml +++ b/test-infra/camel-test-infra-torchserve/pom.xml @@ -31,27 +31,11 @@ Camel :: Test Infra :: TorchServe TorchServe test infrastructure for Camel - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-torchserve/src/test/java/org/apache/camel/test/infra/torchserve/services/TorchServeService.java b/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeService.java similarity index 100% rename from test-infra/camel-test-infra-torchserve/src/test/java/org/apache/camel/test/infra/torchserve/services/TorchServeService.java rename to test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeService.java diff --git a/test-infra/camel-test-infra-torchserve/src/test/java/org/apache/camel/test/infra/torchserve/services/TorchServeServiceFactory.java b/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-torchserve/src/test/java/org/apache/camel/test/infra/torchserve/services/TorchServeServiceFactory.java rename to test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeServiceFactory.java diff --git a/test-infra/camel-test-infra-triton/pom.xml b/test-infra/camel-test-infra-triton/pom.xml index 4d3377f8e70c6..1821a42ce42ed 100644 --- a/test-infra/camel-test-infra-triton/pom.xml +++ b/test-infra/camel-test-infra-triton/pom.xml @@ -31,27 +31,11 @@ Camel :: Test Infra :: Triton Inference Server Triton Inference Server test infrastructure for Camel - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-triton/src/test/java/org/apache/camel/test/infra/triton/services/TritonService.java b/test-infra/camel-test-infra-triton/src/main/java/org/apache/camel/test/infra/triton/services/TritonService.java similarity index 100% rename from test-infra/camel-test-infra-triton/src/test/java/org/apache/camel/test/infra/triton/services/TritonService.java rename to test-infra/camel-test-infra-triton/src/main/java/org/apache/camel/test/infra/triton/services/TritonService.java diff --git a/test-infra/camel-test-infra-triton/src/test/java/org/apache/camel/test/infra/triton/services/TritonServiceFactory.java b/test-infra/camel-test-infra-triton/src/main/java/org/apache/camel/test/infra/triton/services/TritonServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-triton/src/test/java/org/apache/camel/test/infra/triton/services/TritonServiceFactory.java rename to test-infra/camel-test-infra-triton/src/main/java/org/apache/camel/test/infra/triton/services/TritonServiceFactory.java diff --git a/test-infra/camel-test-infra-weaviate/pom.xml b/test-infra/camel-test-infra-weaviate/pom.xml index 8fab368037370..0516929acaa04 100644 --- a/test-infra/camel-test-infra-weaviate/pom.xml +++ b/test-infra/camel-test-infra-weaviate/pom.xml @@ -30,29 +30,13 @@ camel-test-infra-weaviate Camel :: Test Infra :: Weaviate - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - org.testcontainers - testcontainers - ${testcontainers-version} - - org.testcontainers testcontainers-weaviate @@ -60,5 +44,4 @@ - diff --git a/test-infra/camel-test-infra-weaviate/src/test/java/org/apache/camel/test/infra/weaviate/services/WeaviateService.java b/test-infra/camel-test-infra-weaviate/src/main/java/org/apache/camel/test/infra/weaviate/services/WeaviateService.java similarity index 100% rename from test-infra/camel-test-infra-weaviate/src/test/java/org/apache/camel/test/infra/weaviate/services/WeaviateService.java rename to test-infra/camel-test-infra-weaviate/src/main/java/org/apache/camel/test/infra/weaviate/services/WeaviateService.java diff --git a/test-infra/camel-test-infra-weaviate/src/test/java/org/apache/camel/test/infra/weaviate/services/WeaviateServiceFactory.java b/test-infra/camel-test-infra-weaviate/src/main/java/org/apache/camel/test/infra/weaviate/services/WeaviateServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-weaviate/src/test/java/org/apache/camel/test/infra/weaviate/services/WeaviateServiceFactory.java rename to test-infra/camel-test-infra-weaviate/src/main/java/org/apache/camel/test/infra/weaviate/services/WeaviateServiceFactory.java diff --git a/test-infra/camel-test-infra-xmpp/pom.xml b/test-infra/camel-test-infra-xmpp/pom.xml index 962a9701ae6bf..bad6ddedf6afb 100644 --- a/test-infra/camel-test-infra-xmpp/pom.xml +++ b/test-infra/camel-test-infra-xmpp/pom.xml @@ -30,29 +30,12 @@ camel-test-infra-xmpp Camel :: Test Infra :: Xmpp - - false - - - - org.apache.camel - camel-test-infra-common - ${project.version} - test-jar - org.apache.camel camel-test-infra-common ${project.version} - - - org.testcontainers - testcontainers - ${testcontainers-version} - - diff --git a/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppService.java b/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppService.java similarity index 100% rename from test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppService.java rename to test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppService.java diff --git a/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServiceFactory.java b/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServiceFactory.java rename to test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppServiceFactory.java diff --git a/test-infra/camel-test-infra-zookeeper/pom.xml b/test-infra/camel-test-infra-zookeeper/pom.xml index 1df7172972d69..62be69704b63c 100644 --- a/test-infra/camel-test-infra-zookeeper/pom.xml +++ b/test-infra/camel-test-infra-zookeeper/pom.xml @@ -30,27 +30,11 @@ camel-test-infra-zookeeper Camel :: Test Infra :: ZooKeeper - - false - - org.apache.camel camel-test-infra-common ${project.version} - test-jar - - - org.apache.camel - camel-test-infra-common - ${project.version} - - - - org.testcontainers - testcontainers - ${testcontainers-version} diff --git a/test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperService.java b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperService.java similarity index 100% rename from test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperService.java rename to test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperService.java diff --git a/test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperServiceFactory.java b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperServiceFactory.java similarity index 100% rename from test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperServiceFactory.java rename to test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperServiceFactory.java diff --git a/test-infra/pom.xml b/test-infra/pom.xml index 8d8ca4d2f0107..a506707a54de9 100644 --- a/test-infra/pom.xml +++ b/test-infra/pom.xml @@ -34,7 +34,6 @@ true - true @@ -110,41 +109,5 @@ - - - - maven-assembly-plugin - - - - tests - - jar - - false - - - ${project.build.testOutputDirectory} - / - - - ${project.build.outputDirectory} - / - - - - - - - - create-archive - package - - single - - - - -