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/15 15:57:30 UTC

[camel] 01/05: CAMEL-16115 - Remove Camel-AWS-* components - AWS-SDB

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 07adb223717d82ef351c0661e8a2c330ed0045a1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 15 16:13:44 2021 +0100

    CAMEL-16115 - Remove Camel-AWS-* components - AWS-SDB
---
 bom/camel-bom/pom.xml                              |   5 -
 components/camel-aws-sdb/pom.xml                   |  72 -----
 .../component/aws/sdb/SdbComponentConfigurer.java  |  55 ----
 .../component/aws/sdb/SdbEndpointConfigurer.java   | 103 -------
 .../component/aws/sdb/SdbEndpointUriFactory.java   |  72 -----
 .../services/org/apache/camel/component.properties |   7 -
 .../services/org/apache/camel/component/aws-sdb    |   2 -
 .../org/apache/camel/configurer/aws-sdb-component  |   2 -
 .../org/apache/camel/configurer/aws-sdb-endpoint   |   2 -
 .../org/apache/camel/urifactory/aws-sdb-endpoint   |   2 -
 .../apache/camel/component/aws/sdb/aws-sdb.json    |  43 ---
 .../src/main/docs/aws-sdb-component.adoc           | 258 ------------------
 .../component/aws/sdb/AbstractSdbCommand.java      |  65 -----
 .../aws/sdb/BatchDeleteAttributesCommand.java      |  48 ----
 .../aws/sdb/BatchPutAttributesCommand.java         |  48 ----
 .../component/aws/sdb/DeleteAttributesCommand.java |  50 ----
 .../component/aws/sdb/DeleteDomainCommand.java     |  39 ---
 .../component/aws/sdb/DomainMetadataCommand.java   |  54 ----
 .../component/aws/sdb/GetAttributesCommand.java    |  58 ----
 .../component/aws/sdb/ListDomainsCommand.java      |  58 ----
 .../component/aws/sdb/PutAttributesCommand.java    |  50 ----
 .../camel/component/aws/sdb/SdbComponent.java      |  55 ----
 .../aws/sdb/SdbComponentVerifierExtension.java     |  91 -------
 .../camel/component/aws/sdb/SdbConfiguration.java  | 174 ------------
 .../camel/component/aws/sdb/SdbConstants.java      |  47 ----
 .../camel/component/aws/sdb/SdbEndpoint.java       | 140 ----------
 .../camel/component/aws/sdb/SdbOperations.java     |  30 --
 .../camel/component/aws/sdb/SdbProducer.java       |  94 -------
 .../camel/component/aws/sdb/SelectCommand.java     |  55 ----
 .../component/aws/sdb/AbstractSdbCommandTest.java  | 105 -------
 .../component/aws/sdb/AmazonSDBClientMock.java     | 161 -----------
 .../aws/sdb/BatchDeleteAttributesCommandTest.java  |  71 -----
 .../aws/sdb/BatchPutAttributesCommandTest.java     |  71 -----
 .../aws/sdb/DeleteAttributesCommandTest.java       |  90 ------
 .../component/aws/sdb/DeleteDomainCommandTest.java |  50 ----
 .../aws/sdb/DomainMetadataCommandTest.java         |  58 ----
 .../aws/sdb/GetAttributesCommandTest.java          |  94 -------
 .../component/aws/sdb/ListDomainsCommandTest.java  |  73 -----
 .../aws/sdb/PutAttributesCommandTest.java          |  90 ------
 .../aws/sdb/SdbComponentConfigurationTest.java     | 162 -----------
 .../component/aws/sdb/SdbComponentSpringTest.java  | 301 ---------------------
 .../camel/component/aws/sdb/SdbComponentTest.java  | 298 --------------------
 .../aws/sdb/SdbComponentVerifierExtensionTest.java |  74 -----
 .../camel/component/aws/sdb/SdbOperationsTest.java |  55 ----
 .../camel/component/aws/sdb/SelectCommandTest.java |  76 ------
 .../integration/SdbComponentIntegrationTest.java   | 180 ------------
 .../src/test/resources/log4j2.properties           |  28 --
 .../aws/sdb/SDBComponentSpringTest-context.xml     |  34 ---
 components/camel-flatpack/pom.xml                  |  11 +
 components/pom.xml                                 |   1 -
 parent/pom.xml                                     |   5 -
 51 files changed, 11 insertions(+), 3856 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 9e84487..c92daf9 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -198,11 +198,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-aws-sdb</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-ses</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/components/camel-aws-sdb/pom.xml b/components/camel-aws-sdb/pom.xml
