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 <anco...@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>