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/23 07:14:29 UTC
[camel-spring-boot] branch master updated (f4f4fbf -> e0f9100)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from f4f4fbf [create-pull-request] automated change
new 99589ae CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
new be64f65 CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
new 987aaea CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
new f3163a0 CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
new e0f9100 CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/springboot/catalog/components.properties | 1 -
.../springboot/catalog/components/aws-iam.json | 52 ------
components-starter/README.adoc | 4 +-
components-starter/camel-aws-iam-starter/pom.xml | 57 ------
.../src/main/docs/aws-iam-starter.adoc | 41 ----
.../springboot/IAMComponentAutoConfiguration.java | 79 --------
.../iam/springboot/IAMComponentConfiguration.java | 206 ---------------------
.../aws/iam/springboot/IAMComponentConverter.java | 67 -------
.../src/main/resources/META-INF/LICENSE.txt | 203 --------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../src/main/resources/META-INF/spring.factories | 21 ---
.../src/main/resources/META-INF/spring.provides | 17 --
components-starter/camel-corda-starter/pom.xml | 8 +
components-starter/camel-iota-starter/pom.xml | 12 ++
components-starter/pom.xml | 1 -
docs/modules/ROOT/pages/aws-iam-starter.adoc | 41 ----
docs/modules/ROOT/pages/list.adoc | 4 +-
.../camel/itest/springboot/CamelAwsIamTest.java | 48 -----
tooling/camel-spring-boot-bom/pom.xml | 5 -
tooling/camel-spring-boot-dependencies/pom.xml | 10 -
20 files changed, 22 insertions(+), 866 deletions(-)
delete mode 100644 catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json
delete mode 100644 components-starter/camel-aws-iam-starter/pom.xml
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/docs/aws-iam-starter.adoc
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories
delete mode 100644 components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.provides
delete mode 100644 docs/modules/ROOT/pages/aws-iam-starter.adoc
delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsIamTest.java
[camel-spring-boot] 01/05: CAMEL-16115 - Remove Camel-AWS-*
components - AWS-IAM
Posted by ac...@apache.org.
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-spring-boot.git
commit 99589ae8d7a80fc124a22e6fa23840048e9677e4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 23 08:03:56 2021 +0100
CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
---
components-starter/camel-aws-iam-starter/pom.xml | 57 ------
.../src/main/docs/aws-iam-starter.adoc | 41 ----
.../springboot/IAMComponentAutoConfiguration.java | 79 --------
.../iam/springboot/IAMComponentConfiguration.java | 206 ---------------------
.../aws/iam/springboot/IAMComponentConverter.java | 67 -------
.../src/main/resources/META-INF/LICENSE.txt | 203 --------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../src/main/resources/META-INF/spring.factories | 21 ---
.../src/main/resources/META-INF/spring.provides | 17 --
components-starter/pom.xml | 1 -
tooling/camel-spring-boot-bom/pom.xml | 5 -
tooling/camel-spring-boot-dependencies/pom.xml | 10 -
12 files changed, 718 deletions(-)
diff --git a/components-starter/camel-aws-iam-starter/pom.xml b/components-starter/camel-aws-iam-starter/pom.xml
deleted file mode 100644
index 8b9c875..0000000
--- a/components-starter/camel-aws-iam-starter/pom.xml
+++ /dev/null
@@ -1,57 +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.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>3.9.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-aws-iam-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: AWS IAM</name>
- <description>Spring-Boot Starter for A Camel Amazon IAM Web Service Component</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-iam</artifactId>
- <version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-aws-iam-starter/src/main/docs/aws-iam-starter.adoc b/components-starter/camel-aws-iam-starter/src/main/docs/aws-iam-starter.adoc
deleted file mode 100644
index 49adf18..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/docs/aws-iam-starter.adoc
+++ /dev/null
@@ -1,41 +0,0 @@
-// spring-boot-auto-configure options: START
-:page-partial:
-:doctitle: Camel Spring Boot Starter for aws-iam
-
-== Spring Boot Auto-Configuration
-
-When using aws-iam with Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-aws-iam-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
-The component supports 13 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.aws-iam.access-key* | Amazon AWS Access Key | | String
-| *camel.component.aws-iam.auto-discover-client* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | Boolean
-| *camel.component.aws-iam.autowired-enabled* | 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
-| *camel.component.aws-iam.configuration* | The component configuration. The option is a org.apache.camel.component.aws.iam.IAMConfiguration type. | | IAMConfiguration
-| *camel.component.aws-iam.enabled* | Whether to enable auto configuration of the aws-iam component. This is enabled by default. | | Boolean
-| *camel.component.aws-iam.iam-client* | To use a existing configured AWS IAM as client. The option is a com.amazonaws.services.identitymanagement.AmazonIdentityManagement type. | | AmazonIdentityManagement
-| *camel.component.aws-iam.lazy-start-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 th [...]
-| *camel.component.aws-iam.operation* | The operation to perform | | IAMOperations
-| *camel.component.aws-iam.proxy-host* | To define a proxy host when instantiating the IAM client | | String
-| *camel.component.aws-iam.proxy-port* | To define a proxy port when instantiating the IAM client | | Integer
-| *camel.component.aws-iam.proxy-protocol* | To define a proxy protocol when instantiating the IAM client | | Protocol
-| *camel.component.aws-iam.region* | The region in which IAM 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
-| *camel.component.aws-iam.secret-key* | Amazon AWS Secret Key | | String
-|===
-// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java
deleted file mode 100644
index b56f6b2..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java
+++ /dev/null
@@ -1,79 +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.iam.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
-import org.apache.camel.component.aws.iam.IAMComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@Configuration(proxyBeanMethods = false)
-@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,IAMComponentConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-iam"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, IAMComponentConverter.class})
-public class IAMComponentAutoConfiguration {
-
- @Autowired
- private ApplicationContext applicationContext;
- private final CamelContext camelContext;
- @Autowired
- private IAMComponentConfiguration configuration;
-
- public IAMComponentAutoConfiguration(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
-
- @Lazy
- @Bean
- public ComponentCustomizer configureIAMComponent() {
- return new ComponentCustomizer() {
- @Override
- public void configure(String name, Component target) {
- CamelPropertiesHelper.copyProperties(camelContext, configuration, target);
- }
- @Override
- public boolean isEnabled(String name, Component target) {
- return HierarchicalPropertiesEvaluator.evaluate(
- applicationContext,
- "camel.component.customizer",
- "camel.component.aws-iam.customizer")
- && target instanceof IAMComponent;
- }
- };
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
deleted file mode 100644
index 780b821..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
+++ /dev/null
@@ -1,206 +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.iam.springboot;
-
-import javax.annotation.Generated;
-import com.amazonaws.Protocol;
-import com.amazonaws.services.identitymanagement.AmazonIdentityManagement;
-import org.apache.camel.component.aws.iam.IAMComponent;
-import org.apache.camel.component.aws.iam.IAMConfiguration;
-import org.apache.camel.component.aws.iam.IAMOperations;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Manage AWS IAM instances.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.aws-iam")
-public class IAMComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the aws-iam component. This is
- * enabled by default.
- */
- private Boolean enabled;
- /**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- */
- private Boolean autoDiscoverClient = true;
- /**
- * Amazon AWS Access Key
- */
- private String accessKey;
- /**
- * The component configuration. The option is a
- * org.apache.camel.component.aws.iam.IAMConfiguration type.
- */
- private IAMConfiguration configuration;
- /**
- * To use a existing configured AWS IAM as client. The option is a
- * com.amazonaws.services.identitymanagement.AmazonIdentityManagement type.
- */
- private AmazonIdentityManagement iamClient;
- /**
- * 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 starting the producer may take a little time
- * and prolong the total processing time of the processing.
- */
- private Boolean lazyStartProducer = false;
- /**
- * The operation to perform
- */
- private IAMOperations operation;
- /**
- * To define a proxy host when instantiating the IAM client
- */
- private String proxyHost;
- /**
- * To define a proxy port when instantiating the IAM client
- */
- private Integer proxyPort;
- /**
- * To define a proxy protocol when instantiating the IAM client
- */
- private Protocol proxyProtocol = Protocol.HTTPS;
- /**
- * The region in which IAM 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()
- */
- private String region;
- /**
- * Amazon AWS Secret Key
- */
- private String secretKey;
- /**
- * 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.
- */
- private Boolean autowiredEnabled = true;
-
- public Boolean getAutoDiscoverClient() {
- return autoDiscoverClient;
- }
-
- public void setAutoDiscoverClient(Boolean autoDiscoverClient) {
- this.autoDiscoverClient = autoDiscoverClient;
- }
-
- public String getAccessKey() {
- return accessKey;
- }
-
- public void setAccessKey(String accessKey) {
- this.accessKey = accessKey;
- }
-
- public IAMConfiguration getConfiguration() {
- return configuration;
- }
-
- public void setConfiguration(IAMConfiguration configuration) {
- this.configuration = configuration;
- }
-
- public AmazonIdentityManagement getIamClient() {
- return iamClient;
- }
-
- public void setIamClient(AmazonIdentityManagement iamClient) {
- this.iamClient = iamClient;
- }
-
- public Boolean getLazyStartProducer() {
- return lazyStartProducer;
- }
-
- public void setLazyStartProducer(Boolean lazyStartProducer) {
- this.lazyStartProducer = lazyStartProducer;
- }
-
- public IAMOperations getOperation() {
- return operation;
- }
-
- public void setOperation(IAMOperations operation) {
- this.operation = operation;
- }
-
- public String getProxyHost() {
- return proxyHost;
- }
-
- public void setProxyHost(String proxyHost) {
- this.proxyHost = proxyHost;
- }
-
- public Integer getProxyPort() {
- return proxyPort;
- }
-
- public void setProxyPort(Integer proxyPort) {
- this.proxyPort = proxyPort;
- }
-
- public Protocol getProxyProtocol() {
- return proxyProtocol;
- }
-
- public void setProxyProtocol(Protocol proxyProtocol) {
- this.proxyProtocol = proxyProtocol;
- }
-
- public String getRegion() {
- return region;
- }
-
- public void setRegion(String region) {
- this.region = region;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public Boolean getAutowiredEnabled() {
- return autowiredEnabled;
- }
-
- public void setAutowiredEnabled(Boolean autowiredEnabled) {
- this.autowiredEnabled = autowiredEnabled;
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java
deleted file mode 100644
index 6438b5e..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java
+++ /dev/null
@@ -1,67 +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.iam.springboot;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.annotation.Generated;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.stereotype.Component;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@Configuration(proxyBeanMethods = false)
-@ConfigurationPropertiesBinding
-@Component
-public class IAMComponentConverter implements GenericConverter {
-
- @Autowired
- private ApplicationContext applicationContext;
-
- public Set<ConvertiblePair> getConvertibleTypes() {
- Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, org.apache.camel.component.aws.iam.IAMConfiguration.class));
- answer.add(new ConvertiblePair(String.class, com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class));
- return answer;
- }
-
- public Object convert(
- Object source,
- TypeDescriptor sourceType,
- TypeDescriptor targetType) {
- if (source == null) {
- return null;
- }
- String ref = source.toString();
- if (!ref.startsWith("#")) {
- return null;
- }
- ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
- switch (targetType.getName()) {
- case "org.apache.camel.component.aws.iam.IAMConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.iam.IAMConfiguration.class);
- case "com.amazonaws.services.identitymanagement.AmazonIdentityManagement": return applicationContext.getBean(ref, com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class);
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 7eff5f5..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,21 +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.
-## ---------------------------------------------------------------------------
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.iam.springboot.IAMComponentAutoConfiguration,\
-org.apache.camel.component.aws.iam.springboot.IAMComponentConverter
-
diff --git a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.provides b/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index f259511..0000000
--- a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1,17 +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.
-## ---------------------------------------------------------------------------
-provides: camel-aws-iam
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 3211757..69bd446 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -131,7 +131,6 @@
<module>camel-aws-ec2-starter</module>
<module>camel-aws-ecs-starter</module>
<module>camel-aws-eks-starter</module>
- <module>camel-aws-iam-starter</module>
<module>camel-aws-s3-starter</module>
<module>camel-aws-swf-starter</module>
<module>camel-aws-xray-starter</module>
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 8c5c468..097b2f9 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -145,11 +145,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-aws-iam-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-aws-s3-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index daae211..6960c9f 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -348,11 +348,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-aws-iam-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-aws-s3-starter</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2104,11 +2099,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-iam</artifactId>
- <version>3.9.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-aws-s3</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
[camel-spring-boot] 05/05: CAMEL-16115 - Remove Camel-AWS-*
components - AWS-IAM
Posted by ac...@apache.org.
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-spring-boot.git
commit e0f9100d46984e32fb3a20115672b2502424ece1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 23 08:13:47 2021 +0100
CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
---
.../apache/camel/springboot/catalog/components.properties | 2 +-
components-starter/README.adoc | 2 +-
components-starter/camel-corda-starter/pom.xml | 8 ++++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++
docs/modules/ROOT/pages/list.adoc | 2 +-
5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 7a1e007..90f6f68 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -349,4 +349,4 @@ xslt-saxon
yammer
zendesk
zookeeper
-zookeeper-master
+zookeeper-master
\ No newline at end of file
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index 366ee47..3a3a656 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts as Spring Boot S
== Camel Components
// components: START
-Number of Camel components: 337 in 271 JAR artifacts (12 deprecated)
+Number of Camel components: 336 in 270 JAR artifacts (11 deprecated)
[width="100%",cols="4,3,3,3,6",options="header"]
|===
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index b215b27..4aa7023 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
<!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml
index 1cdd52f..3656ac0 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index 366ee47..3a3a656 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts as Spring Boot S
== Camel Components
// components: START
-Number of Camel components: 337 in 271 JAR artifacts (12 deprecated)
+Number of Camel components: 336 in 270 JAR artifacts (11 deprecated)
[width="100%",cols="4,3,3,3,6",options="header"]
|===
[camel-spring-boot] 04/05: CAMEL-16115 - Remove Camel-AWS-*
components - AWS-IAM
Posted by ac...@apache.org.
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-spring-boot.git
commit f3163a0278fdf4c2d0612d9812ca1b150cfdc74f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 23 08:09:24 2021 +0100
CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
---
.../camel/itest/springboot/CamelAwsIamTest.java | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsIamTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsIamTest.java
deleted file mode 100644
index 6fc8414..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsIamTest.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.itest.springboot;
-
-import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(Arquillian.class)
-public class CamelAwsIamTest extends AbstractSpringBootTestSupport {
-
- @Deployment
- public static Archive<?> createSpringBootPackage() throws Exception {
- return ArquillianPackager.springBootPackage(createTestConfig());
- }
-
- public static ITestConfig createTestConfig() {
- return new ITestConfigBuilder()
- .module(inferModuleName(CamelAwsIamTest.class))
- .build();
- }
-
- @Test
- public void componentTests() throws Exception {
- this.runComponentTest(config);
- this.runModuleUnitTestsIfEnabled(config);
- }
-
-
-}
[camel-spring-boot] 03/05: CAMEL-16115 - Remove Camel-AWS-*
components - AWS-IAM
Posted by ac...@apache.org.
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-spring-boot.git
commit 987aaeae538adc64fa650a214bc32b083242d42a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 23 08:09:02 2021 +0100
CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
---
components-starter/README.adoc | 2 --
docs/modules/ROOT/pages/list.adoc | 2 --
2 files changed, 4 deletions(-)
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index 60e89a9..366ee47 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -103,8 +103,6 @@ Number of Camel components: 337 in 271 JAR artifacts (12 deprecated)
| xref:latest@components::aws-eks-component.adoc[AWS Elastic Kubernetes Service (EKS)] | camel-aws-eks-starter | Stable | 3.0 | *deprecated* Manage AWS EKS cluster instances.
-| xref:latest@components::aws-iam-component.adoc[AWS Identity and Access Management (IAM)] | camel-aws-iam-starter | Stable | 2.23 | *deprecated* Manage AWS IAM instances.
-
| xref:latest@components::aws-s3-component.adoc[AWS S3 Storage Service] | camel-aws-s3-starter | Stable | 2.8 | *deprecated* Store and retrieve objects from AWS S3 Storage Service.
| xref:latest@components::aws-swf-component.adoc[AWS Simple Workflow (SWF)] | camel-aws-swf-starter | Stable | 2.13 | *deprecated* Manage workflows in the AWS Simple Workflow service.
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index 60e89a9..366ee47 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -103,8 +103,6 @@ Number of Camel components: 337 in 271 JAR artifacts (12 deprecated)
| xref:latest@components::aws-eks-component.adoc[AWS Elastic Kubernetes Service (EKS)] | camel-aws-eks-starter | Stable | 3.0 | *deprecated* Manage AWS EKS cluster instances.
-| xref:latest@components::aws-iam-component.adoc[AWS Identity and Access Management (IAM)] | camel-aws-iam-starter | Stable | 2.23 | *deprecated* Manage AWS IAM instances.
-
| xref:latest@components::aws-s3-component.adoc[AWS S3 Storage Service] | camel-aws-s3-starter | Stable | 2.8 | *deprecated* Store and retrieve objects from AWS S3 Storage Service.
| xref:latest@components::aws-swf-component.adoc[AWS Simple Workflow (SWF)] | camel-aws-swf-starter | Stable | 2.13 | *deprecated* Manage workflows in the AWS Simple Workflow service.
[camel-spring-boot] 02/05: CAMEL-16115 - Remove Camel-AWS-*
components - AWS-IAM
Posted by ac...@apache.org.
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-spring-boot.git
commit be64f659d7cfdc559f94b4d7c4ce22d7f1deae02
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 23 08:08:14 2021 +0100
CAMEL-16115 - Remove Camel-AWS-* components - AWS-IAM
---
.../camel/springboot/catalog/components.properties | 3 +-
.../springboot/catalog/components/aws-iam.json | 52 ----------------------
docs/modules/ROOT/pages/aws-iam-starter.adoc | 41 -----------------
3 files changed, 1 insertion(+), 95 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 125e313..7a1e007 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -24,7 +24,6 @@ aws-ddbstream
aws-ec2
aws-ecs
aws-eks
-aws-iam
aws-s3
aws-swf
aws2-athena
@@ -350,4 +349,4 @@ xslt-saxon
yammer
zendesk
zookeeper
-zookeeper-master
\ No newline at end of file
+zookeeper-master
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json
deleted file mode 100644
index 7b02532..0000000
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "component": {
- "kind": "component",
- "name": "aws-iam",
- "title": "AWS Identity and Access Management (IAM)",
- "description": "Manage AWS IAM instances.",
- "deprecated": true,
- "deprecatedSince": "3.8.0",
- "firstVersion": "2.23.0",
- "label": "cloud,management",
- "javaType": "org.apache.camel.component.aws.iam.IAMComponent",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel.springboot",
- "artifactId": "camel-aws-iam-starter",
- "version": "3.9.0-SNAPSHOT",
- "scheme": "aws-iam",
- "extendsScheme": "",
- "syntax": "aws-iam:label",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": true,
- "lenientProperties": false
- },
- "componentProperties": {
- "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instan [...]
- "accessKey": { "kind": "property", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
- "configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.iam.IAMConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration" },
- "iamClient": { "kind": "property", "displayName": "Iam Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.identitymanagement.AmazonIdentityManagement", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To use a existing configured AWS IAM as client" },
- "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
- "operation": { "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.iam.IAMOperations", "enum": [ "listAccessKeys", "createUser", "deleteUser", "getUser", "listUsers", "createAccessKey", "deleteAccessKey", "updateAccessKey", "createGroup", "deleteGroup", "listGroups", "addUserToGroup", "removeUserFromGroup" ], "deprecated": false, "deprecationNote": "", "autowired": fa [...]
- "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the IAM client" },
- "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the IAM client" },
- "proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the IAM client" },
- "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "The region in which IAM client needs to work. When using this parameter, the configuration will expect the capitalized name of the region [...]
- "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" },
- "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
- },
- "properties": {
- "label": { "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Logical name" },
- "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client insta [...]
- "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
- "iamClient": { "kind": "parameter", "displayName": "Iam Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.identitymanagement.AmazonIdentityManagement", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To use a existing configured AWS IAM as client" },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.iam.IAMOperations", "enum": [ "listAccessKeys", "createUser", "deleteUser", "getUser", "listUsers", "createAccessKey", "deleteAccessKey", "updateAccessKey", "createGroup", "deleteGroup", "listGroups", "addUserToGroup", "removeUserFromGroup" ], "deprecated": false, "deprecationNote": "", "autowired": f [...]
- "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the IAM client" },
- "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the IAM 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.iam.IAMConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the IAM 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.iam.IAMConfiguration", "configurationField": "configuration", "description": "The region in which IAM 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": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.iam.IAMConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
- }
-}
diff --git a/docs/modules/ROOT/pages/aws-iam-starter.adoc b/docs/modules/ROOT/pages/aws-iam-starter.adoc
deleted file mode 100644
index 49adf18..0000000
--- a/docs/modules/ROOT/pages/aws-iam-starter.adoc
+++ /dev/null
@@ -1,41 +0,0 @@
-// spring-boot-auto-configure options: START
-:page-partial:
-:doctitle: Camel Spring Boot Starter for aws-iam
-
-== Spring Boot Auto-Configuration
-
-When using aws-iam with Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-aws-iam-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
-The component supports 13 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.aws-iam.access-key* | Amazon AWS Access Key | | String
-| *camel.component.aws-iam.auto-discover-client* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | Boolean
-| *camel.component.aws-iam.autowired-enabled* | 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
-| *camel.component.aws-iam.configuration* | The component configuration. The option is a org.apache.camel.component.aws.iam.IAMConfiguration type. | | IAMConfiguration
-| *camel.component.aws-iam.enabled* | Whether to enable auto configuration of the aws-iam component. This is enabled by default. | | Boolean
-| *camel.component.aws-iam.iam-client* | To use a existing configured AWS IAM as client. The option is a com.amazonaws.services.identitymanagement.AmazonIdentityManagement type. | | AmazonIdentityManagement
-| *camel.component.aws-iam.lazy-start-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 th [...]
-| *camel.component.aws-iam.operation* | The operation to perform | | IAMOperations
-| *camel.component.aws-iam.proxy-host* | To define a proxy host when instantiating the IAM client | | String
-| *camel.component.aws-iam.proxy-port* | To define a proxy port when instantiating the IAM client | | Integer
-| *camel.component.aws-iam.proxy-protocol* | To define a proxy protocol when instantiating the IAM client | | Protocol
-| *camel.component.aws-iam.region* | The region in which IAM 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
-| *camel.component.aws-iam.secret-key* | Amazon AWS Secret Key | | String
-|===
-// spring-boot-auto-configure options: END