You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/02/22 12:29:21 UTC

[camel] 01/04: CAMEL-16115 - Remove Camel-AWS-* components - AWS-MQ

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 429e4e475ba2dffb9ee589ba621f5f3561deae98
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 22 13:12:02 2021 +0100

    CAMEL-16115 - Remove Camel-AWS-* components - AWS-MQ
---
 components/camel-aws-mq/pom.xml                    |  72 ------
 .../component/aws/mq/MQComponentConfigurer.java    | 113 ---------
 .../component/aws/mq/MQEndpointConfigurer.java     |  97 -------
 .../component/aws/mq/MQEndpointUriFactory.java     |  74 ------
 .../services/org/apache/camel/component.properties |   7 -
 .../services/org/apache/camel/component/aws-mq     |   2 -
 .../org/apache/camel/configurer/aws-mq-component   |   2 -
 .../org/apache/camel/configurer/aws-mq-endpoint    |   2 -
 .../org/apache/camel/urifactory/aws-mq-endpoint    |   2 -
 .../org/apache/camel/component/aws/mq/aws-mq.json  |  52 ----
 .../src/main/docs/aws-mq-component.adoc            | 187 --------------
 .../apache/camel/component/aws/mq/MQComponent.java |  81 ------
 .../aws/mq/MQComponentVerifierExtension.java       |  92 -------
 .../camel/component/aws/mq/MQConfiguration.java    | 165 ------------
 .../apache/camel/component/aws/mq/MQConstants.java |  34 ---
 .../apache/camel/component/aws/mq/MQEndpoint.java  | 125 ---------
 .../camel/component/aws/mq/MQOperations.java       |  27 --
 .../apache/camel/component/aws/mq/MQProducer.java  | 281 ---------------------
 .../camel/component/aws/mq/AmazonMQClientMock.java | 190 --------------
 .../aws/mq/MQComponentClientRegistryTest.java      |  70 -----
 .../aws/mq/MQComponentConfigurationTest.java       |  69 -----
 .../aws/mq/MQComponentVerifierExtensionTest.java   |  76 ------
 .../component/aws/mq/MQProducerSpringTest.java     | 175 -------------
 .../camel/component/aws/mq/MQProducerTest.java     | 201 ---------------
 .../src/test/resources/log4j2.properties           |  28 --
 .../aws/mq/MQComponentSpringTest-context.xml       |  60 -----
 components/pom.xml                                 |   1 -
 27 files changed, 2285 deletions(-)

