This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 009a6123e94941980ae2acb362f35a3a421e0cae Author: James Netherton <[email protected]> AuthorDate: Mon Feb 15 09:53:53 2021 +0000 Upgrade to Camel 3.9.0 --- .../ROOT/pages/reference/extensions/aws-sdb.adoc | 40 ------ .../pages/reference/extensions/aws-translate.adoc | 40 ------ .../partials/reference/components/aws-sdb.adoc | 13 -- .../reference/components/aws-translate.adoc | 13 -- .../ROOT/partials/reference/others/spring-xml.adoc | 1 + extensions/aws-sdb/deployment/pom.xml | 69 ----------- .../aws/sdb/deployment/AwsSdbProcessor.java | 68 ----------- extensions/aws-sdb/pom.xml | 37 ------ extensions/aws-sdb/runtime/pom.xml | 124 ------------------- .../main/resources/META-INF/quarkus-extension.yaml | 34 ------ extensions/aws-translate/deployment/pom.xml | 73 ----------- .../deployment/AwsTranslateProcessor.java | 65 ---------- extensions/aws-translate/pom.xml | 37 ------ extensions/aws-translate/runtime/pom.xml | 136 --------------------- .../main/resources/META-INF/quarkus-extension.yaml | 34 ------ extensions/pom.xml | 2 - integration-tests/aws/pom.xml | 21 ---- .../camel/quarkus/component/aws/CamelRoute.java | 13 -- .../aws/src/main/resources/application.properties | 7 -- pom.xml | 4 +- poms/bom/pom.xml | 30 ----- 21 files changed, 3 insertions(+), 858 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/aws-sdb.adoc b/docs/modules/ROOT/pages/reference/extensions/aws-sdb.adoc deleted file mode 100644 index 736425e..0000000 --- a/docs/modules/ROOT/pages/reference/extensions/aws-sdb.adoc +++ /dev/null @@ -1,40 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= AWS SimpleDB (SDB) -:page-aliases: extensions/aws-sdb.adoc -:cq-artifact-id: camel-quarkus-aws-sdb -:cq-native-supported: true -:cq-status: Stable -:cq-description: Store and Retrieve data from/to AWS SDB service. -:cq-deprecated: true -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 - -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## - -Store and Retrieve data from/to AWS SDB service. - -== What's inside - -* xref:{cq-camel-components}::aws-sdb-component.adoc[AWS SimpleDB component], URI syntax: `aws-sdb:domainName` - -Please refer to the above link for usage and configuration details. - -== Maven coordinates - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb</artifactId> -</dependency> ----- - -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. - -== SSL in native mode - -This extension auto-enables SSL support in native mode. Hence you do not need to add -`quarkus.ssl.native=true` to your `application.properties` yourself. See also -https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. diff --git a/docs/modules/ROOT/pages/reference/extensions/aws-translate.adoc b/docs/modules/ROOT/pages/reference/extensions/aws-translate.adoc deleted file mode 100644 index 21df9d7..0000000 --- a/docs/modules/ROOT/pages/reference/extensions/aws-translate.adoc +++ /dev/null @@ -1,40 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= AWS Translate -:page-aliases: extensions/aws-translate.adoc -:cq-artifact-id: camel-quarkus-aws-translate -:cq-native-supported: true -:cq-status: Stable -:cq-description: Translate texts using AWS Translate. -:cq-deprecated: true -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 - -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## - -Translate texts using AWS Translate. - -== What's inside - -* xref:{cq-camel-components}::aws-translate-component.adoc[AWS Translate component], URI syntax: `aws-translate:label` - -Please refer to the above link for usage and configuration details. - -== Maven coordinates - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate</artifactId> -</dependency> ----- - -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. - -== SSL in native mode - -This extension auto-enables SSL support in native mode. Hence you do not need to add -`quarkus.ssl.native=true` to your `application.properties` yourself. See also -https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. diff --git a/docs/modules/ROOT/partials/reference/components/aws-sdb.adoc b/docs/modules/ROOT/partials/reference/components/aws-sdb.adoc deleted file mode 100644 index cb6bba3..0000000 --- a/docs/modules/ROOT/partials/reference/components/aws-sdb.adoc +++ /dev/null @@ -1,13 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -:cq-artifact-id: camel-quarkus-aws-sdb -:cq-artifact-id-base: aws-sdb -:cq-native-supported: true -:cq-status: Stable -:cq-deprecated: true -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 -:cq-camel-part-name: aws-sdb -:cq-camel-part-title: AWS SimpleDB -:cq-camel-part-description: Store and Retrieve data from/to AWS SDB service. -:cq-extension-page-title: AWS SimpleDB (SDB) diff --git a/docs/modules/ROOT/partials/reference/components/aws-translate.adoc b/docs/modules/ROOT/partials/reference/components/aws-translate.adoc deleted file mode 100644 index 1e2a1b1..0000000 --- a/docs/modules/ROOT/partials/reference/components/aws-translate.adoc +++ /dev/null @@ -1,13 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -:cq-artifact-id: camel-quarkus-aws-translate -:cq-artifact-id-base: aws-translate -:cq-native-supported: true -:cq-status: Stable -:cq-deprecated: true -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 -:cq-camel-part-name: aws-translate -:cq-camel-part-title: AWS Translate -:cq-camel-part-description: Translate texts using AWS Translate. -:cq-extension-page-title: AWS Translate diff --git a/docs/modules/ROOT/partials/reference/others/spring-xml.adoc b/docs/modules/ROOT/partials/reference/others/spring-xml.adoc new file mode 100644 index 0000000..a509c1d --- /dev/null +++ b/docs/modules/ROOT/partials/reference/others/spring-xml.adoc @@ -0,0 +1 @@ +// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page diff --git a/extensions/aws-sdb/deployment/pom.xml b/extensions/aws-sdb/deployment/pom.xml deleted file mode 100644 index 81023e7..0000000 --- a/extensions/aws-sdb/deployment/pom.xml +++ /dev/null @@ -1,69 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws-sdb-deployment</artifactId> - <name>Camel Quarkus :: AWS SimpleDB (SDB) :: Deployment</name> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-aws-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions/aws-sdb/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sdb/deployment/AwsSdbProcessor.java b/extensions/aws-sdb/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sdb/deployment/AwsSdbProcessor.java deleted file mode 100644 index e9bbbe8..0000000 --- a/extensions/aws-sdb/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sdb/deployment/AwsSdbProcessor.java +++ /dev/null @@ -1,68 +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.quarkus.component.aws.sdb.deployment; - -import com.amazonaws.auth.AWS4Signer; -import com.amazonaws.auth.QueryStringSigner; -import com.amazonaws.partitions.model.CredentialScope; -import com.amazonaws.partitions.model.Endpoint; -import com.amazonaws.partitions.model.Partition; -import com.amazonaws.partitions.model.Partitions; -import com.amazonaws.partitions.model.Region; -import com.amazonaws.partitions.model.Service; -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; - -class AwsSdbProcessor { - - public static final String AWS_SDB_APPLICATION_ARCHIVE_MARKERS = "com/amazonaws"; - - private static final String FEATURE = "camel-aws-sdb"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep - ExtensionSslNativeSupportBuildItem activateSslNativeSupport() { - return new ExtensionSslNativeSupportBuildItem(FEATURE); - } - - @BuildStep(applicationArchiveMarkers = { AWS_SDB_APPLICATION_ARCHIVE_MARKERS }) - void process(CombinedIndexBuildItem combinedIndexBuildItem, - BuildProducer<ReflectiveClassBuildItem> reflectiveClass, - BuildProducer<NativeImageResourceBuildItem> resource) { - - resource.produce(new NativeImageResourceBuildItem("com/amazonaws/partitions/endpoints.json")); - reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, - Partitions.class.getCanonicalName(), - Partition.class.getCanonicalName(), - Endpoint.class.getCanonicalName(), - Region.class.getCanonicalName(), - Service.class.getCanonicalName(), - CredentialScope.class.getCanonicalName(), - QueryStringSigner.class.getCanonicalName(), - AWS4Signer.class.getCanonicalName())); - } - -} diff --git a/extensions/aws-sdb/pom.xml b/extensions/aws-sdb/pom.xml deleted file mode 100644 index 7275ebc..0000000 --- a/extensions/aws-sdb/pom.xml +++ /dev/null @@ -1,37 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-build-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws-sdb-parent</artifactId> - <name>Camel Quarkus :: AWS SimpleDB (SDB)</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions/aws-sdb/runtime/pom.xml b/extensions/aws-sdb/runtime/pom.xml deleted file mode 100644 index b40618a..0000000 --- a/extensions/aws-sdb/runtime/pom.xml +++ /dev/null @@ -1,124 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws-sdb</artifactId> - <name>Camel Quarkus :: AWS SimpleDB (SDB) :: Runtime</name> - - <properties> - <camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince> - <quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-aws</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-aws-sdb</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-bootstrap-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>full</id> - <activation> - <property> - <name>!quickly</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-maven-plugin</artifactId> - <executions> - <execution> - <id>update-extension-doc-page</id> - <goals> - <goal>update-extension-doc-page</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/extensions/aws-sdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws-sdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index c2b2304..0000000 --- a/extensions/aws-sdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel AWS SimpleDB (SDB)" -description: "Store and Retrieve data from/to AWS SDB service" -metadata: - keywords: - - "Amazon" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/aws-sdb.html"; - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/aws-translate/deployment/pom.xml b/extensions/aws-translate/deployment/pom.xml deleted file mode 100644 index 85925a9..0000000 --- a/extensions/aws-translate/deployment/pom.xml +++ /dev/null @@ -1,73 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws-translate-deployment</artifactId> - <name>Camel Quarkus :: AWS Translate :: Deployment</name> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-jaxp-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-aws-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions/aws-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws/translate/deployment/AwsTranslateProcessor.java b/extensions/aws-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws/translate/deployment/AwsTranslateProcessor.java deleted file mode 100644 index 8b236d1..0000000 --- a/extensions/aws-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws/translate/deployment/AwsTranslateProcessor.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.aws.translate.deployment; - -import com.amazonaws.auth.AWS4Signer; -import com.amazonaws.partitions.model.CredentialScope; -import com.amazonaws.partitions.model.Endpoint; -import com.amazonaws.partitions.model.Partition; -import com.amazonaws.partitions.model.Partitions; -import com.amazonaws.partitions.model.Region; -import com.amazonaws.partitions.model.Service; -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; - -class AwsTranslateProcessor { - - public static final String AWS_TRANSLATE_APPLICATION_ARCHIVE_MARKERS = "com/amazonaws"; - - private static final String FEATURE = "camel-aws-translate"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep - ExtensionSslNativeSupportBuildItem activateSslNativeSupport() { - return new ExtensionSslNativeSupportBuildItem(FEATURE); - } - - @BuildStep(applicationArchiveMarkers = { AWS_TRANSLATE_APPLICATION_ARCHIVE_MARKERS }) - void process(CombinedIndexBuildItem combinedIndexBuildItem, - BuildProducer<ReflectiveClassBuildItem> reflectiveClass, - BuildProducer<NativeImageResourceBuildItem> resource) { - - resource.produce(new NativeImageResourceBuildItem("com/amazonaws/partitions/endpoints.json")); - reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, - Partitions.class.getCanonicalName(), - Partition.class.getCanonicalName(), - Endpoint.class.getCanonicalName(), - Region.class.getCanonicalName(), - Service.class.getCanonicalName(), - CredentialScope.class.getCanonicalName(), - AWS4Signer.class.getCanonicalName())); - } -} diff --git a/extensions/aws-translate/pom.xml b/extensions/aws-translate/pom.xml deleted file mode 100644 index e95a44a..0000000 --- a/extensions/aws-translate/pom.xml +++ /dev/null @@ -1,37 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-build-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws-translate-parent</artifactId> - <name>Camel Quarkus :: AWS Translate</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions/aws-translate/runtime/pom.xml b/extensions/aws-translate/runtime/pom.xml deleted file mode 100644 index 6cf7b73..0000000 --- a/extensions/aws-translate/runtime/pom.xml +++ /dev/null @@ -1,136 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-aws-translate</artifactId> - <name>Camel Quarkus :: AWS Translate :: Runtime</name> - - <properties> - <camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince> - <quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-jaxp</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-aws</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-aws-translate</artifactId> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-cbor</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-bootstrap-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>full</id> - <activation> - <property> - <name>!quickly</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-maven-plugin</artifactId> - <executions> - <execution> - <id>update-extension-doc-page</id> - <goals> - <goal>update-extension-doc-page</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/extensions/aws-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 4c15722..0000000 --- a/extensions/aws-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel AWS Translate" -description: "Translate texts using AWS Translate" -metadata: - keywords: - - "Amazon" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/aws-translate.html"; - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/pom.xml b/extensions/pom.xml index b228037..46c9581 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -52,11 +52,9 @@ <module>aws-kms</module> <module>aws-lambda</module> <module>aws-s3</module> - <module>aws-sdb</module> <module>aws-sns</module> <module>aws-sqs</module> <module>aws-swf</module> - <module>aws-translate</module> <module>aws2-athena</module> <module>aws2-cw</module> <module>aws2-ddb</module> diff --git a/integration-tests/aws/pom.xml b/integration-tests/aws/pom.xml index 669d7ad..1916d27 100644 --- a/integration-tests/aws/pom.xml +++ b/integration-tests/aws/pom.xml @@ -76,14 +76,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-swf</artifactId> </dependency> <dependency> @@ -210,19 +202,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-sns-deployment</artifactId> <version>${project.version}</version> <type>pom</type> diff --git a/integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java b/integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java index 03f5d1e..2f23e13 100644 --- a/integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java +++ b/integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java @@ -18,8 +18,6 @@ package org.apache.camel.quarkus.component.aws; import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.aws.translate.TranslateConstants; -import org.apache.camel.component.aws.translate.TranslateLanguageEnum; @RegisterForReflection public class CamelRoute extends RouteBuilder { @@ -68,17 +66,6 @@ public class CamelRoute extends RouteBuilder { .to("aws-lambda://cluster?operation=listFunctions") .to("log:sf?showAll=true"); - from("timer:quarkus-translate?repeatCount=1") - .setHeader(TranslateConstants.SOURCE_LANGUAGE, constant(TranslateLanguageEnum.ITALIAN)) - .setHeader(TranslateConstants.TARGET_LANGUAGE, constant(TranslateLanguageEnum.GERMAN)) - .setBody(constant("Ciao")) - .to("aws-translate://cluster?operation=translateText") - .log("Translation: ${body}"); - - from("timer:quarkus-sdb?repeatCount=1") - .to("aws-sdb://TestDomain?operation=DomainMetadata&accessKey={{env:AWS_ACCESS_KEY}}&secretKey={{env:AWS_SECRET_KEY}}®ion={{env:AWS_REGION}}") - .to("log:sf?showAll=true"); - from("timer:quarkus-swf?repeatCount=1") .to("aws-swf://workflow?domainName=testDomain&activityList=swf-alist&workflowList=swf-wlist&version=1.0&eventName=testEvent") .to("log:sf?showAll=true"); diff --git a/integration-tests/aws/src/main/resources/application.properties b/integration-tests/aws/src/main/resources/application.properties index b683b40..dedac5b 100644 --- a/integration-tests/aws/src/main/resources/application.properties +++ b/integration-tests/aws/src/main/resources/application.properties @@ -83,13 +83,6 @@ camel.component.aws-lambda.secret-key={{env:AWS_SECRET_KEY}} camel.component.aws-lambda.region={{env:AWS_REGION}} # -# Camel :: AWS Translate -# -camel.component.aws-translate.access-key={{env:AWS_ACCESS_KEY}} -camel.component.aws-translate.secret-key={{env:AWS_SECRET_KEY}} -camel.component.aws-translate.region={{env:AWS_REGION}} - -# # Camel :: AWS Kinesis # camel.component.aws-kinesis.access-key={{env:AWS_ACCESS_KEY}} diff --git a/pom.xml b/pom.xml index c59d912..db4875b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.8.0</version> + <version>3.9.0-SNAPSHOT</version> </parent> <groupId>org.apache.camel.quarkus</groupId> @@ -55,7 +55,7 @@ <bouncycastle.version>${bouncycastle-version}</bouncycastle.version><!-- keep in sync with Camel --> <camel.major.minor>3.8</camel.major.minor> <!-- run after each change: cd docs && mvndev validate --> - <camel.version>${camel.major.minor}.0</camel.version> + <camel.version>3.9.0-SNAPSHOT</camel.version> <camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 62db0b3..28edf3b 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -254,11 +254,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-aws-sdb</artifactId> - <version>${camel.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-aws-sns</artifactId> <version>${camel.version}</version> </dependency> @@ -274,11 +269,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-aws-translate</artifactId> - <version>${camel.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-aws-xray</artifactId> <version>${camel.version}</version> </dependency> @@ -2408,16 +2398,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-sdb-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-sns</artifactId> <version>${camel-quarkus.version}</version> </dependency> @@ -2448,16 +2428,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-aws-translate-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-xray</artifactId> <version>${camel-quarkus.version}</version> </dependency>