deleted file mode 100644
index f5b6c75..0000000
--- a/components/camel-aws-sdb/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-sdb</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Camel :: AWS SDB (deprecated)</name>
-    <description>A Camel Amazon SDB 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-simpledb</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-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
deleted file mode 100644
index 088c8fc..0000000
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.sdb;
-
-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 SdbComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SdbComponent target = (SdbComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": return boolean.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        SdbComponent target = (SdbComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": return target.isAutowiredEnabled();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
deleted file mode 100644
index 6e521ae..0000000
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.sdb;
-
-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 SdbEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SdbEndpoint target = (SdbEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": target.getConfiguration().setAccessKey(property(camelContext, java.lang.String.class, value)); return true;
-        case "amazonsdbclient":
-        case "amazonSDBClient": target.getConfiguration().setAmazonSDBClient(property(camelContext, com.amazonaws.services.simpledb.AmazonSimpleDB.class, value)); return true;
-        case "consistentread":
-        case "consistentRead": target.getConfiguration().setConsistentRead(property(camelContext, boolean.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "maxnumberofdomains":
-        case "maxNumberOfDomains": target.getConfiguration().setMaxNumberOfDomains(property(camelContext, java.lang.Integer.class, value)); return true;
-        case "operation": target.getConfiguration().setOperation(property(camelContext, org.apache.camel.component.aws.sdb.SdbOperations.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 "amazonsdbclient":
-        case "amazonSDBClient": return com.amazonaws.services.simpledb.AmazonSimpleDB.class;
-        case "consistentread":
-        case "consistentRead": return boolean.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "maxnumberofdomains":
-        case "maxNumberOfDomains": return java.lang.Integer.class;
-        case "operation": return org.apache.camel.component.aws.sdb.SdbOperations.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) {
-        SdbEndpoint target = (SdbEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accesskey":
-        case "accessKey": return target.getConfiguration().getAccessKey();
-        case "amazonsdbclient":
-        case "amazonSDBClient": return target.getConfiguration().getAmazonSDBClient();
-        case "consistentread":
-        case "consistentRead": return target.getConfiguration().isConsistentRead();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "maxnumberofdomains":
-        case "maxNumberOfDomains": return target.getConfiguration().getMaxNumberOfDomains();
-        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-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
deleted file mode 100644
index 8871ba3..0000000
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.sdb;
-
-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 SdbEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
-    private static final String BASE = ":domainName";
-
-    private static final Set<String> PROPERTY_NAMES;
-    private static final Set<String> SECRET_PROPERTY_NAMES;
-    static {
-        Set<String> props = new HashSet<>(12);
-        props.add("proxyPort");
-        props.add("lazyStartProducer");
-        props.add("amazonSDBClient");
-        props.add("proxyProtocol");
-        props.add("secretKey");
-        props.add("accessKey");
-        props.add("domainName");
-        props.add("consistentRead");
-        props.add("maxNumberOfDomains");
-        props.add("region");
-        props.add("operation");
-        props.add("proxyHost");
-        PROPERTY_NAMES = Collections.unmodifiableSet(props);
-        SECRET_PROPERTY_NAMES = Collections.emptySet();
-    }
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-sdb".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, "domainName", 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-sdb/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index 8b4ec7b..0000000
--- a/components/camel-aws-sdb/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-sdb
-groupId=org.apache.camel
-artifactId=camel-aws-sdb
-version=3.9.0-SNAPSHOT
-projectName=Camel :: AWS SDB (deprecated)
-projectDescription=A Camel Amazon SDB Web Service Component
diff --git a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/component/aws-sdb b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/component/aws-sdb
deleted file mode 100644
index 87e6a9b..0000000
--- a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/component/aws-sdb
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.sdb.SdbComponent
diff --git a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-sdb-component b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-sdb-component
deleted file mode 100644
index 44bc5dc..0000000
--- a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-sdb-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.sdb.SdbComponentConfigurer
diff --git a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-sdb-endpoint b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-sdb-endpoint
deleted file mode 100644
index 480fcc8..0000000
--- a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws-sdb-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.sdb.SdbEndpointConfigurer
diff --git a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sdb-endpoint b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sdb-endpoint
deleted file mode 100644
index ba31bb1..0000000
--- a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sdb-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.sdb.SdbEndpointUriFactory
diff --git a/components/camel-aws-sdb/src/generated/resources/org/apache/camel/component/aws/sdb/aws-sdb.json b/components/camel-aws-sdb/src/generated/resources/org/apache/camel/component/aws/sdb/aws-sdb.json
deleted file mode 100644
index 4a31e8e..0000000
--- a/components/camel-aws-sdb/src/generated/resources/org/apache/camel/component/aws/sdb/aws-sdb.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "aws-sdb",
-    "title": "AWS SimpleDB",
-    "description": "Store and Retrieve data from\/to AWS SDB service.",
-    "deprecated": true,
-    "deprecatedSince": "3.8.0",
-    "firstVersion": "2.9.0",
-    "label": "cloud,database,nosql",
-    "javaType": "org.apache.camel.component.aws.sdb.SdbComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-aws-sdb",
-    "version": "3.9.0-SNAPSHOT",
-    "scheme": "aws-sdb",
-    "extendsScheme": "",
-    "syntax": "aws-sdb:domainName",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "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 [...]
-    "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": {
-    "domainName": { "kind": "path", "displayName": "Domain Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "The name of the domain currently worked with." },
-    "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
-    "amazonSDBClient": { "kind": "parameter", "displayName": "Amazon SDBClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpledb.AmazonSimpleDB", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "To use the AmazonSimpleDB as the client" },
-    "consistentRead": { "kind": "parameter", "displayName": "Consistent Read", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "Determines whether or not strong consistency should be enforced when data is read." },
-    "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 [...]
-    "maxNumberOfDomains": { "kind": "parameter", "displayName": "Max Number Of Domains", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "The maximum number of domain names you want returned. The range is 1 to 100." },
-    "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.sdb.SdbOperations", "enum": [ "BatchDeleteAttributes", "BatchPutAttributes", "DeleteAttributes", "DeleteDomain", "DomainMetadata", "GetAttributes", "ListDomains", "PutAttributes", "Select" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "PutAttributes", "configurationClass": "org [...]
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SDB client" },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SDB 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.sdb.SdbConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the SDB 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.sdb.SdbConfiguration", "configurationField": "configuration", "description": "The region in which SDB client needs to work. When using this parameter, the configuration will expect the capitalized name of the region [...]
-    "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sdb.SdbConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
-  }
-}
diff --git a/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc b/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
deleted file mode 100644
index 2920dde..0000000
--- a/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
+++ /dev/null
@@ -1,258 +0,0 @@
-[[aws-sdb-component]]
-= AWS SimpleDB Component (deprecated)
-:docTitle: AWS SimpleDB
-:artifactId: camel-aws-sdb
-:description: Store and Retrieve data from/to AWS SDB service.
-:since: 2.9
-:supportLevel: Stable-deprecated
-:deprecated: *deprecated*
-:component-header: Only producer is supported
-include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/aws-sdb.adoc[opts=optional]
-//Manually maintained attributes
-:group: AWS
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The sdb component supports storing and retrieving data from/to
-https://aws.amazon.com/sdb[Amazon's SDB] service.
-
-Prerequisites
-
-You must have a valid Amazon Web Services developer account, and be
-signed up to use Amazon SDB. More information is available at
-https://aws.amazon.com/sdb[Amazon SDB].
-
-== URI Format
-
-[source,java]
-------------------------------
-aws-sdb://domainName[?options]
-------------------------------
-
-You can append query options to the URI in the following format,
-?options=value&option2=value&...
-
-== URI Options
-
-
-// component options: START
-The AWS SimpleDB component supports 2 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *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 [...]
-| *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 SimpleDB endpoint is configured using URI syntax:
-
-----
-aws-sdb:domainName
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *domainName* | *Required* The name of the domain currently worked with. |  | String
-|===
-
-
-=== Query Parameters (11 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *accessKey* (producer) | Amazon AWS Access Key |  | String
-| *amazonSDBClient* (producer) | To use the AmazonSimpleDB as the client |  | AmazonSimpleDB
-| *consistentRead* (producer) | Determines whether or not strong consistency should be enforced when data is read. | false | boolean
-| *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 [...]
-| *maxNumberOfDomains* (producer) | The maximum number of domain names you want returned. The range is 1 to 100. |  | Integer
-| *operation* (producer) | Operation to perform. There are 9 enums and the value can be one of: BatchDeleteAttributes, BatchPutAttributes, DeleteAttributes, DeleteDomain, DomainMetadata, GetAttributes, ListDomains, PutAttributes, Select | PutAttributes | SdbOperations
-| *proxyHost* (producer) | To define a proxy host when instantiating the SDB client |  | String
-| *proxyPort* (producer) | To define a proxy port when instantiating the SDB client |  | Integer
-| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the SDB client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol
-| *region* (producer) | The region in which SDB 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 SDB component options
-
-You have to provide the amazonSDBClient in the
-Registry or your accessKey and secretKey to access
-the https://aws.amazon.com/sdb[Amazon's SDB].
-
-== Usage
-
-=== Message headers evaluated by the SDB producer
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsSdbAttributes` |`Collection<Attribute>` |List of attributes to be acted upon.
-
-|`CamelAwsSdbAttributeNames` |`Collection<String>` |The names of the attributes to be retrieved.
-
-|`CamelAwsSdbConsistentRead` |`Boolean` |Determines whether or not strong consistency should be enforced when
-data is read.
-
-|`CamelAwsSdbDeletableItems` |`Collection<DeletableItem>` |A list of items on which to perform the delete operation in a batch.
-
-|`CamelAwsSdbDomainName` |`String` |The name of the domain currently worked with.
-
-|`CamelAwsSdbItemName` |`String` |The unique key for this item
-
-|`CamelAwsSdbMaxNumberOfDomains` |`Integer` |The maximum number of domain names you want returned. The range is 1 *
-to 100.
-
-|`CamelAwsSdbNextToken` |`String` |A string specifying where to start the next list of domain/item names.
-
-|`CamelAwsSdbOperation` |`String` |To override the operation from the URI options.
-
-|`CamelAwsSdbReplaceableAttributes` |`Collection<ReplaceableAttribute>` |List of attributes to put in an Item.
-
-|`CamelAwsSdbReplaceableItems` |`Collection<ReplaceableItem>` |A list of items to put in a Domain.
-
-|`CamelAwsSdbSelectExpression` |`String` |The expression used to query the domain.
-
-|`CamelAwsSdbUpdateCondition` |`UpdateCondition` |The update condition which, if specified, determines whether the
-specified attributes will be updated/deleted or not.
-|=======================================================================
-
-=== Message headers set during DomainMetadata operation
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsSdbTimestamp` |`Integer` |The data and time when metadata was calculated, in Epoch (UNIX) seconds.
-
-|`CamelAwsSdbItemCount` |`Integer` |The number of all items in the domain.
-
-|`CamelAwsSdbAttributeNameCount` |`Integer` |The number of unique attribute names in the domain.
-
-|`CamelAwsSdbAttributeValueCount` |`Integer` |The number of all attribute name/value pairs in the domain.
-
-|`CamelAwsSdbAttributeNameSize` |`Long` |The total size of all unique attribute names in the domain, in bytes.
-
-|`CamelAwsSdbAttributeValueSize` |`Long` |The total size of all attribute values in the domain, in bytes.
-
-|`CamelAwsSdbItemNameSize` |`Long` |The total size of all item names in the domain, in bytes.
-|=======================================================================
-
-=== Message headers set during GetAttributes operation
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsSdbAttributes` |`List<Attribute>` |The list of attributes returned by the operation.
-|=======================================================================
-
-=== Message headers set during ListDomains operation
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsSdbDomainNames` |`List<String>` |A list of domain names that match the expression.
-
-|`CamelAwsSdbNextToken` |`String` |An opaque token indicating that there are more domains than the
-specified MaxNumberOfDomains still available.
-|=======================================================================
-
-=== Message headers set during Select operation
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsSdbItems` |`List<Item>` |A list of items that match the select expression.
-
-|`CamelAwsSdbNextToken` |`String` |An opaque token indicating that more items than MaxNumberOfItems were
-matched, the response size exceeded 1 megabyte, or the execution time
-exceeded 5 seconds.
-|=======================================================================
-
-=== Advanced AmazonSimpleDB configuration
-
-If you need more control over the `AmazonSimpleDB` instance
-configuration you can create your own instance and refer to it from the
-URI:
-
-[source,java]
-----------------------------------------------------
-from("direct:start")
-.to("aws-sdb://domainName?amazonSDBClient=#client");
-----------------------------------------------------
-
-The `#client` refers to a `AmazonSimpleDB` in the
-Registry.
-
-For example if your Camel Application is running behind a firewall:
-
-[source,java]
---------------------------------------------------------------------------------------
-AWSCredentials awsCredentials = new BasicAWSCredentials("myAccessKey", "mySecretKey");
-ClientConfiguration clientConfiguration = new ClientConfiguration();
-clientConfiguration.setProxyHost("http://myProxyHost");
-clientConfiguration.setProxyPort(8080);
-
-AmazonSimpleDB client = new AmazonSimpleDBClient(awsCredentials, clientConfiguration);
-
-registry.bind("client", client);
---------------------------------------------------------------------------------------
-
-=== SDB Producer operations
-
-Camel-AWS SDB component provides the following operation on the producer side:
-
-- BatchDeleteAttributes
-- BatchPutAttributes
-- DeleteAttributes
-- DeleteDomain
-- DomainMetadata
-- GetAttributes
-- ListDomains
-- PutAttributes
-- Select
-
-== 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-sdb</artifactId>
-    <version>${camel-version}</version>
-</dependency>
----------------------------------------
-
-where `$\{camel-version}` must be replaced by the actual version of Camel.
-
-
-include::camel-spring-boot::page$aws-sdb-starter.adoc[]
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java
deleted file mode 100644
index a0d08a0..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java
+++ /dev/null
@@ -1,65 +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.sdb;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.Exchange;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractSdbCommand {
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
-
-    protected AmazonSimpleDB sdbClient;
-    protected SdbConfiguration configuration;
-    protected Exchange exchange;
-
-    public AbstractSdbCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        this.sdbClient = sdbClient;
-        this.configuration = configuration;
-        this.exchange = exchange;
-    }
-
-    public abstract void execute();
-
-    protected String determineDomainName() {
-        String domainName = exchange.getIn().getHeader(SdbConstants.DOMAIN_NAME, String.class);
-        return domainName != null ? domainName : configuration.getDomainName();
-    }
-
-    protected String determineItemName() {
-        String key = exchange.getIn().getHeader(SdbConstants.ITEM_NAME, String.class);
-        if (key == null) {
-            throw new IllegalArgumentException("AWS SDB Item Name header is missing.");
-        }
-        return key;
-    }
-
-    protected Boolean determineConsistentRead() {
-        return exchange.getIn().getHeader(SdbConstants.CONSISTENT_READ, this.configuration.isConsistentRead(), Boolean.class);
-    }
-
-    protected UpdateCondition determineUpdateCondition() {
-        return exchange.getIn().getHeader(SdbConstants.UPDATE_CONDITION, UpdateCondition.class);
-    }
-
-    protected String determineNextToken() {
-        return exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN, String.class);
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
deleted file mode 100644
index 8c8ed05..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
+++ /dev/null
@@ -1,48 +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.sdb;
-
-import java.util.Collection;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.BatchDeleteAttributesRequest;
-import com.amazonaws.services.simpledb.model.DeletableItem;
-import org.apache.camel.Exchange;
-
-public class BatchDeleteAttributesCommand extends AbstractSdbCommand {
-
-    public BatchDeleteAttributesCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        BatchDeleteAttributesRequest request = new BatchDeleteAttributesRequest()
-                .withDomainName(determineDomainName())
-                .withItems(determineDeletableItems());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        this.sdbClient.batchDeleteAttributes(request);
-
-        log.trace("Request sent");
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Collection<DeletableItem> determineDeletableItems() {
-        return exchange.getIn().getHeader(SdbConstants.DELETABLE_ITEMS, Collection.class);
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
deleted file mode 100644
index 963f62d..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
+++ /dev/null
@@ -1,48 +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.sdb;
-
-import java.util.Collection;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.BatchPutAttributesRequest;
-import com.amazonaws.services.simpledb.model.ReplaceableItem;
-import org.apache.camel.Exchange;
-
-public class BatchPutAttributesCommand extends AbstractSdbCommand {
-
-    public BatchPutAttributesCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        BatchPutAttributesRequest request = new BatchPutAttributesRequest()
-                .withDomainName(determineDomainName())
-                .withItems(determineReplaceableItems());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        this.sdbClient.batchPutAttributes(request);
-
-        log.trace("Request sent");
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Collection<ReplaceableItem> determineReplaceableItems() {
-        return exchange.getIn().getHeader(SdbConstants.REPLACEABLE_ITEMS, Collection.class);
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
deleted file mode 100644
index d42a97e..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
+++ /dev/null
@@ -1,50 +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.sdb;
-
-import java.util.Collection;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.Attribute;
-import com.amazonaws.services.simpledb.model.DeleteAttributesRequest;
-import org.apache.camel.Exchange;
-
-public class DeleteAttributesCommand extends AbstractSdbCommand {
-
-    public DeleteAttributesCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        DeleteAttributesRequest request = new DeleteAttributesRequest()
-                .withDomainName(determineDomainName())
-                .withItemName(determineItemName())
-                .withExpected(determineUpdateCondition())
-                .withAttributes(determineAttributes());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        this.sdbClient.deleteAttributes(request);
-
-        log.trace("Request sent");
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Collection<Attribute> determineAttributes() {
-        return exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, Collection.class);
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
deleted file mode 100644
index 464de6f..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
+++ /dev/null
@@ -1,39 +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.sdb;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.DeleteDomainRequest;
-import org.apache.camel.Exchange;
-
-public class DeleteDomainCommand extends AbstractSdbCommand {
-
-    public DeleteDomainCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        DeleteDomainRequest request = new DeleteDomainRequest()
-                .withDomainName(determineDomainName());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        this.sdbClient.deleteDomain(request);
-
-        log.trace("Request sent");
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
deleted file mode 100644
index 5ec3a6b..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
+++ /dev/null
@@ -1,54 +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.sdb;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
-import com.amazonaws.services.simpledb.model.DomainMetadataResult;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-
-public class DomainMetadataCommand extends AbstractSdbCommand {
-
-    public DomainMetadataCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        DomainMetadataRequest request = new DomainMetadataRequest()
-                .withDomainName(determineDomainName());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        DomainMetadataResult result = this.sdbClient.domainMetadata(request);
-
-        log.trace("Received result [{}]", result);
-
-        Message msg = getMessageForResponse(exchange);
-        msg.setHeader(SdbConstants.TIMESTAMP, result.getTimestamp());
-        msg.setHeader(SdbConstants.ITEM_COUNT, result.getItemCount());
-        msg.setHeader(SdbConstants.ATTRIBUTE_NAME_COUNT, result.getAttributeNameCount());
-        msg.setHeader(SdbConstants.ATTRIBUTE_VALUE_COUNT, result.getAttributeValueCount());
-        msg.setHeader(SdbConstants.ATTRIBUTE_NAME_SIZE, result.getAttributeNamesSizeBytes());
-        msg.setHeader(SdbConstants.ATTRIBUTE_VALUE_SIZE, result.getAttributeValuesSizeBytes());
-        msg.setHeader(SdbConstants.ITEM_NAME_SIZE, result.getItemNamesSizeBytes());
-    }
-
-    public static Message getMessageForResponse(final Exchange exchange) {
-        return exchange.getMessage();
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
deleted file mode 100644
index 2a9d731..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
+++ /dev/null
@@ -1,58 +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.sdb;
-
-import java.util.Collection;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.GetAttributesRequest;
-import com.amazonaws.services.simpledb.model.GetAttributesResult;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-
-public class GetAttributesCommand extends AbstractSdbCommand {
-
-    public GetAttributesCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        GetAttributesRequest request = new GetAttributesRequest()
-                .withDomainName(determineDomainName())
-                .withItemName(determineItemName())
-                .withConsistentRead(determineConsistentRead())
-                .withAttributeNames(determineAttributeNames());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        GetAttributesResult result = this.sdbClient.getAttributes(request);
-
-        log.trace("Received result [{}]", result);
-
-        Message msg = getMessageForResponse(exchange);
-        msg.setHeader(SdbConstants.ATTRIBUTES, result.getAttributes());
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Collection<String> determineAttributeNames() {
-        return exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAMES, Collection.class);
-    }
-
-    public static Message getMessageForResponse(final Exchange exchange) {
-        return exchange.getMessage();
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
deleted file mode 100644
index db124fa..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
+++ /dev/null
@@ -1,58 +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.sdb;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.ListDomainsRequest;
-import com.amazonaws.services.simpledb.model.ListDomainsResult;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-
-public class ListDomainsCommand extends AbstractSdbCommand {
-
-    public ListDomainsCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        ListDomainsRequest request = new ListDomainsRequest()
-                .withMaxNumberOfDomains(determineMaxNumberOfDomains())
-                .withNextToken(determineNextToken());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        ListDomainsResult result = this.sdbClient.listDomains(request);
-
-        log.trace("Received result [{}]", result);
-
-        Message msg = getMessageForResponse(exchange);
-        msg.setHeader(SdbConstants.NEXT_TOKEN, result.getNextToken());
-        msg.setHeader(SdbConstants.DOMAIN_NAMES, result.getDomainNames());
-    }
-
-    protected Integer determineMaxNumberOfDomains() {
-        Integer maxNumberOfDomains = exchange.getIn().getHeader(SdbConstants.MAX_NUMBER_OF_DOMAINS, Integer.class);
-        if (maxNumberOfDomains == null) {
-            maxNumberOfDomains = this.configuration.getMaxNumberOfDomains();
-        }
-        return maxNumberOfDomains;
-    }
-
-    public static Message getMessageForResponse(final Exchange exchange) {
-        return exchange.getMessage();
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
deleted file mode 100644
index d9f4cc0..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
+++ /dev/null
@@ -1,50 +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.sdb;
-
-import java.util.Collection;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.PutAttributesRequest;
-import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
-import org.apache.camel.Exchange;
-
-public class PutAttributesCommand extends AbstractSdbCommand {
-
-    public PutAttributesCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        PutAttributesRequest request = new PutAttributesRequest()
-                .withDomainName(determineDomainName())
-                .withItemName(determineItemName())
-                .withAttributes(determineReplaceableAttributes())
-                .withExpected(determineUpdateCondition());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        this.sdbClient.putAttributes(request);
-
-        log.trace("Request sent");
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Collection<ReplaceableAttribute> determineReplaceableAttributes() {
-        return exchange.getIn().getHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, Collection.class);
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
deleted file mode 100644
index b3e428a..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
+++ /dev/null
@@ -1,55 +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.sdb;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-
-@Component("aws-sdb")
-public class SdbComponent extends DefaultComponent {
-
-    public SdbComponent() {
-        this(null);
-    }
-
-    public SdbComponent(CamelContext context) {
-        super(context);
-
-        registerExtension(new SdbComponentVerifierExtension());
-    }
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-
-        if (remaining == null || remaining.trim().length() == 0) {
-            throw new IllegalArgumentException("Domain name must be specified.");
-        }
-        SdbConfiguration configuration = new SdbConfiguration();
-        configuration.setDomainName(remaining);
-        SdbEndpoint endpoint = new SdbEndpoint(uri, this, configuration);
-        setProperties(endpoint, parameters);
-        if (configuration.getAmazonSDBClient() == null
-                && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
-            throw new IllegalArgumentException("amazonSDBClient or accessKey and secretKey must be specified");
-        }
-        return endpoint;
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java
deleted file mode 100644
index cdfff87..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java
+++ /dev/null
@@ -1,91 +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.sdb;
-
-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.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
-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 SdbComponentVerifierExtension extends DefaultComponentVerifierExtension {
-
-    public SdbComponentVerifierExtension() {
-        this("aws-sdb");
-    }
-
-    public SdbComponentVerifierExtension(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 {
-            SdbConfiguration configuration = setProperties(new SdbConfiguration(), parameters);
-            AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
-            AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
-            AmazonSimpleDB client = AmazonSimpleDBClientBuilder.standard().withCredentials(credentialsProvider)
-                    .withRegion(Regions.valueOf(configuration.getRegion())).build();
-            client.listDomains();
-        } catch (SdkClientException e) {
-            ResultErrorBuilder errorBuilder
-                    = ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, e.getMessage())
-                            .detail("aws_sdb_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-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
deleted file mode 100644
index 02846bb..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
+++ /dev/null
@@ -1,174 +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.sdb;
-
-import com.amazonaws.Protocol;
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-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 SdbConfiguration {
-
-    @UriPath
-    @Metadata(required = true)
-    private String domainName;
-    @UriParam
-    private AmazonSimpleDB amazonSDBClient;
-    @UriParam
-    private String accessKey;
-    @UriParam
-    private String secretKey;
-    @UriParam
-    private Integer maxNumberOfDomains;
-    @UriParam
-    private boolean consistentRead;
-    @UriParam(defaultValue = "PutAttributes")
-    private SdbOperations operation = SdbOperations.PutAttributes;
-    @UriParam(enums = "HTTP,HTTPS", defaultValue = "HTTPS")
-    private Protocol proxyProtocol = Protocol.HTTPS;
-    @UriParam
-    private String proxyHost;
-    @UriParam
-    private Integer proxyPort;
-    @UriParam
-    private String region;
-
-    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 AmazonSimpleDB getAmazonSDBClient() {
-        return amazonSDBClient;
-    }
-
-    /**
-     * To use the AmazonSimpleDB as the client
-     */
-    public void setAmazonSDBClient(AmazonSimpleDB amazonSDBClient) {
-        this.amazonSDBClient = amazonSDBClient;
-    }
-
-    public String getDomainName() {
-        return domainName;
-    }
-
-    /**
-     * The name of the domain currently worked with.
-     */
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public SdbOperations getOperation() {
-        return operation;
-    }
-
-    /**
-     * Operation to perform
-     */
-    public void setOperation(SdbOperations operation) {
-        this.operation = operation;
-    }
-
-    public Integer getMaxNumberOfDomains() {
-        return maxNumberOfDomains;
-    }
-
-    /**
-     * The maximum number of domain names you want returned. The range is 1 to 100.
-     */
-    public void setMaxNumberOfDomains(Integer maxNumberOfDomains) {
-        this.maxNumberOfDomains = maxNumberOfDomains;
-    }
-
-    public boolean isConsistentRead() {
-        return consistentRead;
-    }
-
-    /**
-     * Determines whether or not strong consistency should be enforced when data is read.
-     */
-    public void setConsistentRead(boolean consistentRead) {
-        this.consistentRead = consistentRead;
-    }
-
-    public Protocol getProxyProtocol() {
-        return proxyProtocol;
-    }
-
-    /**
-     * To define a proxy protocol when instantiating the SDB client
-     */
-    public void setProxyProtocol(Protocol proxyProtocol) {
-        this.proxyProtocol = proxyProtocol;
-    }
-
-    public String getProxyHost() {
-        return proxyHost;
-    }
-
-    /**
-     * To define a proxy host when instantiating the SDB client
-     */
-    public void setProxyHost(String proxyHost) {
-        this.proxyHost = proxyHost;
-    }
-
-    public Integer getProxyPort() {
-        return proxyPort;
-    }
-
-    /**
-     * To define a proxy port when instantiating the SDB client
-     */
-    public void setProxyPort(Integer proxyPort) {
-        this.proxyPort = proxyPort;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * The region in which SDB 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;
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConstants.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConstants.java
deleted file mode 100644
index f4787ec..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConstants.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.sdb;
-
-/**
- * Constants used in Camel AWS SDB component
- */
-public interface SdbConstants {
-
-    String ATTRIBUTES = "CamelAwsSdbAttributes";
-    String ATTRIBUTE_NAMES = "CamelAwsSdbAttributeNames";
-    String ATTRIBUTE_NAME_COUNT = "CamelAwsSdbAttributeNameCount";
-    String ATTRIBUTE_NAME_SIZE = "CamelAwsSdbAttributeNameSize";
-    String ATTRIBUTE_VALUE_COUNT = "CamelAwsSdbAttributeValueCount";
-    String ATTRIBUTE_VALUE_SIZE = "CamelAwsSdbAttributeValueSize";
-    String CONSISTENT_READ = "CamelAwsSdbConsistentRead";
-    String DELETABLE_ITEMS = "CamelAwsSdbDeletableItems";
-    String DOMAIN_NAME = "CamelAwsSdbDomainName";
-    String DOMAIN_NAMES = "CamelAwsSdbDomainNames";
-    String ITEMS = "CamelAwsSdbItems";
-    String ITEM_COUNT = "CamelAwsSdbItemCount";
-    String ITEM_NAME_SIZE = "CamelAwsSdbItemNameSize";
-    String ITEM_NAME = "CamelAwsSdbItemName";
-    String MAX_NUMBER_OF_DOMAINS = "CamelAwsSdbMaxNumberOfDomains";
-    String MESSAGE_ID = "CamelAwsSdbMessageId";
-    String NEXT_TOKEN = "CamelAwsSdbNextToken";
-    String OPERATION = "CamelAwsSdbOperation";
-    String REPLACEABLE_ATTRIBUTES = "CamelAwsSdbReplaceableAttributes";
-    String REPLACEABLE_ITEMS = "CamelAwsSdbReplaceableItems";
-    String SELECT_EXPRESSION = "CamelAwsSdbSelectExpression";
-    String TIMESTAMP = "CamelAwsSdbTimestamp";
-    String UPDATE_CONDITION = "CamelAwsSdbUpdateCondition";
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
deleted file mode 100644
index 60b0ed0..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ /dev/null
@@ -1,140 +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.sdb;
-
-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.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
-import com.amazonaws.services.simpledb.model.CreateDomainRequest;
-import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
-import com.amazonaws.services.simpledb.model.NoSuchDomainException;
-import org.apache.camel.Category;
-import org.apache.camel.Component;
-import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-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;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Store and Retrieve data from/to AWS SDB service.
- */
-@UriEndpoint(firstVersion = "2.9.0", scheme = "aws-sdb", title = "AWS SimpleDB", syntax = "aws-sdb:domainName",
-             producerOnly = true, category = { Category.CLOUD, Category.DATABASE, Category.NOSQL })
-public class SdbEndpoint extends ScheduledPollEndpoint {
-
-    private static final Logger LOG = LoggerFactory.getLogger(SdbEndpoint.class);
-
-    private AmazonSimpleDB sdbClient;
-
-    @UriParam
-    private SdbConfiguration configuration;
-
-    public SdbEndpoint(String uri, Component component, SdbConfiguration 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 SdbProducer(this);
-    }
-
-    @Override
-    public void doStart() throws Exception {
-        super.doStart();
-
-        sdbClient = configuration.getAmazonSDBClient() != null ? configuration.getAmazonSDBClient() : createSdbClient();
-
-        String domainName = getConfiguration().getDomainName();
-        LOG.trace("Querying whether domain [{}] already exists...", domainName);
-
-        try {
-            sdbClient.domainMetadata(new DomainMetadataRequest(domainName));
-            LOG.trace("Domain [{}] already exists", domainName);
-            return;
-        } catch (NoSuchDomainException ase) {
-            LOG.trace("Domain [{}] doesn't exist yet", domainName);
-            LOG.trace("Creating domain [{}]...", domainName);
-            sdbClient.createDomain(new CreateDomainRequest(domainName));
-            LOG.trace("Domain [{}] created", domainName);
-        }
-    }
-
-    public SdbConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    public AmazonSimpleDB getSdbClient() {
-        return sdbClient;
-    }
-
-    AmazonSimpleDB createSdbClient() {
-        AmazonSimpleDB client = null;
-        AmazonSimpleDBClientBuilder clientBuilder = null;
-        ClientConfiguration clientConfiguration = 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 = AmazonSimpleDBClientBuilder.standard().withClientConfiguration(clientConfiguration)
-                        .withCredentials(credentialsProvider);
-            } else {
-                clientBuilder = AmazonSimpleDBClientBuilder.standard().withCredentials(credentialsProvider);
-            }
-        } else {
-            if (isClientConfigFound) {
-                clientBuilder = AmazonSimpleDBClientBuilder.standard();
-            } else {
-                clientBuilder = AmazonSimpleDBClientBuilder.standard().withClientConfiguration(clientConfiguration);
-            }
-        }
-        if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-            clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
-        }
-        client = clientBuilder.build();
-        return client;
-    }
-
-    public static Message getMessageForResponse(final Exchange exchange) {
-        return exchange.getMessage();
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java
deleted file mode 100644
index 368fd65..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java
+++ /dev/null
@@ -1,30 +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.sdb;
-
-public enum SdbOperations {
-
-    BatchDeleteAttributes,
-    BatchPutAttributes,
-    DeleteAttributes,
-    DeleteDomain,
-    DomainMetadata,
-    GetAttributes,
-    ListDomains,
-    PutAttributes,
-    Select
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java
deleted file mode 100644
index a63d55e..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java
+++ /dev/null
@@ -1,94 +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.sdb;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.util.URISupport;
-
-/**
- * A Producer which sends messages to the Amazon SimpleDB Service <a href="http://aws.amazon.com/simpledb/">AWS SDB</a>
- */
-public class SdbProducer extends DefaultProducer {
-
-    private transient String sdbProducerToString;
-
-    public SdbProducer(Endpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange) throws Exception {
-        switch (determineOperation(exchange)) {
-            case BatchDeleteAttributes:
-                new BatchDeleteAttributesCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case BatchPutAttributes:
-                new BatchPutAttributesCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case DeleteAttributes:
-                new DeleteAttributesCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case DeleteDomain:
-                new DeleteDomainCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case DomainMetadata:
-                new DomainMetadataCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case GetAttributes:
-                new GetAttributesCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case ListDomains:
-                new ListDomainsCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case PutAttributes:
-                new PutAttributesCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            case Select:
-                new SelectCommand(getEndpoint().getSdbClient(), getConfiguration(), exchange).execute();
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported operation");
-        }
-    }
-
-    private SdbOperations determineOperation(Exchange exchange) {
-        SdbOperations operation = exchange.getIn().getHeader(SdbConstants.OPERATION, SdbOperations.class);
-        if (operation == null) {
-            operation = getConfiguration().getOperation();
-        }
-        return operation;
-    }
-
-    protected SdbConfiguration getConfiguration() {
-        return getEndpoint().getConfiguration();
-    }
-
-    @Override
-    public String toString() {
-        if (sdbProducerToString == null) {
-            sdbProducerToString = "SdbProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
-        }
-        return sdbProducerToString;
-    }
-
-    @Override
-    public SdbEndpoint getEndpoint() {
-        return (SdbEndpoint) super.getEndpoint();
-    }
-}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
deleted file mode 100644
index d589ef0..0000000
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
+++ /dev/null
@@ -1,55 +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.sdb;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.SelectRequest;
-import com.amazonaws.services.simpledb.model.SelectResult;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-
-public class SelectCommand extends AbstractSdbCommand {
-
-    public SelectCommand(AmazonSimpleDB sdbClient, SdbConfiguration configuration, Exchange exchange) {
-        super(sdbClient, configuration, exchange);
-    }
-
-    @Override
-    public void execute() {
-        SelectRequest request = new SelectRequest()
-                .withSelectExpression(determineSelectExpression())
-                .withConsistentRead(determineConsistentRead())
-                .withNextToken(determineNextToken());
-        log.trace("Sending request [{}] for exchange [{}]...", request, exchange);
-
-        SelectResult result = this.sdbClient.select(request);
-
-        log.trace("Received result [{}]", result);
-
-        Message msg = getMessageForResponse(exchange);
-        msg.setHeader(SdbConstants.ITEMS, result.getItems());
-        msg.setHeader(SdbConstants.NEXT_TOKEN, result.getNextToken());
-    }
-
-    protected String determineSelectExpression() {
-        return exchange.getIn().getHeader(SdbConstants.SELECT_EXPRESSION, String.class);
-    }
-
-    public static Message getMessageForResponse(final Exchange exchange) {
-        return exchange.getMessage();
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
deleted file mode 100644
index a0762d9..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
+++ /dev/null
@@ -1,105 +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.sdb;
-
-import com.amazonaws.services.simpledb.AmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.fail;
-
-public class AbstractSdbCommandTest {
-
-    private AbstractSdbCommand command;
-    private AmazonSimpleDB sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        configuration.setConsistentRead(Boolean.TRUE);
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        this.command = new AbstractSdbCommand(sdbClient, configuration, exchange) {
-            @Override
-            public void execute() {
-                // noop
-            }
-        };
-    }
-
-    @Test
-    public void determineDomainName() {
-        assertEquals("DOMAIN1", this.command.determineDomainName());
-
-        exchange.getIn().setHeader(SdbConstants.DOMAIN_NAME, "DOMAIN2");
-
-        assertEquals("DOMAIN2", this.command.determineDomainName());
-    }
-
-    @Test
-    public void determineItemName() {
-        try {
-            this.command.determineItemName();
-            fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException e) {
-            assertEquals("AWS SDB Item Name header is missing.", e.getMessage());
-        }
-
-        exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-
-        assertEquals("ITEM1", this.command.determineItemName());
-    }
-
-    @Test
-    public void determineConsistentRead() {
-        assertEquals(Boolean.TRUE, this.command.determineConsistentRead());
-
-        exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.FALSE);
-
-        assertEquals(Boolean.FALSE, this.command.determineConsistentRead());
-    }
-
-    @Test
-    public void determineUpdateCondition() {
-        assertNull(this.command.determineUpdateCondition());
-
-        UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-        exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-
-        assertSame(condition, this.command.determineUpdateCondition());
-    }
-
-    @Test
-    public void determineNextToken() {
-        assertNull(this.command.determineNextToken());
-
-        exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "Token1");
-
-        assertEquals("Token1", this.command.determineNextToken());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java
deleted file mode 100644
index 14be51a..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java
+++ /dev/null
@@ -1,161 +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.sdb;
-
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.simpledb.AbstractAmazonSimpleDB;
-import com.amazonaws.services.simpledb.model.Attribute;
-import com.amazonaws.services.simpledb.model.BatchDeleteAttributesRequest;
-import com.amazonaws.services.simpledb.model.BatchDeleteAttributesResult;
-import com.amazonaws.services.simpledb.model.BatchPutAttributesRequest;
-import com.amazonaws.services.simpledb.model.BatchPutAttributesResult;
-import com.amazonaws.services.simpledb.model.CreateDomainRequest;
-import com.amazonaws.services.simpledb.model.CreateDomainResult;
-import com.amazonaws.services.simpledb.model.DeleteAttributesRequest;
-import com.amazonaws.services.simpledb.model.DeleteAttributesResult;
-import com.amazonaws.services.simpledb.model.DeleteDomainRequest;
-import com.amazonaws.services.simpledb.model.DeleteDomainResult;
-import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
-import com.amazonaws.services.simpledb.model.DomainMetadataResult;
-import com.amazonaws.services.simpledb.model.GetAttributesRequest;
-import com.amazonaws.services.simpledb.model.GetAttributesResult;
-import com.amazonaws.services.simpledb.model.Item;
-import com.amazonaws.services.simpledb.model.ListDomainsRequest;
-import com.amazonaws.services.simpledb.model.ListDomainsResult;
-import com.amazonaws.services.simpledb.model.NoSuchDomainException;
-import com.amazonaws.services.simpledb.model.PutAttributesRequest;
-import com.amazonaws.services.simpledb.model.PutAttributesResult;
-import com.amazonaws.services.simpledb.model.SelectRequest;
-import com.amazonaws.services.simpledb.model.SelectResult;
-
-public class AmazonSDBClientMock extends AbstractAmazonSimpleDB {
-
-    protected BatchDeleteAttributesRequest batchDeleteAttributesRequest;
-    protected BatchPutAttributesRequest batchPutAttributesRequest;
-    protected CreateDomainRequest createDomainRequest;
-    protected DeleteAttributesRequest deleteAttributesRequest;
-    protected DeleteDomainRequest deleteDomainRequest;
-    protected DomainMetadataRequest domainMetadataRequest;
-    protected GetAttributesRequest getAttributesRequest;
-    protected ListDomainsRequest listDomainsRequest;
-    protected PutAttributesRequest putAttributesRequest;
-    protected SelectRequest selectRequest;
-
-    public AmazonSDBClientMock() {
-    }
-
-    @Override
-    public BatchDeleteAttributesResult batchDeleteAttributes(BatchDeleteAttributesRequest batchDeleteAttributesRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.batchDeleteAttributesRequest = batchDeleteAttributesRequest;
-        return new BatchDeleteAttributesResult();
-    }
-
-    @Override
-    public BatchPutAttributesResult batchPutAttributes(BatchPutAttributesRequest batchPutAttributesRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.batchPutAttributesRequest = batchPutAttributesRequest;
-        return new BatchPutAttributesResult();
-    }
-
-    @Override
-    public CreateDomainResult createDomain(CreateDomainRequest createDomainRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.createDomainRequest = createDomainRequest;
-        return new CreateDomainResult();
-    }
-
-    @Override
-    public DeleteAttributesResult deleteAttributes(DeleteAttributesRequest deleteAttributesRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.deleteAttributesRequest = deleteAttributesRequest;
-
-        String domainName = deleteAttributesRequest.getDomainName();
-        if ("MissingDomain".equals(domainName)) {
-            throw new NoSuchDomainException(domainName);
-        }
-        return new DeleteAttributesResult();
-    }
-
-    @Override
-    public DeleteDomainResult deleteDomain(DeleteDomainRequest deleteDomainRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.deleteDomainRequest = deleteDomainRequest;
-        return new DeleteDomainResult();
-    }
-
-    @Override
-    public DomainMetadataResult domainMetadata(DomainMetadataRequest domainMetadataRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.domainMetadataRequest = domainMetadataRequest;
-
-        if ("NonExistingDomain".equals(domainMetadataRequest.getDomainName())) {
-            throw new NoSuchDomainException("Domain 'NonExistingDomain' doesn't exist.");
-        }
-
-        DomainMetadataResult result = new DomainMetadataResult();
-        result.setTimestamp(Integer.valueOf(10));
-        result.setItemCount(Integer.valueOf(11));
-        result.setAttributeNameCount(Integer.valueOf(12));
-        result.setAttributeValueCount(Integer.valueOf(13));
-        result.setAttributeNamesSizeBytes(Long.valueOf(1000000));
-        result.setAttributeValuesSizeBytes(Long.valueOf(2000000));
-        result.setItemNamesSizeBytes(Long.valueOf(3000000));
-        return result;
-    }
-
-    @Override
-    public GetAttributesResult getAttributes(GetAttributesRequest getAttributesRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.getAttributesRequest = getAttributesRequest;
-
-        return new GetAttributesResult()
-                .withAttributes(new Attribute("AttributeOne", "Value One"))
-                .withAttributes(new Attribute("AttributeTwo", "Value Two"));
-    }
-
-    @Override
-    public ListDomainsResult listDomains(ListDomainsRequest listDomainsRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.listDomainsRequest = listDomainsRequest;
-
-        ListDomainsResult result = new ListDomainsResult();
-        result.getDomainNames().add("DOMAIN1");
-        result.getDomainNames().add("DOMAIN2");
-        result.setNextToken("TOKEN2");
-        return result;
-    }
-
-    @Override
-    public PutAttributesResult putAttributes(PutAttributesRequest putAttributesRequest)
-            throws AmazonServiceException, AmazonClientException {
-        this.putAttributesRequest = putAttributesRequest;
-        return new PutAttributesResult();
-    }
-
-    @Override
-    public SelectResult select(SelectRequest selectRequest) throws AmazonServiceException, AmazonClientException {
-        this.selectRequest = selectRequest;
-
-        SelectResult result = new SelectResult();
-        result.setNextToken("TOKEN2");
-        result.getItems().add(new Item("ITEM1", null));
-        result.getItems().add(new Item("ITEM2", null));
-        return result;
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
deleted file mode 100644
index a68f779..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
+++ /dev/null
@@ -1,71 +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.sdb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Item;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-public class BatchDeleteAttributesCommandTest {
-
-    private BatchDeleteAttributesCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new BatchDeleteAttributesCommand(sdbClient, configuration, exchange);
-    }
-
-    @Test
-    public void execute() {
-        List<Item> deletableItems = new ArrayList<>();
-        deletableItems.add(new Item());
-        exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
-
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.batchDeleteAttributesRequest.getDomainName());
-        assertEquals(deletableItems, sdbClient.batchDeleteAttributesRequest.getItems());
-    }
-
-    @Test
-    public void determineDeletableItems() {
-        assertNull(this.command.determineDeletableItems());
-
-        List<Item> deletableItems = new ArrayList<>();
-        deletableItems.add(new Item());
-        exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
-
-        assertEquals(deletableItems, this.command.determineDeletableItems());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
deleted file mode 100644
index faa5087..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
+++ /dev/null
@@ -1,71 +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.sdb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.ReplaceableItem;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-public class BatchPutAttributesCommandTest {
-
-    private BatchPutAttributesCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new BatchPutAttributesCommand(sdbClient, configuration, exchange);
-    }
-
-    @Test
-    public void execute() {
-        List<ReplaceableItem> replaceableItems = new ArrayList<>();
-        replaceableItems.add(new ReplaceableItem("ITEM1"));
-        exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
-
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.batchPutAttributesRequest.getDomainName());
-        assertEquals(replaceableItems, sdbClient.batchPutAttributesRequest.getItems());
-    }
-
-    @Test
-    public void determineReplaceableItems() {
-        assertNull(this.command.determineReplaceableItems());
-
-        List<ReplaceableItem> replaceableItems = new ArrayList<>();
-        replaceableItems.add(new ReplaceableItem("ITEM1"));
-        exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
-
-        assertEquals(replaceableItems, this.command.determineReplaceableItems());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
deleted file mode 100644
index 8ed9c44..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
+++ /dev/null
@@ -1,90 +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.sdb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Attribute;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class DeleteAttributesCommandTest {
-
-    private DeleteAttributesCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new DeleteAttributesCommand(sdbClient, configuration, exchange);
-    }
-
-    @Test
-    public void execute() {
-        List<Attribute> attributes = new ArrayList<>();
-        attributes.add(new Attribute("NAME1", "VALUE1"));
-        exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-        exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-        UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-        exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.deleteAttributesRequest.getDomainName());
-        assertEquals("ITEM1", sdbClient.deleteAttributesRequest.getItemName());
-        assertEquals(condition, sdbClient.deleteAttributesRequest.getExpected());
-        assertEquals(attributes, sdbClient.deleteAttributesRequest.getAttributes());
-    }
-
-    @Test
-    public void executeWithoutItemName() {
-        List<Attribute> attributes = new ArrayList<>();
-        attributes.add(new Attribute("NAME1", "VALUE1"));
-        exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-        UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-        exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-
-        assertThrows(IllegalArgumentException.class,
-                () -> command.execute());
-    }
-
-    @Test
-    public void determineAttributes() {
-        assertNull(this.command.determineAttributes());
-
-        List<Attribute> attributes = new ArrayList<>();
-        attributes.add(new Attribute("NAME1", "VALUE1"));
-        exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-
-        assertEquals(attributes, this.command.determineAttributes());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
deleted file mode 100644
index 27a0eb6..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
+++ /dev/null
@@ -1,50 +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.sdb;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class DeleteDomainCommandTest {
-
-    private DeleteDomainCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new DeleteDomainCommand(sdbClient, configuration, exchange);
-    }
-
-    @Test
-    public void testExecute() {
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.deleteDomainRequest.getDomainName());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
deleted file mode 100644
index 8108370..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
+++ /dev/null
@@ -1,58 +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.sdb;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class DomainMetadataCommandTest {
-
-    private DomainMetadataCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new DomainMetadataCommand(sdbClient, configuration, exchange);
-    }
-
-    @Test
-    public void execute() {
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.domainMetadataRequest.getDomainName());
-
-        assertEquals(Integer.valueOf(10), exchange.getIn().getHeader(SdbConstants.TIMESTAMP));
-        assertEquals(Integer.valueOf(11), exchange.getIn().getHeader(SdbConstants.ITEM_COUNT));
-        assertEquals(Integer.valueOf(12), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_COUNT));
-        assertEquals(Integer.valueOf(13), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_COUNT));
-        assertEquals(Long.valueOf(1000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_SIZE));
-        assertEquals(Long.valueOf(2000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_SIZE));
-        assertEquals(Long.valueOf(3000000), exchange.getIn().getHeader(SdbConstants.ITEM_NAME_SIZE));
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
deleted file mode 100644
index 60e4230..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
+++ /dev/null
@@ -1,94 +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.sdb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Attribute;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class GetAttributesCommandTest {
-
-    private GetAttributesCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        configuration.setConsistentRead(Boolean.TRUE);
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new GetAttributesCommand(sdbClient, configuration, exchange);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void execute() {
-        List<String> attributeNames = new ArrayList<>();
-        attributeNames.add("ATTRIBUTE1");
-        exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-        exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.getAttributesRequest.getDomainName());
-        assertEquals("ITEM1", sdbClient.getAttributesRequest.getItemName());
-        assertEquals(Boolean.TRUE, sdbClient.getAttributesRequest.getConsistentRead());
-        assertEquals(attributeNames, sdbClient.getAttributesRequest.getAttributeNames());
-
-        List<Attribute> attributes = exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, List.class);
-        assertEquals(2, attributes.size());
-        assertEquals("AttributeOne", attributes.get(0).getName());
-        assertEquals("Value One", attributes.get(0).getValue());
-        assertEquals("AttributeTwo", attributes.get(1).getName());
-        assertEquals("Value Two", attributes.get(1).getValue());
-    }
-
-    @Test
-    public void executeWithoutItemName() {
-        List<String> attributeNames = new ArrayList<>();
-        attributeNames.add("ATTRIBUTE1");
-        exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-
-        assertThrows(IllegalArgumentException.class,
-                () -> command.execute());
-    }
-
-    @Test
-    public void determineAttributeNames() {
-        assertNull(this.command.determineAttributeNames());
-
-        List<String> attributeNames = new ArrayList<>();
-        attributeNames.add("ATTRIBUTE1");
-        exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-
-        assertEquals(attributeNames, this.command.determineAttributeNames());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
deleted file mode 100644
index b19398d..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
+++ /dev/null
@@ -1,73 +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.sdb;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class ListDomainsCommandTest {
-
-    private ListDomainsCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        configuration.setMaxNumberOfDomains(Integer.valueOf(5));
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new ListDomainsCommand(sdbClient, configuration, exchange);
-    }
-
-    @SuppressWarnings({ "unchecked" })
-    @Test
-    public void execute() {
-        exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-
-        command.execute();
-
-        assertEquals(Integer.valueOf(5), sdbClient.listDomainsRequest.getMaxNumberOfDomains());
-        assertEquals("TOKEN1", sdbClient.listDomainsRequest.getNextToken());
-
-        List<String> domains = exchange.getIn().getHeader(SdbConstants.DOMAIN_NAMES, List.class);
-        assertEquals("TOKEN2", exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN));
-        assertEquals(2, domains.size());
-        assertTrue(domains.contains("DOMAIN1"));
-        assertTrue(domains.contains("DOMAIN2"));
-    }
-
-    @Test
-    public void determineMaxNumberOfDomains() {
-        assertEquals(Integer.valueOf(5), this.command.determineMaxNumberOfDomains());
-
-        exchange.getIn().setHeader(SdbConstants.MAX_NUMBER_OF_DOMAINS, Integer.valueOf(10));
-
-        assertEquals(Integer.valueOf(10), this.command.determineMaxNumberOfDomains());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
deleted file mode 100644
index a77fbb7..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
+++ /dev/null
@@ -1,90 +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.sdb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class PutAttributesCommandTest {
-
-    private PutAttributesCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new PutAttributesCommand(sdbClient, configuration, exchange);
-    }
-
-    @Test
-    public void execute() {
-        List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
-        replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
-        exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-        exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-        UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-        exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-
-        command.execute();
-
-        assertEquals("DOMAIN1", sdbClient.putAttributesRequest.getDomainName());
-        assertEquals("ITEM1", sdbClient.putAttributesRequest.getItemName());
-        assertEquals(updateCondition, sdbClient.putAttributesRequest.getExpected());
-        assertEquals(replaceableAttributes, sdbClient.putAttributesRequest.getAttributes());
-    }
-
-    @Test
-    public void executeWithoutItemName() {
-        List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
-        replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
-        exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-        UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-        exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-
-        assertThrows(IllegalArgumentException.class,
-                () -> command.execute());
-    }
-
-    @Test
-    public void determineReplaceableAttributes() {
-        assertNull(this.command.determineReplaceableAttributes());
-
-        List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
-        replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
-        exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-
-        assertEquals(replaceableAttributes, this.command.determineReplaceableAttributes());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
deleted file mode 100644
index fbd900b..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
+++ /dev/null
@@ -1,162 +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.sdb;
-
-import com.amazonaws.Protocol;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class SdbComponentConfigurationTest extends CamelTestSupport {
-
-    @Test
-    public void createEndpointWithMinimalConfiguration() throws Exception {
-        AmazonSDBClientMock mock = new AmazonSDBClientMock();
-
-        context.getRegistry().bind("amazonSDBClient", mock);
-
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        SdbEndpoint endpoint = (SdbEndpoint) component.createEndpoint(
-                "aws-sdb://TestDomain?amazonSDBClient=#amazonSDBClient&accessKey=xxx&secretKey=yyy");
-
-        assertEquals("TestDomain", endpoint.getConfiguration().getDomainName());
-        assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
-        assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
-        assertNotNull(endpoint.getConfiguration().getAmazonSDBClient());
-        assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation());
-        assertFalse(endpoint.getConfiguration().isConsistentRead());
-        assertNull(endpoint.getConfiguration().getMaxNumberOfDomains());
-    }
-
-    @Test
-    public void createEndpointWithOnlyAccessKeyAndSecretKey() throws Exception {
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        SdbEndpoint endpoint = (SdbEndpoint) component.createEndpoint(
-                "aws-sdb://TestDomain?accessKey=xxx&secretKey=yyy");
-
-        assertEquals("TestDomain", endpoint.getConfiguration().getDomainName());
-        assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
-        assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
-        assertNull(endpoint.getConfiguration().getAmazonSDBClient());
-        assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation());
-        assertFalse(endpoint.getConfiguration().isConsistentRead());
-        assertNull(endpoint.getConfiguration().getMaxNumberOfDomains());
-    }
-
-    @Test
-    public void createEndpointWithMinimalConfigurationAndProvidedClient() throws Exception {
-        AmazonSDBClientMock mock = new AmazonSDBClientMock();
-
-        context.getRegistry().bind("amazonSDBClient", mock);
-
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        SdbEndpoint endpoint = (SdbEndpoint) component.createEndpoint("aws-sdb://TestDomain?"
-                                                                      + "amazonSDBClient=#amazonSDBClient");
-
-        assertEquals("TestDomain", endpoint.getConfiguration().getDomainName());
-        assertNull(endpoint.getConfiguration().getAccessKey());
-        assertNull(endpoint.getConfiguration().getSecretKey());
-        assertSame(mock, endpoint.getConfiguration().getAmazonSDBClient());
-        assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation());
-        assertFalse(endpoint.getConfiguration().isConsistentRead());
-        assertNull(endpoint.getConfiguration().getMaxNumberOfDomains());
-    }
-
-    @Test
-    public void createEndpointWithMaximalConfiguration() throws Exception {
-        AmazonSDBClientMock mock = new AmazonSDBClientMock();
-
-        context.getRegistry().bind("amazonSDBClient", mock);
-
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        SdbEndpoint endpoint = (SdbEndpoint) component.createEndpoint(
-                "aws-sdb://TestDomain?amazonSDBClient=#amazonSDBClient&accessKey=xxx&secretKey=yyy&operation=DeleteAttributes&consistentRead=true"
-                                                                      + "&maxNumberOfDomains=5");
-
-        assertEquals("TestDomain", endpoint.getConfiguration().getDomainName());
-        assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
-        assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
-        assertNotNull(endpoint.getConfiguration().getAmazonSDBClient());
-        assertEquals(SdbOperations.DeleteAttributes, endpoint.getConfiguration().getOperation());
-        assertTrue(endpoint.getConfiguration().isConsistentRead());
-        assertEquals(Integer.valueOf(5), endpoint.getConfiguration().getMaxNumberOfDomains());
-    }
-
-    @Test
-    public void createEndpointWithoutDomainName() throws Exception {
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        assertThrows(IllegalArgumentException.class,
-                () -> component.createEndpoint("aws-sdb:// "));
-    }
-
-    @Test
-    public void createEndpointWithoutAmazonSDBClientConfiguration() throws Exception {
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        assertThrows(IllegalArgumentException.class,
-                () -> component.createEndpoint("aws-sdb://TestDomain"));
-    }
-
-    @Test
-    public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        assertThrows(IllegalArgumentException.class,
-                () -> component.createEndpoint("aws-sdb://TestDomain?secretKey=yyy"));
-    }
-
-    @Test
-    public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        assertThrows(IllegalArgumentException.class,
-                () -> component.createEndpoint("aws-sdb://TestDomain?accessKey=xxx"));
-    }
-
-    @Test
-    public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration() throws Exception {
-        AmazonSDBClientMock mock = new AmazonSDBClientMock();
-
-        context.getRegistry().bind("amazonSDBClient", mock);
-
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        component.createEndpoint("aws-sdb://TestDomain?amazonSDBClient=#amazonSDBClient");
-    }
-
-    @Test
-    public void createEndpointWithComponentEndpointElementsAndProxy() throws Exception {
-        AmazonSDBClientMock mock = new AmazonSDBClientMock();
-
-        context.getRegistry().bind("amazonSDBClient", mock);
-        SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
-        SdbEndpoint endpoint = (SdbEndpoint) component
-                .createEndpoint(
-                        "aws-sdb://TestDomain?amazonSDBClient=#amazonSDBClient&accessKey=xxx&secretKey=yyy&region=US_EAST_1&operation=DeleteAttributes&consistentRead=true"
-                                + "&maxNumberOfDomains=5&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
-
-        assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
-        assertEquals("yyy", 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-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
deleted file mode 100644
index f5ddec9..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
+++ /dev/null
@@ -1,301 +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.sdb;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Attribute;
-import com.amazonaws.services.simpledb.model.DeletableItem;
-import com.amazonaws.services.simpledb.model.Item;
-import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
-import com.amazonaws.services.simpledb.model.ReplaceableItem;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.impl.engine.DefaultProducerTemplate;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class SdbComponentSpringTest extends CamelSpringTestSupport {
-
-    private AmazonSDBClientMock amazonSDBClient;
-
-    @Override
-    @BeforeEach
-    public void setUp() throws Exception {
-        super.setUp();
-
-        amazonSDBClient = context.getRegistry().lookupByNameAndType("amazonSDBClient", AmazonSDBClientMock.class);
-    }
-
-    @Test
-    public void doesntCreateDomainOnStartIfExists() throws Exception {
-        assertNull(amazonSDBClient.createDomainRequest);
-    }
-
-    @Test
-    public void createDomainOnStartIfNotExists() throws Exception {
-        DefaultProducerTemplate.newInstance(context,
-                "aws-sdb://NonExistingDomain?amazonSDBClient=#amazonSDBClient&operation=GetAttributes");
-
-        assertEquals("NonExistingDomain", amazonSDBClient.createDomainRequest.getDomainName());
-    }
-
-    @Test
-    public void batchDeleteAttributes() {
-        final List<DeletableItem> deletableItems = Arrays.asList(new DeletableItem[] {
-                new DeletableItem("ITEM1", null),
-                new DeletableItem("ITEM2", null) });
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.BatchDeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.batchDeleteAttributesRequest.getDomainName());
-        assertEquals(deletableItems, amazonSDBClient.batchDeleteAttributesRequest.getItems());
-    }
-
-    @Test
-    public void batchPutAttributes() {
-        final List<ReplaceableItem> replaceableItems = Arrays.asList(new ReplaceableItem[] {
-                new ReplaceableItem("ITEM1") });
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.BatchPutAttributes);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.batchPutAttributesRequest.getDomainName());
-        assertEquals(replaceableItems, amazonSDBClient.batchPutAttributesRequest.getItems());
-    }
-
-    @Test
-    public void deleteAttributes() {
-        final List<Attribute> attributes = Arrays.asList(new Attribute[] {
-                new Attribute("NAME1", "VALUE1") });
-        final UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.deleteAttributesRequest.getDomainName());
-        assertEquals("ITEM1", amazonSDBClient.deleteAttributesRequest.getItemName());
-        assertEquals(condition, amazonSDBClient.deleteAttributesRequest.getExpected());
-        assertEquals(attributes, amazonSDBClient.deleteAttributesRequest.getAttributes());
-    }
-
-    @Test
-    public void deleteAttributesItemNameIsRequired() {
-        final List<Attribute> attributes = Arrays.asList(new Attribute[] {
-                new Attribute("NAME1", "VALUE1") });
-        final UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-            }
-        });
-
-        Exception exception = exchange.getException();
-        assertTrue(exception instanceof IllegalArgumentException);
-    }
-
-    @Test
-    public void deleteDomain() {
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteDomain);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.deleteDomainRequest.getDomainName());
-    }
-
-    @Test
-    public void domainMetadata() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DomainMetadata);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.domainMetadataRequest.getDomainName());
-
-        assertEquals(Integer.valueOf(10), exchange.getIn().getHeader(SdbConstants.TIMESTAMP));
-        assertEquals(Integer.valueOf(11), exchange.getIn().getHeader(SdbConstants.ITEM_COUNT));
-        assertEquals(Integer.valueOf(12), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_COUNT));
-        assertEquals(Integer.valueOf(13), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_COUNT));
-        assertEquals(Long.valueOf(1000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_SIZE));
-        assertEquals(Long.valueOf(2000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_SIZE));
-        assertEquals(Long.valueOf(3000000), exchange.getIn().getHeader(SdbConstants.ITEM_NAME_SIZE));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void getAttributes() {
-        final List<String> attributeNames = Arrays.asList(new String[] { "ATTRIBUTE1" });
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.getAttributesRequest.getDomainName());
-        assertEquals("ITEM1", amazonSDBClient.getAttributesRequest.getItemName());
-        assertEquals(Boolean.TRUE, amazonSDBClient.getAttributesRequest.getConsistentRead());
-        assertEquals(attributeNames, amazonSDBClient.getAttributesRequest.getAttributeNames());
-
-        List<Attribute> attributes = exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, List.class);
-        assertEquals(2, attributes.size());
-        assertEquals("AttributeOne", attributes.get(0).getName());
-        assertEquals("Value One", attributes.get(0).getValue());
-        assertEquals("AttributeTwo", attributes.get(1).getName());
-        assertEquals("Value Two", attributes.get(1).getValue());
-    }
-
-    @Test
-    public void getAttributesItemNameIsRequired() {
-        final List<String> attributeNames = Arrays.asList(new String[] { "ATTRIBUTE1" });
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-            }
-        });
-
-        Exception exception = exchange.getException();
-        assertTrue(exception instanceof IllegalArgumentException);
-    }
-
-    @SuppressWarnings({ "unchecked" })
-    @Test
-    public void listDomains() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.ListDomains);
-                exchange.getIn().setHeader(SdbConstants.MAX_NUMBER_OF_DOMAINS, Integer.valueOf(5));
-                exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-            }
-        });
-
-        assertEquals(Integer.valueOf(5), amazonSDBClient.listDomainsRequest.getMaxNumberOfDomains());
-        assertEquals("TOKEN1", amazonSDBClient.listDomainsRequest.getNextToken());
-
-        List<String> domains = exchange.getIn().getHeader(SdbConstants.DOMAIN_NAMES, List.class);
-        assertEquals("TOKEN2", exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN));
-        assertEquals(2, domains.size());
-        assertTrue(domains.contains("DOMAIN1"));
-        assertTrue(domains.contains("DOMAIN2"));
-    }
-
-    @Test
-    public void putAttributes() {
-        final List<ReplaceableAttribute> replaceableAttributes = Arrays.asList(new ReplaceableAttribute[] {
-                new ReplaceableAttribute("NAME1", "VALUE1", true) });
-        final UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.putAttributesRequest.getDomainName());
-        assertEquals("ITEM1", amazonSDBClient.putAttributesRequest.getItemName());
-        assertEquals(updateCondition, amazonSDBClient.putAttributesRequest.getExpected());
-        assertEquals(replaceableAttributes, amazonSDBClient.putAttributesRequest.getAttributes());
-    }
-
-    @Test
-    public void putAttributesItemNameIsRequired() {
-        final List<ReplaceableAttribute> replaceableAttributes = Arrays.asList(new ReplaceableAttribute[] {
-                new ReplaceableAttribute("NAME1", "VALUE1", true) });
-        final UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-            }
-        });
-
-        Exception exception = exchange.getException();
-        assertTrue(exception instanceof IllegalArgumentException);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void select() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.Select);
-                exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.SELECT_EXPRESSION,
-                        "SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'");
-            }
-        });
-
-        assertEquals(Boolean.TRUE, amazonSDBClient.selectRequest.getConsistentRead());
-        assertEquals("TOKEN1", amazonSDBClient.selectRequest.getNextToken());
-        assertEquals("SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'",
-                amazonSDBClient.selectRequest.getSelectExpression());
-
-        List<Item> items = exchange.getIn().getHeader(SdbConstants.ITEMS, List.class);
-        assertEquals("TOKEN2", exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN));
-        assertEquals(2, items.size());
-        assertEquals("ITEM1", items.get(0).getName());
-        assertEquals("ITEM2", items.get(1).getName());
-    }
-
-    @Override
-    protected AbstractApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext(
-                "org/apache/camel/component/aws/sdb/SDBComponentSpringTest-context.xml");
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
deleted file mode 100644
index 1b53ac1..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
+++ /dev/null
@@ -1,298 +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.sdb;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Attribute;
-import com.amazonaws.services.simpledb.model.DeletableItem;
-import com.amazonaws.services.simpledb.model.Item;
-import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
-import com.amazonaws.services.simpledb.model.ReplaceableItem;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.engine.DefaultProducerTemplate;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class SdbComponentTest extends CamelTestSupport {
-
-    @BindToRegistry("amazonSDBClient")
-    private AmazonSDBClientMock amazonSDBClient = new AmazonSDBClientMock();
-
-    @Test
-    public void doesntCreateDomainOnStartIfExists() throws Exception {
-        assertNull(amazonSDBClient.createDomainRequest);
-    }
-
-    @Test
-    public void createDomainOnStartIfNotExists() throws Exception {
-        DefaultProducerTemplate.newInstance(context,
-                "aws-sdb://NonExistingDomain?amazonSDBClient=#amazonSDBClient&operation=GetAttributes");
-
-        assertEquals("NonExistingDomain", amazonSDBClient.createDomainRequest.getDomainName());
-    }
-
-    @Test
-    public void batchDeleteAttributes() {
-        final List<DeletableItem> deletableItems = Arrays.asList(new DeletableItem[] {
-                new DeletableItem("ITEM1", null),
-                new DeletableItem("ITEM2", null) });
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.BatchDeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.batchDeleteAttributesRequest.getDomainName());
-        assertEquals(deletableItems, amazonSDBClient.batchDeleteAttributesRequest.getItems());
-    }
-
-    @Test
-    public void batchPutAttributes() {
-        final List<ReplaceableItem> replaceableItems = Arrays.asList(new ReplaceableItem[] {
-                new ReplaceableItem("ITEM1") });
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.BatchPutAttributes);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.batchPutAttributesRequest.getDomainName());
-        assertEquals(replaceableItems, amazonSDBClient.batchPutAttributesRequest.getItems());
-    }
-
-    @Test
-    public void deleteAttributes() {
-        final List<Attribute> attributes = Arrays.asList(new Attribute[] {
-                new Attribute("NAME1", "VALUE1") });
-        final UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.deleteAttributesRequest.getDomainName());
-        assertEquals("ITEM1", amazonSDBClient.deleteAttributesRequest.getItemName());
-        assertEquals(condition, amazonSDBClient.deleteAttributesRequest.getExpected());
-        assertEquals(attributes, amazonSDBClient.deleteAttributesRequest.getAttributes());
-    }
-
-    @Test
-    public void deleteAttributesItemNameIsRequired() {
-        final List<Attribute> attributes = Arrays.asList(new Attribute[] {
-                new Attribute("NAME1", "VALUE1") });
-        final UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-            }
-        });
-
-        Exception exception = exchange.getException();
-        assertTrue(exception instanceof IllegalArgumentException);
-    }
-
-    @Test
-    public void deleteDomain() {
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteDomain);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.deleteDomainRequest.getDomainName());
-    }
-
-    @Test
-    public void domainMetadata() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DomainMetadata);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.domainMetadataRequest.getDomainName());
-
-        assertEquals(Integer.valueOf(10), exchange.getIn().getHeader(SdbConstants.TIMESTAMP));
-        assertEquals(Integer.valueOf(11), exchange.getIn().getHeader(SdbConstants.ITEM_COUNT));
-        assertEquals(Integer.valueOf(12), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_COUNT));
-        assertEquals(Integer.valueOf(13), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_COUNT));
-        assertEquals(Long.valueOf(1000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_SIZE));
-        assertEquals(Long.valueOf(2000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_SIZE));
-        assertEquals(Long.valueOf(3000000), exchange.getIn().getHeader(SdbConstants.ITEM_NAME_SIZE));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void getAttributes() {
-        final List<String> attributeNames = Arrays.asList(new String[] { "ATTRIBUTE1" });
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.getAttributesRequest.getDomainName());
-        assertEquals("ITEM1", amazonSDBClient.getAttributesRequest.getItemName());
-        assertEquals(Boolean.TRUE, amazonSDBClient.getAttributesRequest.getConsistentRead());
-        assertEquals(attributeNames, amazonSDBClient.getAttributesRequest.getAttributeNames());
-
-        List<Attribute> attributes = exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, List.class);
-        assertEquals(2, attributes.size());
-        assertEquals("AttributeOne", attributes.get(0).getName());
-        assertEquals("Value One", attributes.get(0).getValue());
-        assertEquals("AttributeTwo", attributes.get(1).getName());
-        assertEquals("Value Two", attributes.get(1).getValue());
-    }
-
-    @Test
-    public void getAttributesItemNameIsRequired() {
-        final List<String> attributeNames = Arrays.asList(new String[] { "ATTRIBUTE1" });
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-            }
-        });
-
-        Exception exception = exchange.getException();
-        assertTrue(exception instanceof IllegalArgumentException);
-    }
-
-    @SuppressWarnings({ "unchecked" })
-    @Test
-    public void listDomains() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.ListDomains);
-                exchange.getIn().setHeader(SdbConstants.MAX_NUMBER_OF_DOMAINS, Integer.valueOf(5));
-                exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-            }
-        });
-
-        assertEquals(Integer.valueOf(5), amazonSDBClient.listDomainsRequest.getMaxNumberOfDomains());
-        assertEquals("TOKEN1", amazonSDBClient.listDomainsRequest.getNextToken());
-
-        List<String> domains = exchange.getIn().getHeader(SdbConstants.DOMAIN_NAMES, List.class);
-        assertEquals("TOKEN2", exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN));
-        assertEquals(2, domains.size());
-        assertTrue(domains.contains("DOMAIN1"));
-        assertTrue(domains.contains("DOMAIN2"));
-    }
-
-    @Test
-    public void putAttributes() {
-        final List<ReplaceableAttribute> replaceableAttributes = Arrays.asList(new ReplaceableAttribute[] {
-                new ReplaceableAttribute("NAME1", "VALUE1", true) });
-        final UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-            }
-        });
-
-        assertEquals("TestDomain", amazonSDBClient.putAttributesRequest.getDomainName());
-        assertEquals("ITEM1", amazonSDBClient.putAttributesRequest.getItemName());
-        assertEquals(updateCondition, amazonSDBClient.putAttributesRequest.getExpected());
-        assertEquals(replaceableAttributes, amazonSDBClient.putAttributesRequest.getAttributes());
-    }
-
-    @Test
-    public void putAttributesItemNameIsRequired() {
-        final List<ReplaceableAttribute> replaceableAttributes = Arrays.asList(new ReplaceableAttribute[] {
-                new ReplaceableAttribute("NAME1", "VALUE1", true) });
-        final UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-            }
-        });
-
-        Exception exception = exchange.getException();
-        assertTrue(exception instanceof IllegalArgumentException);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void select() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.Select);
-                exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.SELECT_EXPRESSION,
-                        "SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'");
-            }
-        });
-
-        assertEquals(Boolean.TRUE, amazonSDBClient.selectRequest.getConsistentRead());
-        assertEquals("TOKEN1", amazonSDBClient.selectRequest.getNextToken());
-        assertEquals("SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'",
-                amazonSDBClient.selectRequest.getSelectExpression());
-
-        List<Item> items = exchange.getIn().getHeader(SdbConstants.ITEMS, List.class);
-        assertEquals("TOKEN2", exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN));
-        assertEquals(2, items.size());
-        assertEquals("ITEM1", items.get(0).getName());
-        assertEquals("ITEM2", items.get(1).getName());
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:start")
-                        .to("aws-sdb://TestDomain?amazonSDBClient=#amazonSDBClient&operation=GetAttributes");
-            }
-        };
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.java
deleted file mode 100644
index de0e805..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,74 +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.sdb;
-
-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 SdbComponentVerifierExtensionTest extends CamelTestSupport {
-
-    // *************************************************
-    // Tests (parameters)
-    // *************************************************
-    @Override
-    public boolean isUseRouteBuilder() {
-        return false;
-    }
-
-    @Test
-    public void testParameters() throws Exception {
-        Component component = context().getComponent("aws-sdb");
-
-        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("domainName", "domain1");
-
-        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-sdb");
-        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("domainName", "domain1");
-
-        ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
-
-        assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
-    }
-
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java
deleted file mode 100644
index 8aecb28..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java
+++ /dev/null
@@ -1,55 +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.sdb;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class SdbOperationsTest {
-
-    @Test
-    public void supportedOperationCount() {
-        assertEquals(9, SdbOperations.values().length);
-    }
-
-    @Test
-    public void valueOf() {
-        assertEquals(SdbOperations.BatchDeleteAttributes, SdbOperations.valueOf("BatchDeleteAttributes"));
-        assertEquals(SdbOperations.BatchPutAttributes, SdbOperations.valueOf("BatchPutAttributes"));
-        assertEquals(SdbOperations.DeleteAttributes, SdbOperations.valueOf("DeleteAttributes"));
-        assertEquals(SdbOperations.DeleteDomain, SdbOperations.valueOf("DeleteDomain"));
-        assertEquals(SdbOperations.DomainMetadata, SdbOperations.valueOf("DomainMetadata"));
-        assertEquals(SdbOperations.GetAttributes, SdbOperations.valueOf("GetAttributes"));
-        assertEquals(SdbOperations.ListDomains, SdbOperations.valueOf("ListDomains"));
-        assertEquals(SdbOperations.PutAttributes, SdbOperations.valueOf("PutAttributes"));
-        assertEquals(SdbOperations.Select, SdbOperations.valueOf("Select"));
-    }
-
-    @Test
-    public void testToString() {
-        assertEquals("BatchDeleteAttributes", SdbOperations.BatchDeleteAttributes.toString());
-        assertEquals("BatchPutAttributes", SdbOperations.BatchPutAttributes.toString());
-        assertEquals("DeleteAttributes", SdbOperations.DeleteAttributes.toString());
-        assertEquals("DeleteDomain", SdbOperations.DeleteDomain.toString());
-        assertEquals("DomainMetadata", SdbOperations.DomainMetadata.toString());
-        assertEquals("GetAttributes", SdbOperations.GetAttributes.toString());
-        assertEquals("ListDomains", SdbOperations.ListDomains.toString());
-        assertEquals("PutAttributes", SdbOperations.PutAttributes.toString());
-        assertEquals("Select", SdbOperations.Select.toString());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
deleted file mode 100644
index 5a65126..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.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.sdb;
-
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Item;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-public class SelectCommandTest {
-
-    private SelectCommand command;
-    private AmazonSDBClientMock sdbClient;
-    private SdbConfiguration configuration;
-    private Exchange exchange;
-
-    @BeforeEach
-    public void setUp() {
-        sdbClient = new AmazonSDBClientMock();
-        configuration = new SdbConfiguration();
-        configuration.setDomainName("DOMAIN1");
-        configuration.setConsistentRead(Boolean.TRUE);
-        exchange = new DefaultExchange(new DefaultCamelContext());
-
-        command = new SelectCommand(sdbClient, configuration, exchange);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void execute() {
-        exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-        exchange.getIn().setHeader(SdbConstants.SELECT_EXPRESSION, "SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'");
-
-        command.execute();
-
-        assertEquals(Boolean.TRUE, sdbClient.selectRequest.getConsistentRead());
-        assertEquals("TOKEN1", sdbClient.selectRequest.getNextToken());
-        assertEquals("SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'", sdbClient.selectRequest.getSelectExpression());
-
-        List<Item> items = exchange.getIn().getHeader(SdbConstants.ITEMS, List.class);
-        assertEquals("TOKEN2", exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN));
-        assertEquals(2, items.size());
-        assertEquals("ITEM1", items.get(0).getName());
-        assertEquals("ITEM2", items.get(1).getName());
-    }
-
-    @Test
-    public void determineSelectExpression() {
-        assertNull(this.command.determineSelectExpression());
-
-        exchange.getIn().setHeader(SdbConstants.SELECT_EXPRESSION, "SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'");
-
-        assertEquals("SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'", this.command.determineSelectExpression());
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
deleted file mode 100644
index bfd4faf..0000000
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
+++ /dev/null
@@ -1,180 +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.sdb.integration;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.amazonaws.services.simpledb.model.Attribute;
-import com.amazonaws.services.simpledb.model.DeletableItem;
-import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
-import com.amazonaws.services.simpledb.model.ReplaceableItem;
-import com.amazonaws.services.simpledb.model.UpdateCondition;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws.sdb.SdbConstants;
-import org.apache.camel.component.aws.sdb.SdbOperations;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
-public class SdbComponentIntegrationTest extends CamelTestSupport {
-
-    @Test
-    public void batchDeleteAttributes() {
-        final List<DeletableItem> deletableItems = Arrays.asList(new DeletableItem[] {
-                new DeletableItem("ITEM1", null),
-                new DeletableItem("ITEM2", null) });
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.BatchDeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
-            }
-        });
-    }
-
-    @Test
-    public void batchPutAttributes() {
-        final List<ReplaceableItem> replaceableItems = Arrays.asList(new ReplaceableItem[] {
-                new ReplaceableItem("ITEM1") });
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.BatchPutAttributes);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
-            }
-        });
-    }
-
-    @Test
-    public void deleteAttributes() {
-        final List<Attribute> attributes = Arrays.asList(new Attribute[] {
-                new Attribute("NAME1", "VALUE1") });
-        final UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteAttributes);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-            }
-        });
-    }
-
-    @Test
-    public void deleteDomain() {
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DeleteDomain);
-            }
-        });
-    }
-
-    @Test
-    public void domainMetadata() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.DomainMetadata);
-            }
-        });
-
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.TIMESTAMP));
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ITEM_COUNT));
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_COUNT));
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_COUNT));
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_NAME_SIZE));
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_SIZE));
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ITEM_NAME_SIZE));
-    }
-
-    @Test
-    public void getAttributes() {
-        final List<String> attributeNames = Arrays.asList(new String[] { "ATTRIBUTE1" });
-
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-            }
-        });
-
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, List.class));
-    }
-
-    @Test
-    public void listDomains() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.ListDomains);
-                exchange.getIn().setHeader(SdbConstants.MAX_NUMBER_OF_DOMAINS, Integer.valueOf(5));
-                exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-            }
-        });
-
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.DOMAIN_NAMES, List.class));
-    }
-
-    @Test
-    public void putAttributes() {
-        final List<ReplaceableAttribute> replaceableAttributes = Arrays.asList(new ReplaceableAttribute[] {
-                new ReplaceableAttribute("NAME1", "VALUE1", true) });
-        final UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
-
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);
-                exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
-                exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-                exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
-            }
-        });
-    }
-
-    @Test
-    public void select() {
-        Exchange exchange = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.Select);
-                exchange.getIn().setHeader(SdbConstants.NEXT_TOKEN, "TOKEN1");
-                exchange.getIn().setHeader(SdbConstants.CONSISTENT_READ, Boolean.TRUE);
-                exchange.getIn().setHeader(SdbConstants.SELECT_EXPRESSION,
-                        "SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'");
-            }
-        });
-
-        assertNotNull(exchange.getIn().getHeader(SdbConstants.ITEMS, List.class));
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:start")
-                        .to("aws-sdb://TestDomain?accessKey=xxx&secretKey=yyy&operation=GetAttributes");
-            }
-        };
-    }
-}
diff --git a/components/camel-aws-sdb/src/test/resources/log4j2.properties b/components/camel-aws-sdb/src/test/resources/log4j2.properties
deleted file mode 100644
index 8d11a42..0000000
--- a/components/camel-aws-sdb/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-sdb-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-sdb/src/test/resources/org/apache/camel/component/aws/sdb/SDBComponentSpringTest-context.xml b/components/camel-aws-sdb/src/test/resources/org/apache/camel/component/aws/sdb/SDBComponentSpringTest-context.xml
deleted file mode 100644
index 3178644..0000000
--- a/components/camel-aws-sdb/src/test/resources/org/apache/camel/component/aws/sdb/SDBComponentSpringTest-context.xml
+++ /dev/null
@@ -1,34 +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:start"/>
-            <to uri="aws-sdb://TestDomain?amazonSDBClient=#amazonSDBClient&amp;operation=GetAttributes"/>
-        </route>
-    </camelContext>
-
-    <bean id="amazonSDBClient" class="org.apache.camel.component.aws.sdb.AmazonSDBClientMock"/>
-</beans>
\ No newline at end of file
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index d6649e9..446ad0d 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -85,4 +85,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+    <version>3.8.0</version>
+    <configuration>
+        <release>16</release>  <!--or <release>10</release>-->
+    </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/components/pom.xml b/components/pom.xml
index b63b953..fffdd40 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -119,7 +119,6 @@
         <module>camel-aws-mq</module>
         <module>camel-aws-msk</module>
         <module>camel-aws-s3</module>
-        <module>camel-aws-sdb</module>
         <module>camel-aws-ses</module>
         <module>camel-aws-sns</module>
         <module>camel-aws-sqs</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index d1862bf..52b8895 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -921,11 +921,6 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-aws-sdb</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.camel</groupId>
 				<artifactId>camel-aws-ses</artifactId>
 				<version>${project.version}</version>
 			</dependency>