diff --git a/components/camel-aws-mq/pom.xml b/components/camel-aws-mq/pom.xml
deleted file mode 100644
index 91059c1..0000000
--- a/components/camel-aws-mq/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>3.9.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-aws-mq</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Camel :: AWS MQ (deprecated)</name>
-    <description>A Camel Amazon MQ Web Service Component</description>
-
-    <properties>
-        <deprecatedSince>3.8.0</deprecatedSince>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-mq</artifactId>
-            <version>${aws-java-sdk-version}</version>
-        </dependency>
-
-        <!-- for testing -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core-catalog</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
deleted file mode 100644
index 3419d66..0000000
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.mq;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class MQComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    private org.apache.camel.component.aws.mq.MQConfiguration getOrCreateConfiguration(MQComponent target) {
-        if (target.getConfiguration() == null) {
-            target.setConfiguration(new org.apache.camel.component.aws.mq.MQConfiguration());
-        }
-        return target.getConfiguration();
-    }
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        MQComponent target = (MQComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": getOrCreateConfiguration(target).setAccessKey(property(camelContext, java.lang.String.class, value)); return true;
-        case "amazonmqclient":
-        case "amazonMqClient": getOrCreateConfiguration(target).setAmazonMqClient(property(camelContext, com.amazonaws.services.mq.AmazonMQ.class, value)); return true;
-        case "autodiscoverclient":
-        case "autoDiscoverClient": getOrCreateConfiguration(target).setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true;
-        case "autowiredenabled":
-        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
-        case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws.mq.MQConfiguration.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "operation": getOrCreateConfiguration(target).setOperation(property(camelContext, org.apache.camel.component.aws.mq.MQOperations.class, value)); return true;
-        case "proxyhost":
-        case "proxyHost": getOrCreateConfiguration(target).setProxyHost(property(camelContext, java.lang.String.class, value)); return true;
-        case "proxyport":
-        case "proxyPort": getOrCreateConfiguration(target).setProxyPort(property(camelContext, java.lang.Integer.class, value)); return true;
-        case "proxyprotocol":
-        case "proxyProtocol": getOrCreateConfiguration(target).setProxyProtocol(property(camelContext, com.amazonaws.Protocol.class, value)); return true;
-        case "region": getOrCreateConfiguration(target).setRegion(property(camelContext, java.lang.String.class, value)); return true;
-        case "secretkey":
-        case "secretKey": getOrCreateConfiguration(target).setSecretKey(property(camelContext, java.lang.String.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": return java.lang.String.class;
-        case "amazonmqclient":
-        case "amazonMqClient": return com.amazonaws.services.mq.AmazonMQ.class;
-        case "autodiscoverclient":
-        case "autoDiscoverClient": return boolean.class;
-        case "autowiredenabled":
-        case "autowiredEnabled": return boolean.class;
-        case "configuration": return org.apache.camel.component.aws.mq.MQConfiguration.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "operation": return org.apache.camel.component.aws.mq.MQOperations.class;
-        case "proxyhost":
-        case "proxyHost": return java.lang.String.class;
-        case "proxyport":
-        case "proxyPort": return java.lang.Integer.class;
-        case "proxyprotocol":
-        case "proxyProtocol": return com.amazonaws.Protocol.class;
-        case "region": return java.lang.String.class;
-        case "secretkey":
-        case "secretKey": return java.lang.String.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        MQComponent target = (MQComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": return getOrCreateConfiguration(target).getAccessKey();
-        case "amazonmqclient":
-        case "amazonMqClient": return getOrCreateConfiguration(target).getAmazonMqClient();
-        case "autodiscoverclient":
-        case "autoDiscoverClient": return getOrCreateConfiguration(target).isAutoDiscoverClient();
-        case "autowiredenabled":
-        case "autowiredEnabled": return target.isAutowiredEnabled();
-        case "configuration": return target.getConfiguration();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "operation": return getOrCreateConfiguration(target).getOperation();
-        case "proxyhost":
-        case "proxyHost": return getOrCreateConfiguration(target).getProxyHost();
-        case "proxyport":
-        case "proxyPort": return getOrCreateConfiguration(target).getProxyPort();
-        case "proxyprotocol":
-        case "proxyProtocol": return getOrCreateConfiguration(target).getProxyProtocol();
-        case "region": return getOrCreateConfiguration(target).getRegion();
-        case "secretkey":
-        case "secretKey": return getOrCreateConfiguration(target).getSecretKey();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
deleted file mode 100644
index 5b3d71c..0000000
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.mq;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class MQEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        MQEndpoint target = (MQEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": target.getConfiguration().setAccessKey(property(camelContext, java.lang.String.class, value)); return true;
-        case "amazonmqclient":
-        case "amazonMqClient": target.getConfiguration().setAmazonMqClient(property(camelContext, com.amazonaws.services.mq.AmazonMQ.class, value)); return true;
-        case "autodiscoverclient":
-        case "autoDiscoverClient": target.getConfiguration().setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "operation": target.getConfiguration().setOperation(property(camelContext, org.apache.camel.component.aws.mq.MQOperations.class, value)); return true;
-        case "proxyhost":
-        case "proxyHost": target.getConfiguration().setProxyHost(property(camelContext, java.lang.String.class, value)); return true;
-        case "proxyport":
-        case "proxyPort": target.getConfiguration().setProxyPort(property(camelContext, java.lang.Integer.class, value)); return true;
-        case "proxyprotocol":
-        case "proxyProtocol": target.getConfiguration().setProxyProtocol(property(camelContext, com.amazonaws.Protocol.class, value)); return true;
-        case "region": target.getConfiguration().setRegion(property(camelContext, java.lang.String.class, value)); return true;
-        case "secretkey":
-        case "secretKey": target.getConfiguration().setSecretKey(property(camelContext, java.lang.String.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": return java.lang.String.class;
-        case "amazonmqclient":
-        case "amazonMqClient": return com.amazonaws.services.mq.AmazonMQ.class;
-        case "autodiscoverclient":
-        case "autoDiscoverClient": return boolean.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "operation": return org.apache.camel.component.aws.mq.MQOperations.class;
-        case "proxyhost":
-        case "proxyHost": return java.lang.String.class;
-        case "proxyport":
-        case "proxyPort": return java.lang.Integer.class;
-        case "proxyprotocol":
-        case "proxyProtocol": return com.amazonaws.Protocol.class;
-        case "region": return java.lang.String.class;
-        case "secretkey":
-        case "secretKey": return java.lang.String.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        MQEndpoint target = (MQEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": return target.getConfiguration().getAccessKey();
-        case "amazonmqclient":
-        case "amazonMqClient": return target.getConfiguration().getAmazonMqClient();
-        case "autodiscoverclient":
-        case "autoDiscoverClient": return target.getConfiguration().isAutoDiscoverClient();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "operation": return target.getConfiguration().getOperation();
-        case "proxyhost":
-        case "proxyHost": return target.getConfiguration().getProxyHost();
-        case "proxyport":
-        case "proxyPort": return target.getConfiguration().getProxyPort();
-        case "proxyprotocol":
-        case "proxyProtocol": return target.getConfiguration().getProxyProtocol();
-        case "region": return target.getConfiguration().getRegion();
-        case "secretkey":
-        case "secretKey": return target.getConfiguration().getSecretKey();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
deleted file mode 100644
index b2527df..0000000
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.mq;
-
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.spi.EndpointUriFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class MQEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
-    private static final String BASE = ":label";
-
-    private static final Set<String> PROPERTY_NAMES;
-    private static final Set<String> SECRET_PROPERTY_NAMES;
-    static {
-        Set<String> props = new HashSet<>(11);
-        props.add("autoDiscoverClient");
-        props.add("amazonMqClient");
-        props.add("proxyPort");
-        props.add("lazyStartProducer");
-        props.add("proxyProtocol");
-        props.add("secretKey");
-        props.add("accessKey");
-        props.add("label");
-        props.add("region");
-        props.add("operation");
-        props.add("proxyHost");
-        PROPERTY_NAMES = Collections.unmodifiableSet(props);
-        Set<String> secretProps = new HashSet<>(2);
-        secretProps.add("secretKey");
-        secretProps.add("accessKey");
-        SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps);
-    }
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-mq".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(properties);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy, encode);
-        return uri;
-    }
-
-    @Override
-    public Set<String> propertyNames() {
-        return PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> secretPropertyNames() {
-        return SECRET_PROPERTY_NAMES;
-    }
-
-    @Override
-    public boolean isLenientProperties() {
-        return false;
-    }
-}
-
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index d293638..0000000
--- a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-components=aws-mq
-groupId=org.apache.camel
-artifactId=camel-aws-mq
-version=3.9.0-SNAPSHOT
-projectName=Camel :: AWS MQ (deprecated)
-projectDescription=A Camel Amazon MQ Web Service Component
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/component/aws-mq b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/component/aws-mq
deleted file mode 100644
index cfc9d2e..0000000
--- a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/component/aws-mq
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.mq.MQComponent
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-mq-component b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-mq-component
deleted file mode 100644
index f696c77..0000000
--- a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-mq-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.mq.MQComponentConfigurer
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-mq-endpoint b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-mq-endpoint
deleted file mode 100644
index 8986f96..0000000
--- a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-mq-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.mq.MQEndpointConfigurer
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-mq-endpoint b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-mq-endpoint
deleted file mode 100644
index 2ca60ea..0000000
--- a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-mq-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.mq.MQEndpointUriFactory
diff --git a/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json b/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json
deleted file mode 100644
index 4c65049..0000000
--- a/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "aws-mq",
-    "title": "AWS MQ",
-    "description": "Manage AWS MQ instances.",
-    "deprecated": true,
-    "deprecatedSince": "3.8.0",
-    "firstVersion": "2.21.0",
-    "label": "cloud,messaging",
-    "javaType": "org.apache.camel.component.aws.mq.MQComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-aws-mq",
-    "version": "3.9.0-SNAPSHOT",
-    "scheme": "aws-mq",
-    "extendsScheme": "",
-    "syntax": "aws-mq:label",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance [...]
-    "accessKey": { "kind": "property", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
-    "amazonMqClient": { "kind": "property", "displayName": "Amazon Mq Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.mq.AmazonMQ", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To use a existing configured AmazonMQClient as client" },
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.mq.MQConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The Component configuration" },
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
-    "operation": { "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.mq.MQOperations", "enum": [ "listBrokers", "createBroker", "deleteBroker", "rebootBroker", "updateBroker", "describeBroker" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField" [...]
-    "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the MQ client" },
-    "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the MQ client" },
-    "proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the MQ client" },
-    "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (fo [...]
-    "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" },
-    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-  },
-  "properties": {
-    "label": { "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Logical name" },
-    "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instanc [...]
-    "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
-    "amazonMqClient": { "kind": "parameter", "displayName": "Amazon Mq Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.mq.AmazonMQ", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To use a existing configured AmazonMQClient as client" },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
-    "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.mq.MQOperations", "enum": [ "listBrokers", "createBroker", "deleteBroker", "rebootBroker", "updateBroker", "describeBroker" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField [...]
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the MQ client" },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the MQ client" },
-    "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the MQ client" },
-    "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (f [...]
-    "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.mq.MQConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
-  }
-}
diff --git a/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc b/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
deleted file mode 100644
index 287a2a5..0000000
--- a/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
+++ /dev/null
@@ -1,187 +0,0 @@
-[[aws-mq-component]]
-= AWS MQ Component (deprecated)
-:docTitle: AWS MQ
-:artifactId: camel-aws-mq
-:description: Manage AWS MQ instances.
-:since: 2.21
-:supportLevel: Stable-deprecated
-:deprecated: *deprecated*
-:component-header: Only producer is supported
-include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/aws-mq.adoc[opts=optional]
-//Manually maintained attributes
-:group: AWS
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The MQ component supports create, run, start, stop and terminate
-https://aws.amazon.com/amazon-mq/[AWS MQ] instances.
-
-Prerequisites
-
-You must have a valid Amazon Web Services developer account, and be
-signed up to use Amazon MQ. More information is available at
-https://aws.amazon.com/amazon-mq/[Amazon MQ].
-
-== URI Format
-
-[source,java]
--------------------------
-aws-mq://label[?options]
--------------------------
-
-You can append query options to the URI in the following format,
-?options=value&option2=value&...
-
-== URI Options
-
-
-// component options: START
-The AWS MQ component supports 12 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | boolean
-| *accessKey* (producer) | Amazon AWS Access Key |  | String
-| *amazonMqClient* (producer) | To use a existing configured AmazonMQClient as client |  | AmazonMQ
-| *configuration* (producer) | The Component configuration |  | MQConfiguration
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *operation* (producer) | *Required* The operation to perform. It can be listBrokers,createBroker,deleteBroker. There are 6 enums and the value can be one of: listBrokers, createBroker, deleteBroker, rebootBroker, updateBroker, describeBroker |  | MQOperations
-| *proxyHost* (producer) | To define a proxy host when instantiating the MQ client |  | String
-| *proxyPort* (producer) | To define a proxy port when instantiating the MQ client |  | Integer
-| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the MQ client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol
-| *region* (producer) | The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() |  | String
-| *secretKey* (producer) | Amazon AWS Secret Key |  | String
-| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean
-|===
-// component options: END
-
-
-
-
-// endpoint options: START
-The AWS MQ endpoint is configured using URI syntax:
-
-----
-aws-mq:label
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *label* | *Required* Logical name |  | String
-|===
-
-
-=== Query Parameters (10 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | boolean
-| *accessKey* (producer) | Amazon AWS Access Key |  | String
-| *amazonMqClient* (producer) | To use a existing configured AmazonMQClient as client |  | AmazonMQ
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *operation* (producer) | *Required* The operation to perform. It can be listBrokers,createBroker,deleteBroker. There are 6 enums and the value can be one of: listBrokers, createBroker, deleteBroker, rebootBroker, updateBroker, describeBroker |  | MQOperations
-| *proxyHost* (producer) | To define a proxy host when instantiating the MQ client |  | String
-| *proxyPort* (producer) | To define a proxy port when instantiating the MQ client |  | Integer
-| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the MQ client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol
-| *region* (producer) | The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() |  | String
-| *secretKey* (producer) | Amazon AWS Secret Key |  | String
-|===
-// endpoint options: END
-
-
-
-
-Required MQ component options
-
-You have to provide the amazonMqClient in the
-Registry or your accessKey and secretKey to access
-the https://aws.amazon.com/amazon-mq/[Amazon MQ] service.
-
-== Usage
-
-=== Message headers evaluated by the MQ producer
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsMQMaxResults` |`String` |The number of results that must be retrieved from listBrokers operation
-
-|`CamelAwsMQBrokerName` |`String` |The broker name
-
-|`CamelAwsMQOperation` |`String` |The operation we want to perform
-
-|`CamelAwsMQBrokerId` |`String` |The broker id
-
-|`CamelAwsMQBrokerDeploymentMode` |`String` |The deployment mode for the broker in the createBroker operation
-
-|`CamelAwsMQBrokerInstanceType` |`String` |The instance type for the MQ machine in the createBroker operation
-
-|`CamelAwsMQBrokerEngine` |`String` |The Broker Engine for MQ. Default is ACTIVEMQ
-
-|`CamelAwsMQBrokerEngineVersion` |`String` |The Broker Engine Version for MQ. Currently you can choose between 5.15.6 and 5.15.0 of ACTIVEMQ
-
-|`CamelAwsMQBrokerUsers` |`List<User>` |The list of users for MQ
-
-|`CamelAwsMQBrokerPubliclyAccessible` |`Boolean` |If the MQ instance must be publicly available or not. Default is false.
-|=======================================================================
-
-=== MQ Producer operations
-
-Camel-AWS MQ component provides the following operation on the producer side:
-
-- listBrokers
-- createBroker
-- deleteBroker
-- rebootBroker
-- updateBroker
-- describeBroker
-
-== Producer Examples
-
-- listBrokers: this operation will list the available MQ Brokers in AWS
-
-[source,java]
---------------------------------------------------------------------------------
-from("direct:listBrokers")
-    .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=listBrokers")
---------------------------------------------------------------------------------
-
-== Automatic detection of AmazonMQ client in registry
-
-The component is capable of detecting the presence of an AmazonMQ bean into the registry.
-If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter.
-This may be really useful for smarter configuration of the endpoint.
-
-Dependencies
-
-Maven users will need to add the following dependency to their pom.xml.
-
-*pom.xml*
-
-[source,xml]
----------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-aws-mq</artifactId>
-    <version>${camel-version}</version>
-</dependency>
----------------------------------------
-
-where `$\{camel-version}` must be replaced by the actual version of Camel.
-
-
-include::camel-spring-boot::page$aws-mq-starter.adoc[]
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java
deleted file mode 100644
index 6ab62cf..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.Map;
-import java.util.Set;
-
-import com.amazonaws.services.mq.AmazonMQ;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-
-/**
- * For working with Amazon MQ.
- */
-@Component("aws-mq")
-public class MQComponent extends DefaultComponent {
-
-    @Metadata
-    private MQConfiguration configuration = new MQConfiguration();
-
-    public MQComponent() {
-        this(null);
-    }
-
-    public MQComponent(CamelContext context) {
-        super(context);
-
-        registerExtension(new MQComponentVerifierExtension());
-    }
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        MQConfiguration configuration = this.configuration != null ? this.configuration.copy() : new MQConfiguration();
-        MQEndpoint endpoint = new MQEndpoint(uri, this, configuration);
-        setProperties(endpoint, parameters);
-        if (endpoint.getConfiguration().isAutoDiscoverClient()) {
-            checkAndSetRegistryClient(configuration);
-        }
-        if (configuration.getAmazonMqClient() == null
-                && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
-            throw new IllegalArgumentException("amazonMQClient or accessKey and secretKey must be specified");
-        }
-
-        return endpoint;
-    }
-
-    public MQConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    /**
-     * The Component configuration
-     */
-    public void setConfiguration(MQConfiguration configuration) {
-        this.configuration = configuration;
-    }
-
-    private void checkAndSetRegistryClient(MQConfiguration configuration) {
-        Set<AmazonMQ> clients = getCamelContext().getRegistry().findByType(AmazonMQ.class);
-        if (clients.size() == 1) {
-            configuration.setAmazonMqClient(clients.stream().findFirst().get());
-        }
-    }
-}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java
deleted file mode 100644
index 626980c..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.Map;
-
-import com.amazonaws.SdkClientException;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.mq.AmazonMQ;
-import com.amazonaws.services.mq.AmazonMQClientBuilder;
-import com.amazonaws.services.mq.model.ListBrokersRequest;
-import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
-import org.apache.camel.component.extension.verifier.ResultBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
-public class MQComponentVerifierExtension extends DefaultComponentVerifierExtension {
-
-    public MQComponentVerifierExtension() {
-        this("aws-mq");
-    }
-
-    public MQComponentVerifierExtension(String scheme) {
-        super(scheme);
-    }
-
-    // *********************************
-    // Parameters validation
-    // *********************************
-
-    @Override
-    protected Result verifyParameters(Map<String, Object> parameters) {
-
-        ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS)
-                .error(ResultErrorHelper.requiresOption("accessKey", parameters))
-                .error(ResultErrorHelper.requiresOption("secretKey", parameters))
-                .error(ResultErrorHelper.requiresOption("region", parameters));
-
-        // Validate using the catalog
-
-        super.verifyParametersAgainstCatalog(builder, parameters);
-
-        return builder.build();
-    }
-
-    // *********************************
-    // Connectivity validation
-    // *********************************
-
-    @Override
-    protected Result verifyConnectivity(Map<String, Object> parameters) {
-        ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
-
-        try {
-            MQConfiguration configuration = setProperties(new MQConfiguration(), parameters);
-            AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
-            AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
-            AmazonMQ client = AmazonMQClientBuilder.standard().withCredentials(credentialsProvider)
-                    .withRegion(Regions.valueOf(configuration.getRegion())).build();
-            client.listBrokers(new ListBrokersRequest());
-        } catch (SdkClientException e) {
-            ResultErrorBuilder errorBuilder
-                    = ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, e.getMessage())
-                            .detail("aws_mq_exception_message", e.getMessage())
-                            .detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS, e.getClass().getName())
-                            .detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
-
-            builder.error(errorBuilder.build());
-        } catch (Exception e) {
-            builder.error(ResultErrorBuilder.withException(e).build());
-        }
-        return builder.build();
-    }
-}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
deleted file mode 100644
index 53a82e0..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import com.amazonaws.Protocol;
-import com.amazonaws.services.mq.AmazonMQ;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
-
-@UriParams
-public class MQConfiguration implements Cloneable {
-
-    @UriPath(description = "Logical name")
-    @Metadata(required = true)
-    private String label;
-    @UriParam(label = "producer")
-    private AmazonMQ amazonMqClient;
-    @UriParam(label = "producer", secret = true)
-    private String accessKey;
-    @UriParam(label = "producer", secret = true)
-    private String secretKey;
-    @UriParam(label = "producer")
-    @Metadata(required = true)
-    private MQOperations operation;
-    @UriParam(enums = "HTTP,HTTPS", defaultValue = "HTTPS")
-    private Protocol proxyProtocol = Protocol.HTTPS;
-    @UriParam(label = "producer")
-    private String proxyHost;
-    @UriParam(label = "producer")
-    private Integer proxyPort;
-    @UriParam
-    private String region;
-    @UriParam(label = "common", defaultValue = "true")
-    private boolean autoDiscoverClient = true;
-
-    public AmazonMQ getAmazonMqClient() {
-        return amazonMqClient;
-    }
-
-    /**
-     * To use a existing configured AmazonMQClient as client
-     */
-    public void setAmazonMqClient(AmazonMQ amazonMqClient) {
-        this.amazonMqClient = amazonMqClient;
-    }
-
-    public String getAccessKey() {
-        return accessKey;
-    }
-
-    /**
-     * Amazon AWS Access Key
-     */
-    public void setAccessKey(String accessKey) {
-        this.accessKey = accessKey;
-    }
-
-    public String getSecretKey() {
-        return secretKey;
-    }
-
-    /**
-     * Amazon AWS Secret Key
-     */
-    public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
-    }
-
-    public MQOperations getOperation() {
-        return operation;
-    }
-
-    /**
-     * The operation to perform. It can be listBrokers,createBroker,deleteBroker
-     */
-    public void setOperation(MQOperations operation) {
-        this.operation = operation;
-    }
-
-    public Protocol getProxyProtocol() {
-        return proxyProtocol;
-    }
-
-    /**
-     * To define a proxy protocol when instantiating the MQ client
-     */
-    public void setProxyProtocol(Protocol proxyProtocol) {
-        this.proxyProtocol = proxyProtocol;
-    }
-
-    public String getProxyHost() {
-        return proxyHost;
-    }
-
-    /**
-     * To define a proxy host when instantiating the MQ client
-     */
-    public void setProxyHost(String proxyHost) {
-        this.proxyHost = proxyHost;
-    }
-
-    public Integer getProxyPort() {
-        return proxyPort;
-    }
-
-    /**
-     * To define a proxy port when instantiating the MQ client
-     */
-    public void setProxyPort(Integer proxyPort) {
-        this.proxyPort = proxyPort;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * The region in which MQ client needs to work. When using this parameter, the configuration will expect the
-     * capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name()
-     */
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
-    public boolean isAutoDiscoverClient() {
-        return autoDiscoverClient;
-    }
-
-    /**
-     * Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry
-     * automatically otherwise it will skip that checking.
-     */
-    public void setAutoDiscoverClient(boolean autoDiscoverClient) {
-        this.autoDiscoverClient = autoDiscoverClient;
-    }
-
-    // *************************************************
-    //
-    // *************************************************
-
-    public MQConfiguration copy() {
-        try {
-            return (MQConfiguration) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeCamelException(e);
-        }
-    }
-}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java
deleted file mode 100644
index 51ae731..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-/**
- * Constants used in Camel AWS MQ module
- */
-public interface MQConstants {
-    String OPERATION = "CamelAwsMQOperation";
-    String MAX_RESULTS = "CamelAwsMQMaxResults";
-    String BROKER_NAME = "CamelAwsMQBrokerName";
-    String BROKER_ENGINE = "CamelAwsMQBrokerEngine";
-    String BROKER_ENGINE_VERSION = "CamelAwsMQBrokerEngineVersion";
-    String BROKER_ID = "CamelAwsMQBrokerID";
-    String CONFIGURATION_ID = "CamelAwsMQConfigurationID";
-    String BROKER_DEPLOYMENT_MODE = "CamelAwsMQBrokerDeploymentMode";
-    String BROKER_INSTANCE_TYPE = "CamelAwsMQBrokerInstanceType";
-    String BROKER_USERS = "CamelAwsMQBrokerUsers";
-    String BROKER_PUBLICLY_ACCESSIBLE = "CamelAwsMQBrokerPubliclyAccessible";
-}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
deleted file mode 100644
index 4454012..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.mq.AmazonMQ;
-import com.amazonaws.services.mq.AmazonMQClient;
-import com.amazonaws.services.mq.AmazonMQClientBuilder;
-import org.apache.camel.Category;
-import org.apache.camel.Component;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.support.ScheduledPollEndpoint;
-import org.apache.camel.util.ObjectHelper;
-
-/**
- * Manage AWS MQ instances.
- */
-@UriEndpoint(firstVersion = "2.21.0", scheme = "aws-mq", title = "AWS MQ", syntax = "aws-mq:label", producerOnly = true,
-             category = { Category.CLOUD, Category.MESSAGING })
-public class MQEndpoint extends ScheduledPollEndpoint {
-
-    private AmazonMQ mqClient;
-
-    @UriParam
-    private MQConfiguration configuration;
-
-    public MQEndpoint(String uri, Component component, MQConfiguration configuration) {
-        super(uri, component);
-        this.configuration = configuration;
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        return new MQProducer(this);
-    }
-
-    @Override
-    public void doStart() throws Exception {
-        super.doStart();
-
-        mqClient = configuration.getAmazonMqClient() != null
-                ? configuration.getAmazonMqClient() : (AmazonMQClient) createMQClient();
-    }
-
-    @Override
-    public void doStop() throws Exception {
-        if (ObjectHelper.isEmpty(configuration.getAmazonMqClient())) {
-            if (mqClient != null) {
-                mqClient.shutdown();
-            }
-        }
-        super.doStop();
-    }
-
-    public MQConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    public AmazonMQ getAmazonMqClient() {
-        return mqClient;
-    }
-
-    AmazonMQ createMQClient() {
-        AmazonMQ client = null;
-        ClientConfiguration clientConfiguration = null;
-        AmazonMQClientBuilder clientBuilder = null;
-        boolean isClientConfigFound = false;
-        if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
-            clientConfiguration = new ClientConfiguration();
-            clientConfiguration.setProxyProtocol(configuration.getProxyProtocol());
-            clientConfiguration.setProxyHost(configuration.getProxyHost());
-            clientConfiguration.setProxyPort(configuration.getProxyPort());
-            isClientConfigFound = true;
-        }
-        if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) {
-            AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
-            AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
-            if (isClientConfigFound) {
-                clientBuilder = AmazonMQClientBuilder.standard().withClientConfiguration(clientConfiguration)
-                        .withCredentials(credentialsProvider);
-            } else {
-                clientBuilder = AmazonMQClientBuilder.standard().withCredentials(credentialsProvider);
-            }
-        } else {
-            if (isClientConfigFound) {
-                clientBuilder = AmazonMQClientBuilder.standard();
-            } else {
-                clientBuilder = AmazonMQClientBuilder.standard().withClientConfiguration(clientConfiguration);
-            }
-        }
-        if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-            clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
-        }
-        client = clientBuilder.build();
-        return client;
-    }
-}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQOperations.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQOperations.java
deleted file mode 100644
index 9cabf28..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQOperations.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.component.aws.mq;
-
-public enum MQOperations {
-
-    listBrokers,
-    createBroker,
-    deleteBroker,
-    rebootBroker,
-    updateBroker,
-    describeBroker
-}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
deleted file mode 100644
index 141b130..0000000
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.List;
-
-import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.mq.AmazonMQ;
-import com.amazonaws.services.mq.model.ConfigurationId;
-import com.amazonaws.services.mq.model.CreateBrokerRequest;
-import com.amazonaws.services.mq.model.CreateBrokerResult;
-import com.amazonaws.services.mq.model.DeleteBrokerRequest;
-import com.amazonaws.services.mq.model.DeleteBrokerResult;
-import com.amazonaws.services.mq.model.DeploymentMode;
-import com.amazonaws.services.mq.model.DescribeBrokerRequest;
-import com.amazonaws.services.mq.model.DescribeBrokerResult;
-import com.amazonaws.services.mq.model.EngineType;
-import com.amazonaws.services.mq.model.ListBrokersRequest;
-import com.amazonaws.services.mq.model.ListBrokersResult;
-import com.amazonaws.services.mq.model.RebootBrokerRequest;
-import com.amazonaws.services.mq.model.RebootBrokerResult;
-import com.amazonaws.services.mq.model.UpdateBrokerRequest;
-import com.amazonaws.services.mq.model.UpdateBrokerResult;
-import com.amazonaws.services.mq.model.User;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.URISupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A Producer which sends messages to the Amazon MQ Service <a href="http://aws.amazon.com/mq/">AWS MQ</a>
- */
-public class MQProducer extends DefaultProducer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MQProducer.class);
-
-    private transient String mqProducerToString;
-
-    public MQProducer(Endpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange) throws Exception {
-        switch (determineOperation(exchange)) {
-            case listBrokers:
-                listBrokers(getEndpoint().getAmazonMqClient(), exchange);
-                break;
-            case createBroker:
-                createBroker(getEndpoint().getAmazonMqClient(), exchange);
-                break;
-            case deleteBroker:
-                deleteBroker(getEndpoint().getAmazonMqClient(), exchange);
-                break;
-            case rebootBroker:
-                rebootBroker(getEndpoint().getAmazonMqClient(), exchange);
-                break;
-            case updateBroker:
-                updateBroker(getEndpoint().getAmazonMqClient(), exchange);
-                break;
-            case describeBroker:
-                describeBroker(getEndpoint().getAmazonMqClient(), exchange);
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported operation");
-        }
-    }
-
-    private MQOperations determineOperation(Exchange exchange) {
-        MQOperations operation = exchange.getIn().getHeader(MQConstants.OPERATION, MQOperations.class);
-        if (operation == null) {
-            operation = getConfiguration().getOperation();
-        }
-        return operation;
-    }
-
-    protected MQConfiguration getConfiguration() {
-        return getEndpoint().getConfiguration();
-    }
-
-    @Override
-    public String toString() {
-        if (mqProducerToString == null) {
-            mqProducerToString = "MQProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
-        }
-        return mqProducerToString;
-    }
-
-    @Override
-    public MQEndpoint getEndpoint() {
-        return (MQEndpoint) super.getEndpoint();
-    }
-
-    private void listBrokers(AmazonMQ mqClient, Exchange exchange) {
-        ListBrokersRequest request = new ListBrokersRequest();
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.MAX_RESULTS))) {
-            int maxResults = exchange.getIn().getHeader(MQConstants.MAX_RESULTS, Integer.class);
-            request.withMaxResults(maxResults);
-        }
-        ListBrokersResult result;
-        try {
-            result = mqClient.listBrokers(request);
-        } catch (AmazonServiceException ase) {
-            LOG.trace("List Brokers command returned the error code {}", ase.getErrorCode());
-            throw ase;
-        }
-        Message message = getMessageForResponse(exchange);
-        message.setBody(result);
-    }
-
-    private void createBroker(AmazonMQ mqClient, Exchange exchange) {
-        String brokerName;
-        String brokerEngine;
-        String brokerEngineVersion;
-        String deploymentMode;
-        String instanceType;
-        Boolean publiclyAccessible;
-        List<User> users;
-        CreateBrokerRequest request = new CreateBrokerRequest();
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_NAME))) {
-            brokerName = exchange.getIn().getHeader(MQConstants.BROKER_NAME, String.class);
-            request.withBrokerName(brokerName);
-        } else {
-            throw new IllegalArgumentException("Broker Name must be specified");
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_ENGINE))) {
-            brokerEngine = exchange.getIn().getHeader(MQConstants.BROKER_ENGINE, String.class);
-            request.withEngineType(EngineType.fromValue(brokerEngine));
-        } else {
-            request.withEngineType(EngineType.ACTIVEMQ.name());
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_ENGINE_VERSION))) {
-            brokerEngineVersion = exchange.getIn().getHeader(MQConstants.BROKER_ENGINE_VERSION, String.class);
-            request.withEngineVersion(brokerEngineVersion);
-        } else {
-            throw new IllegalArgumentException("Broker Engine Version must be specified");
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_DEPLOYMENT_MODE))) {
-            deploymentMode = exchange.getIn().getHeader(MQConstants.BROKER_DEPLOYMENT_MODE, String.class);
-            request.withDeploymentMode(DeploymentMode.fromValue(deploymentMode));
-        } else {
-            throw new IllegalArgumentException("Deployment Mode must be specified");
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_INSTANCE_TYPE))) {
-            instanceType = exchange.getIn().getHeader(MQConstants.BROKER_INSTANCE_TYPE, String.class);
-            request.withHostInstanceType(instanceType);
-        } else {
-            throw new IllegalArgumentException("Instance Type must be specified");
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_USERS))) {
-            users = exchange.getIn().getHeader(MQConstants.BROKER_USERS, List.class);
-            request.withUsers(users);
-        } else {
-            throw new IllegalArgumentException("A Users list must be specified");
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE))) {
-            publiclyAccessible = exchange.getIn().getHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE, Boolean.class);
-            request.withPubliclyAccessible(publiclyAccessible);
-        } else {
-            request.withPubliclyAccessible(false);
-        }
-        CreateBrokerResult result;
-        try {
-            result = mqClient.createBroker(request);
-        } catch (AmazonServiceException ase) {
-            LOG.trace("Create Broker command returned the error code {}", ase.getErrorCode());
-            throw ase;
-        }
-        Message message = getMessageForResponse(exchange);
-        message.setBody(result);
-    }
-
-    private void deleteBroker(AmazonMQ mqClient, Exchange exchange) {
-        String brokerId;
-        DeleteBrokerRequest request = new DeleteBrokerRequest();
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_ID))) {
-            brokerId = exchange.getIn().getHeader(MQConstants.BROKER_ID, String.class);
-            request.withBrokerId(brokerId);
-        } else {
-            throw new IllegalArgumentException("Broker Name must be specified");
-        }
-        DeleteBrokerResult result;
-        try {
-            result = mqClient.deleteBroker(request);
-        } catch (AmazonServiceException ase) {
-            LOG.trace("Delete Broker command returned the error code {}", ase.getErrorCode());
-            throw ase;
-        }
-        Message message = getMessageForResponse(exchange);
-        message.setBody(result);
-    }
-
-    private void rebootBroker(AmazonMQ mqClient, Exchange exchange) {
-        String brokerId;
-        RebootBrokerRequest request = new RebootBrokerRequest();
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_ID))) {
-            brokerId = exchange.getIn().getHeader(MQConstants.BROKER_ID, String.class);
-            request.withBrokerId(brokerId);
-        } else {
-            throw new IllegalArgumentException("Broker Name must be specified");
-        }
-        RebootBrokerResult result;
-        try {
-            result = mqClient.rebootBroker(request);
-        } catch (AmazonServiceException ase) {
-            LOG.trace("Reboot Broker command returned the error code {}", ase.getErrorCode());
-            throw ase;
-        }
-        Message message = getMessageForResponse(exchange);
-        message.setBody(result);
-    }
-
-    private void updateBroker(AmazonMQ mqClient, Exchange exchange) {
-        String brokerId;
-        ConfigurationId configurationId;
-        UpdateBrokerRequest request = new UpdateBrokerRequest();
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_ID))) {
-            brokerId = exchange.getIn().getHeader(MQConstants.BROKER_ID, String.class);
-            request.withBrokerId(brokerId);
-        } else {
-            throw new IllegalArgumentException("Broker Name must be specified");
-        }
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.CONFIGURATION_ID))) {
-            configurationId = exchange.getIn().getHeader(MQConstants.CONFIGURATION_ID, ConfigurationId.class);
-            request.withConfiguration(configurationId);
-        } else {
-            throw new IllegalArgumentException("Broker Name must be specified");
-        }
-        UpdateBrokerResult result;
-        try {
-            result = mqClient.updateBroker(request);
-        } catch (AmazonServiceException ase) {
-            LOG.trace("Update Broker command returned the error code {}", ase.getErrorCode());
-            throw ase;
-        }
-        Message message = getMessageForResponse(exchange);
-        message.setBody(result);
-    }
-
-    private void describeBroker(AmazonMQ mqClient, Exchange exchange) {
-        String brokerId;
-        DescribeBrokerRequest request = new DescribeBrokerRequest();
-        if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_ID))) {
-            brokerId = exchange.getIn().getHeader(MQConstants.BROKER_ID, String.class);
-            request.withBrokerId(brokerId);
-        } else {
-            throw new IllegalArgumentException("Broker Name must be specified");
-        }
-        DescribeBrokerResult result;
-        try {
-            result = mqClient.describeBroker(request);
-        } catch (AmazonServiceException ase) {
-            LOG.trace("Reboot Broker command returned the error code {}", ase.getErrorCode());
-            throw ase;
-        }
-        Message message = getMessageForResponse(exchange);
-        message.setBody(result);
-    }
-
-    public static Message getMessageForResponse(final Exchange exchange) {
-        return exchange.getMessage();
-    }
-}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java
deleted file mode 100644
index 89c3c19..0000000
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.AmazonWebServiceRequest;
-import com.amazonaws.ResponseMetadata;
-import com.amazonaws.services.mq.AbstractAmazonMQ;
-import com.amazonaws.services.mq.model.BrokerState;
-import com.amazonaws.services.mq.model.BrokerSummary;
-import com.amazonaws.services.mq.model.ConfigurationId;
-import com.amazonaws.services.mq.model.CreateBrokerRequest;
-import com.amazonaws.services.mq.model.CreateBrokerResult;
-import com.amazonaws.services.mq.model.CreateConfigurationRequest;
-import com.amazonaws.services.mq.model.CreateConfigurationResult;
-import com.amazonaws.services.mq.model.CreateUserRequest;
-import com.amazonaws.services.mq.model.CreateUserResult;
-import com.amazonaws.services.mq.model.DeleteBrokerRequest;
-import com.amazonaws.services.mq.model.DeleteBrokerResult;
-import com.amazonaws.services.mq.model.DeleteUserRequest;
-import com.amazonaws.services.mq.model.DeleteUserResult;
-import com.amazonaws.services.mq.model.DescribeBrokerRequest;
-import com.amazonaws.services.mq.model.DescribeBrokerResult;
-import com.amazonaws.services.mq.model.DescribeConfigurationRequest;
-import com.amazonaws.services.mq.model.DescribeConfigurationResult;
-import com.amazonaws.services.mq.model.DescribeConfigurationRevisionRequest;
-import com.amazonaws.services.mq.model.DescribeConfigurationRevisionResult;
-import com.amazonaws.services.mq.model.DescribeUserRequest;
-import com.amazonaws.services.mq.model.DescribeUserResult;
-import com.amazonaws.services.mq.model.ListBrokersRequest;
-import com.amazonaws.services.mq.model.ListBrokersResult;
-import com.amazonaws.services.mq.model.ListConfigurationRevisionsRequest;
-import com.amazonaws.services.mq.model.ListConfigurationRevisionsResult;
-import com.amazonaws.services.mq.model.ListConfigurationsRequest;
-import com.amazonaws.services.mq.model.ListConfigurationsResult;
-import com.amazonaws.services.mq.model.ListUsersRequest;
-import com.amazonaws.services.mq.model.ListUsersResult;
-import com.amazonaws.services.mq.model.RebootBrokerRequest;
-import com.amazonaws.services.mq.model.RebootBrokerResult;
-import com.amazonaws.services.mq.model.UpdateBrokerRequest;
-import com.amazonaws.services.mq.model.UpdateBrokerResult;
-import com.amazonaws.services.mq.model.UpdateConfigurationRequest;
-import com.amazonaws.services.mq.model.UpdateConfigurationResult;
-import com.amazonaws.services.mq.model.UpdateUserRequest;
-import com.amazonaws.services.mq.model.UpdateUserResult;
-
-public class AmazonMQClientMock extends AbstractAmazonMQ {
-
-    public AmazonMQClientMock() {
-    }
-
-    @Override
-    public CreateBrokerResult createBroker(CreateBrokerRequest createBrokerRequest) {
-        CreateBrokerResult result = new CreateBrokerResult();
-        result.setBrokerArn("test");
-        result.setBrokerId("1");
-        return result;
-    }
-
-    @Override
-    public CreateConfigurationResult createConfiguration(CreateConfigurationRequest createConfigurationRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CreateUserResult createUser(CreateUserRequest createUserRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DeleteBrokerResult deleteBroker(DeleteBrokerRequest deleteBrokerRequest) {
-        DeleteBrokerResult result = new DeleteBrokerResult();
-        result.setBrokerId("1");
-        return result;
-    }
-
-    @Override
-    public DeleteUserResult deleteUser(DeleteUserRequest deleteUserRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DescribeBrokerResult describeBroker(DescribeBrokerRequest describeBrokerRequest) {
-        DescribeBrokerResult result = new DescribeBrokerResult();
-        result.setBrokerId("1");
-        result.setBrokerName("Test");
-        result.setBrokerState(BrokerState.RUNNING.toString());
-        return result;
-    }
-
-    @Override
-    public DescribeConfigurationResult describeConfiguration(DescribeConfigurationRequest describeConfigurationRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DescribeConfigurationRevisionResult describeConfigurationRevision(
-            DescribeConfigurationRevisionRequest describeConfigurationRevisionRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DescribeUserResult describeUser(DescribeUserRequest describeUserRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListBrokersResult listBrokers(ListBrokersRequest listBrokersRequest) {
-        ListBrokersResult result = new ListBrokersResult();
-        BrokerSummary bs = new BrokerSummary();
-        bs.setBrokerArn("aws:test");
-        bs.setBrokerId("1");
-        bs.setBrokerName("mybroker");
-        bs.setBrokerState(BrokerState.RUNNING.toString());
-        List<BrokerSummary> list = new ArrayList<>();
-        list.add(bs);
-        result.setBrokerSummaries(list);
-        return result;
-    }
-
-    @Override
-    public ListConfigurationRevisionsResult listConfigurationRevisions(
-            ListConfigurationRevisionsRequest listConfigurationRevisionsRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListConfigurationsResult listConfigurations(ListConfigurationsRequest listConfigurationsRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListUsersResult listUsers(ListUsersRequest listUsersRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public RebootBrokerResult rebootBroker(RebootBrokerRequest rebootBrokerRequest) {
-        RebootBrokerResult result = new RebootBrokerResult();
-        return result;
-    }
-
-    @Override
-    public UpdateBrokerResult updateBroker(UpdateBrokerRequest updateBrokerRequest) {
-        UpdateBrokerResult result = new UpdateBrokerResult();
-        ConfigurationId cId = new ConfigurationId();
-        cId.setId("1");
-        cId.setRevision(12);
-        result.setBrokerId("1");
-        result.setConfiguration(cId);
-        return result;
-    }
-
-    @Override
-    public UpdateConfigurationResult updateConfiguration(UpdateConfigurationRequest updateConfigurationRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public UpdateUserResult updateUser(UpdateUserRequest updateUserRequest) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void shutdown() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request) {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java
deleted file mode 100644
index e618a1d..0000000
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class MQComponentClientRegistryTest extends CamelTestSupport {
-
-    @Test
-    public void createEndpointWithMinimalMQClientConfiguration() throws Exception {
-
-        AmazonMQClientMock awsMQClient = new AmazonMQClientMock();
-        context.getRegistry().bind("awsMQClient", awsMQClient);
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        MQEndpoint endpoint = (MQEndpoint) component.createEndpoint("aws-mq://MyQueue");
-
-        assertNotNull(endpoint.getConfiguration().getAmazonMqClient());
-    }
-
-    @Test
-    public void createEndpointWithMinimalMQClientMisconfiguration() throws Exception {
-
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        assertThrows(IllegalArgumentException.class,
-                () -> component.createEndpoint("aws-mq://MyQueue"));
-    }
-
-    @Test
-    public void createEndpointWithAutoDiscoverClientFalse() throws Exception {
-
-        AmazonMQClientMock awsMQClient = new AmazonMQClientMock();
-        context.getRegistry().bind("awsMQClient", awsMQClient);
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        MQEndpoint endpoint = (MQEndpoint) component
-                .createEndpoint("aws-mq://MyQueue?accessKey=xxx&secretKey=yyy&autoDiscoverClient=false");
-
-        assertNotSame(awsMQClient, endpoint.getConfiguration().getAmazonMqClient());
-    }
-
-    @Test
-    public void createEndpointWithAutoDiscoverClientTrue() throws Exception {
-
-        AmazonMQClientMock awsMQClient = new AmazonMQClientMock();
-        context.getRegistry().bind("awsMQClient", awsMQClient);
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        MQEndpoint endpoint = (MQEndpoint) component.createEndpoint("aws-mq://MyQueue?accessKey=xxx&secretKey=yyy");
-
-        assertSame(awsMQClient, endpoint.getConfiguration().getAmazonMqClient());
-    }
-}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
deleted file mode 100644
index d98a799..0000000
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import com.amazonaws.Protocol;
-import com.amazonaws.regions.Regions;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MQComponentConfigurationTest extends CamelTestSupport {
-
-    @Test
-    public void createEndpointWithComponentElements() throws Exception {
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        component.getConfiguration().setAccessKey("XXX");
-        component.getConfiguration().setSecretKey("YYY");
-        MQEndpoint endpoint = (MQEndpoint) component.createEndpoint("aws-mq://MyQueue");
-
-        assertEquals("XXX", endpoint.getConfiguration().getAccessKey());
-        assertEquals("YYY", endpoint.getConfiguration().getSecretKey());
-    }
-
-    @Test
-    public void createEndpointWithComponentAndEndpointElements() throws Exception {
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        component.getConfiguration().setAccessKey("XXX");
-        component.getConfiguration().setSecretKey("YYY");
-        component.getConfiguration().setRegion(Regions.US_WEST_1.toString());
-        MQEndpoint endpoint
-                = (MQEndpoint) component.createEndpoint("aws-mq://MyQueue?accessKey=xxxxxx&secretKey=yyyyy&region=US_EAST_1");
-
-        assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
-        assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
-        assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
-    }
-
-    @Test
-    public void createEndpointWithComponentEndpointElementsAndProxy() throws Exception {
-        MQComponent component = context.getComponent("aws-mq", MQComponent.class);
-        component.getConfiguration().setAccessKey("XXX");
-        component.getConfiguration().setSecretKey("YYY");
-        component.getConfiguration().setRegion(Regions.US_WEST_1.toString());
-        MQEndpoint endpoint = (MQEndpoint) component.createEndpoint(
-                "aws-mq://label?accessKey=xxxxxx&secretKey=yyyyy&region=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
-
-        assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
-        assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
-        assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
-        assertEquals(Protocol.HTTP, endpoint.getConfiguration().getProxyProtocol());
-        assertEquals("localhost", endpoint.getConfiguration().getProxyHost());
-        assertEquals(Integer.valueOf(9000), endpoint.getConfiguration().getProxyPort());
-    }
-}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.java
deleted file mode 100644
index d07b863..0000000
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.Component;
-import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MQComponentVerifierExtensionTest extends CamelTestSupport {
-
-    // *************************************************
-    // Tests (parameters)
-    // *************************************************
-    @Override
-    public boolean isUseRouteBuilder() {
-        return false;
-    }
-
-    @Test
-    public void testParameters() throws Exception {
-        Component component = context().getComponent("aws-mq");
-
-        ComponentVerifierExtension verifier
-                = component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
-        Map<String, Object> parameters = new HashMap<>();
-        parameters.put("secretKey", "l");
-        parameters.put("accessKey", "k");
-        parameters.put("region", "l");
-        parameters.put("label", "test");
-        parameters.put("operation", MQOperations.listBrokers);
-
-        ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
-
-        assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
-    }
-
-    @Test
-    public void testConnectivity() throws Exception {
-        Component component = context().getComponent("aws-mq");
-        ComponentVerifierExtension verifier
-                = component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
-        Map<String, Object> parameters = new HashMap<>();
-        parameters.put("secretKey", "l");
-        parameters.put("accessKey", "k");
-        parameters.put("region", "US_EAST_1");
-        parameters.put("label", "test");
-        parameters.put("operation", MQOperations.listBrokers);
-
-        ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
-
-        assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
-    }
-
-}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
deleted file mode 100644
index fe0609e..0000000
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.mq.model.BrokerState;
-import com.amazonaws.services.mq.model.ConfigurationId;
-import com.amazonaws.services.mq.model.CreateBrokerResult;
-import com.amazonaws.services.mq.model.DeleteBrokerResult;
-import com.amazonaws.services.mq.model.DeploymentMode;
-import com.amazonaws.services.mq.model.DescribeBrokerResult;
-import com.amazonaws.services.mq.model.EngineType;
-import com.amazonaws.services.mq.model.ListBrokersResult;
-import com.amazonaws.services.mq.model.UpdateBrokerResult;
-import com.amazonaws.services.mq.model.User;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MQProducerSpringTest extends CamelSpringTestSupport {
-
-    @EndpointInject("mock:result")
-    private MockEndpoint mock;
-
-    @Test
-    public void mqListBrokersTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:listBrokers", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.listBrokers);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-
-        ListBrokersResult resultGet = (ListBrokersResult) exchange.getIn().getBody();
-        assertEquals(1, resultGet.getBrokerSummaries().size());
-        assertEquals("mybroker", resultGet.getBrokerSummaries().get(0).getBrokerName());
-        assertEquals(BrokerState.RUNNING.toString(), resultGet.getBrokerSummaries().get(0).getBrokerState());
-    }
-
-    @Test
-    public void mqCreateBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:createBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.createBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_NAME, "test");
-                exchange.getIn().setHeader(MQConstants.BROKER_DEPLOYMENT_MODE, DeploymentMode.SINGLE_INSTANCE);
-                exchange.getIn().setHeader(MQConstants.BROKER_INSTANCE_TYPE, "mq.t2.micro");
-                exchange.getIn().setHeader(MQConstants.BROKER_ENGINE, EngineType.ACTIVEMQ.name());
-                exchange.getIn().setHeader(MQConstants.BROKER_ENGINE_VERSION, "5.15.6");
-                exchange.getIn().setHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE, false);
-                List<User> users = new ArrayList<>();
-                User user = new User();
-                user.setUsername("camel");
-                user.setPassword("camelcamel12");
-                users.add(user);
-                exchange.getIn().setHeader(MQConstants.BROKER_USERS, users);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-
-        CreateBrokerResult resultGet = (CreateBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-        assertEquals("test", resultGet.getBrokerArn());
-    }
-
-    @Test
-    public void mqDeleteBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:createBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.deleteBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-
-        DeleteBrokerResult resultGet = (DeleteBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-    }
-
-    @Test
-    public void mqRebootBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        template.request("direct:rebootBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.rebootBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Test
-    public void mqUpdateBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:updateBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.updateBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-                ConfigurationId cId = new ConfigurationId();
-                cId.setId("1");
-                cId.setRevision(12);
-                exchange.getIn().setHeader(MQConstants.CONFIGURATION_ID, cId);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-        UpdateBrokerResult resultGet = (UpdateBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-    }
-
-    @Test
-    public void mqDescribeBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:describeBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.describeBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-                ConfigurationId cId = new ConfigurationId();
-                cId.setId("1");
-                cId.setRevision(12);
-                exchange.getIn().setHeader(MQConstants.CONFIGURATION_ID, cId);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-        DescribeBrokerResult resultGet = (DescribeBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-    }
-
-    @Override
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/mq/MQComponentSpringTest-context.xml");
-    }
-}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
deleted file mode 100644
index 41e7abe..0000000
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.mq;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.mq.model.BrokerState;
-import com.amazonaws.services.mq.model.ConfigurationId;
-import com.amazonaws.services.mq.model.CreateBrokerResult;
-import com.amazonaws.services.mq.model.DeleteBrokerResult;
-import com.amazonaws.services.mq.model.DeploymentMode;
-import com.amazonaws.services.mq.model.DescribeBrokerResult;
-import com.amazonaws.services.mq.model.EngineType;
-import com.amazonaws.services.mq.model.ListBrokersResult;
-import com.amazonaws.services.mq.model.UpdateBrokerResult;
-import com.amazonaws.services.mq.model.User;
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MQProducerTest extends CamelTestSupport {
-
-    @BindToRegistry("amazonMqClient")
-    AmazonMQClientMock clientMock = new AmazonMQClientMock();
-
-    @EndpointInject("mock:result")
-    private MockEndpoint mock;
-
-    @Test
-    public void mqListBrokersTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:listBrokers", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.listBrokers);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-
-        ListBrokersResult resultGet = (ListBrokersResult) exchange.getIn().getBody();
-        assertEquals(1, resultGet.getBrokerSummaries().size());
-        assertEquals("mybroker", resultGet.getBrokerSummaries().get(0).getBrokerName());
-        assertEquals(BrokerState.RUNNING.toString(), resultGet.getBrokerSummaries().get(0).getBrokerState());
-    }
-
-    @Test
-    public void mqCreateBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:createBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.createBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_NAME, "test");
-                exchange.getIn().setHeader(MQConstants.BROKER_DEPLOYMENT_MODE, DeploymentMode.SINGLE_INSTANCE);
-                exchange.getIn().setHeader(MQConstants.BROKER_INSTANCE_TYPE, "mq.t2.micro");
-                exchange.getIn().setHeader(MQConstants.BROKER_ENGINE, EngineType.ACTIVEMQ.name());
-                exchange.getIn().setHeader(MQConstants.BROKER_ENGINE_VERSION, "5.15.6");
-                exchange.getIn().setHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE, false);
-                List<User> users = new ArrayList<>();
-                User user = new User();
-                user.setUsername("camel");
-                user.setPassword("camelcamel12");
-                users.add(user);
-                exchange.getIn().setHeader(MQConstants.BROKER_USERS, users);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-
-        CreateBrokerResult resultGet = (CreateBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-        assertEquals("test", resultGet.getBrokerArn());
-    }
-
-    @Test
-    public void mqDeleteBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:createBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.deleteBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-
-        DeleteBrokerResult resultGet = (DeleteBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-    }
-
-    @Test
-    public void mqRebootBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        template.request("direct:rebootBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.rebootBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Test
-    public void mqUpdateBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:updateBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.updateBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-                ConfigurationId cId = new ConfigurationId();
-                cId.setId("1");
-                cId.setRevision(12);
-                exchange.getIn().setHeader(MQConstants.CONFIGURATION_ID, cId);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-        UpdateBrokerResult resultGet = (UpdateBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-    }
-
-    @Test
-    public void mqDescribeBrokerTest() throws Exception {
-
-        mock.expectedMessageCount(1);
-        Exchange exchange = template.request("direct:describeBroker", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(MQConstants.OPERATION, MQOperations.describeBroker);
-                exchange.getIn().setHeader(MQConstants.BROKER_ID, "1");
-                ConfigurationId cId = new ConfigurationId();
-                cId.setId("1");
-                cId.setRevision(12);
-                exchange.getIn().setHeader(MQConstants.CONFIGURATION_ID, cId);
-            }
-        });
-
-        assertMockEndpointsSatisfied();
-        DescribeBrokerResult resultGet = (DescribeBrokerResult) exchange.getIn().getBody();
-        assertEquals("1", resultGet.getBrokerId());
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:listBrokers")
-                        .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=listBrokers")
-                        .to("mock:result");
-                from("direct:createBroker")
-                        .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=createBroker")
-                        .to("mock:result");
-                from("direct:deleteBroker")
-                        .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=deleteBroker")
-                        .to("mock:result");
-                from("direct:rebootBroker")
-                        .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=rebootBroker")
-                        .to("mock:result");
-                from("direct:updateBroker")
-                        .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=updateBroker")
-                        .to("mock:result");
-                from("direct:describeBroker")
-                        .to("aws-mq://test?amazonMqClient=#amazonMqClient&operation=describeBroker")
-                        .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-aws-mq/src/test/resources/log4j2.properties b/components/camel-aws-mq/src/test/resources/log4j2.properties
deleted file mode 100644
index dc9aea9..0000000
--- a/components/camel-aws-mq/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-aws-mq-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/components/camel-aws-mq/src/test/resources/org/apache/camel/component/aws/mq/MQComponentSpringTest-context.xml b/components/camel-aws-mq/src/test/resources/org/apache/camel/component/aws/mq/MQComponentSpringTest-context.xml
deleted file mode 100644
index 08bd1e8..0000000
--- a/components/camel-aws-mq/src/test/resources/org/apache/camel/component/aws/mq/MQComponentSpringTest-context.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-        <route>
-            <from uri="direct:listBrokers"/>
-            <to uri="aws-mq://Test?amazonMqClient=#amazonMqClient&amp;operation=listBrokers"/>
-            <to uri="mock:result"/>
-        </route>
-        <route>
-            <from uri="direct:createBroker"/>
-            <to uri="aws-mq://Test?amazonMqClient=#amazonMqClient&amp;operation=createBroker"/>
-            <to uri="mock:result"/>
-        </route>
-        <route>
-            <from uri="direct:deleteBroker"/>
-            <to uri="aws-mq://Test?amazonMqClient=#amazonMqClient&amp;operation=deleteBroker"/>
-            <to uri="mock:result"/>
-        </route>
-        <route>
-            <from uri="direct:rebootBroker"/>
-            <to uri="aws-mq://Test?amazonMqClient=#amazonMqClient&amp;operation=rebootBroker"/>
-            <to uri="mock:result"/>
-        </route>
-        <route>
-            <from uri="direct:updateBroker"/>
-            <to uri="aws-mq://Test?amazonMqClient=#amazonMqClient&amp;operation=updateBroker"/>
-            <to uri="mock:result"/>
-        </route>
-        <route>
-            <from uri="direct:describeBroker"/>
-            <to uri="aws-mq://Test?amazonMqClient=#amazonMqClient&amp;operation=describeBroker"/>
-            <to uri="mock:result"/>
-        </route>
-    </camelContext>
-
-    <bean id="amazonMqClient" class="org.apache.camel.component.aws.mq.AmazonMQClientMock"/>
-</beans>
\ No newline at end of file
diff --git a/components/pom.xml b/components/pom.xml
index 9546aeb..ebea822 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -116,7 +116,6 @@
         <module>camel-aws-kinesis</module>
         <module>camel-aws-kms</module>
         <module>camel-aws-lambda</module>
-        <module>camel-aws-mq</module>
         <module>camel-aws-s3</module>
         <module>camel-aws-swf</module>
         <module>camel-aws2-athena</module>