You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/02/17 08:59:33 UTC
[camel-quarkus] branch camel-master updated (abb1834 -> 2da216b)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
omit abb1834 Upgrade to Camel 3.9.0
add 3078dd4 Updated CHANGELOG.md
add d4532d6 Added CBOR data format native support #1754
add 83e5c76 Test AWS 2 Firehose
add 9457fc8 Updated CHANGELOG.md
new 009a612 Upgrade to Camel 3.9.0
new 2da216b Optaplanner : upgrade to 8.x extension #2243
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (abb1834)
\
N -- N -- N refs/heads/camel-master (2da216b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
CHANGELOG.md | 13 +-
.../ROOT/pages/reference/extensions/aws-sdb.adoc | 40 ----
.../pages/reference/extensions/aws-translate.adoc | 40 ----
.../ROOT/pages/reference/extensions/cbor.adoc | 8 +-
.../partials/reference/components/aws-sdb.adoc | 13 --
.../reference/components/aws-translate.adoc | 13 --
.../ROOT/partials/reference/dataformats/cbor.adoc | 6 +-
.../component/cbor/deployment/CborProcessor.java | 46 -----
extensions-jvm/cbor/integration-test/pom.xml | 83 --------
.../quarkus/component/cbor/it/CborResource.java | 51 -----
.../camel/quarkus/component/cbor/it/CborTest.java | 34 ----
extensions-jvm/pom.xml | 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 ----
.../cbor/deployment/pom.xml | 0
.../component/cbor/deployment/CborProcessor.java} | 8 +-
{extensions-jvm => extensions}/cbor/pom.xml | 1 -
.../cbor/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
extensions/optaplanner/deployment/pom.xml | 16 +-
.../deployment/OptaplannerProcessor.java | 2 -
extensions/optaplanner/runtime/pom.xml | 4 +
extensions/pom.xml | 3 +-
integration-tests-aws2/aws2-kinesis/pom.xml | 10 +
...ource.java => Aws2KinesisFirehoseResource.java} | 27 +--
.../src/main/resources/application.properties | 4 +
.../component/aws2/kinesis/it/Aws2KinesisTest.java | 92 ++++++++-
.../kinesis/it/Aws2KinesisTestEnvCustomizer.java | 222 ++++++++++++++++++++-
.../test/support/aws2/Aws2TestEnvContext.java | 57 ++++--
.../test/support/aws2/Aws2TestEnvCustomizer.java | 7 +
.../test/support/aws2/Aws2TestResource.java | 11 +-
integration-tests/aws/pom.xml | 21 --
.../camel/quarkus/component/aws/CamelRoute.java | 13 --
.../aws/src/main/resources/application.properties | 7 -
integration-tests/aws2-grouped/pom.xml | 5 +
integration-tests/{shiro => cbor}/pom.xml | 32 ++-
.../quarkus/component/cbor/it/CborResource.java | 91 +++++++++
.../quarkus/component/cbor/it/CborRoutes.java | 54 +++++
.../quarkus/component/cbor/it/model/Author.java} | 21 +-
.../component/cbor/it/model/DummyObject.java} | 19 +-
.../camel/quarkus/component/cbor/it/CborIT.java} | 4 +-
.../camel/quarkus/component/cbor/it/CborTest.java | 91 +++++++++
integration-tests/optaplanner/pom.xml | 4 -
.../optaplanner/it/bootstrap/DataGenerator.java | 2 +-
.../component/optaplanner/it/domain/Lesson.java | 7 -
.../component/optaplanner/it/domain/Room.java | 6 -
.../component/optaplanner/it/domain/Timeslot.java | 7 -
integration-tests/pom.xml | 1 +
pom.xml | 4 +-
poms/bom/pom.xml | 56 ++----
.../integration-test-pom.xml | 2 +-
tooling/scripts/test-categories.yaml | 1 +
60 files changed, 711 insertions(+), 1230 deletions(-)
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/aws-sdb.adoc
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/aws-translate.adoc
delete mode 100644 docs/modules/ROOT/partials/reference/components/aws-sdb.adoc
delete mode 100644 docs/modules/ROOT/partials/reference/components/aws-translate.adoc
delete mode 100644 extensions-jvm/cbor/deployment/src/main/java/org/apache/camel/quarkus/component/cbor/deployment/CborProcessor.java
delete mode 100644 extensions-jvm/cbor/integration-test/pom.xml
delete mode 100644 extensions-jvm/cbor/integration-test/src/main/java/org/apache/camel/quarkus/component/cbor/it/CborResource.java
delete mode 100644 extensions-jvm/cbor/integration-test/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborTest.java
delete mode 100644 extensions/aws-sdb/deployment/pom.xml
delete mode 100644 extensions/aws-sdb/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sdb/deployment/AwsSdbProcessor.java
delete mode 100644 extensions/aws-sdb/pom.xml
delete mode 100644 extensions/aws-sdb/runtime/pom.xml
delete mode 100644 extensions/aws-sdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
delete mode 100644 extensions/aws-translate/deployment/pom.xml
delete mode 100644 extensions/aws-translate/deployment/src/main/java/org/apache/camel/quarkus/component/aws/translate/deployment/AwsTranslateProcessor.java
delete mode 100644 extensions/aws-translate/pom.xml
delete mode 100644 extensions/aws-translate/runtime/pom.xml
delete mode 100644 extensions/aws-translate/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename {extensions-jvm => extensions}/cbor/deployment/pom.xml (100%)
copy extensions/{saga/deployment/src/main/java/org/apache/camel/quarkus/component/saga/deployment/SagaProcessor.java => cbor/deployment/src/main/java/org/apache/camel/quarkus/component/cbor/deployment/CborProcessor.java} (84%)
rename {extensions-jvm => extensions}/cbor/pom.xml (97%)
rename {extensions-jvm => extensions}/cbor/runtime/pom.xml (98%)
rename {extensions-jvm => extensions}/cbor/runtime/src/main/resources/META-INF/quarkus-extension.yaml (97%)
copy integration-tests-aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/{Aws2KinesisResource.java => Aws2KinesisFirehoseResource.java} (74%)
copy integration-tests/{shiro => cbor}/pom.xml (93%)
create mode 100644 integration-tests/cbor/src/main/java/org/apache/camel/quarkus/component/cbor/it/CborResource.java
create mode 100644 integration-tests/cbor/src/main/java/org/apache/camel/quarkus/component/cbor/it/CborRoutes.java
copy integration-tests/{xstream/src/main/java/org/apache/camel/quarkus/component/xstream/it/PojoA.java => cbor/src/main/java/org/apache/camel/quarkus/component/cbor/it/model/Author.java} (78%)
copy integration-tests/{avro-rpc/src/main/java/org/apache/camel/quarkus/component/avro/rpc/it/reflection/TestPojo.java => cbor/src/main/java/org/apache/camel/quarkus/component/cbor/it/model/DummyObject.java} (74%)
copy integration-tests/{csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvIT.java => cbor/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborIT.java} (91%)
create mode 100644 integration-tests/cbor/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborTest.java
[camel-quarkus] 01/02: Upgrade to Camel 3.9.0
Posted by ja...@apache.org.
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 <ja...@gmail.com>
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>
[camel-quarkus] 02/02: Optaplanner : upgrade to 8.x extension #2243
Posted by ja...@apache.org.
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 2da216b2e2c9a6279b7dec895ee7f037b53da176
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Tue Feb 16 11:52:48 2021 +0100
Optaplanner : upgrade to 8.x extension #2243
---
extensions/optaplanner/deployment/pom.xml | 16 ++++---------
.../deployment/OptaplannerProcessor.java | 2 --
extensions/optaplanner/runtime/pom.xml | 4 ++++
integration-tests/optaplanner/pom.xml | 4 ----
.../optaplanner/it/bootstrap/DataGenerator.java | 2 +-
.../component/optaplanner/it/domain/Lesson.java | 7 ------
.../component/optaplanner/it/domain/Room.java | 6 -----
.../component/optaplanner/it/domain/Timeslot.java | 7 ------
pom.xml | 2 +-
poms/bom/pom.xml | 26 ++++++++++++----------
10 files changed, 24 insertions(+), 52 deletions(-)
diff --git a/extensions/optaplanner/deployment/pom.xml b/extensions/optaplanner/deployment/pom.xml
index cca9cc2..6240677 100644
--- a/extensions/optaplanner/deployment/pom.xml
+++ b/extensions/optaplanner/deployment/pom.xml
@@ -29,18 +29,6 @@
<artifactId>camel-quarkus-optaplanner-deployment</artifactId>
<name>Camel Quarkus :: OptaPlanner :: Deployment</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.optaplanner</groupId>
- <artifactId>optaplanner-quarkus-deployment</artifactId>
- <version>${optaplanner.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -54,6 +42,10 @@
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-deployment</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
index 3956d43..140c65b 100644
--- a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
+++ b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
@@ -18,11 +18,9 @@ package org.apache.camel.quarkus.component.optaplanner.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.jboss.logging.Logger;
class OptaplannerProcessor {
- private static final Logger LOG = Logger.getLogger(OptaplannerProcessor.class);
private static final String FEATURE = "camel-optaplanner";
@BuildStep
diff --git a/extensions/optaplanner/runtime/pom.xml b/extensions/optaplanner/runtime/pom.xml
index 528f4be..d939d7f 100644
--- a/extensions/optaplanner/runtime/pom.xml
+++ b/extensions/optaplanner/runtime/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/integration-tests/optaplanner/pom.xml b/integration-tests/optaplanner/pom.xml
index 6c855af..803f516 100644
--- a/integration-tests/optaplanner/pom.xml
+++ b/integration-tests/optaplanner/pom.xml
@@ -48,10 +48,6 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
</dependency>
<dependency>
diff --git a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
index 7538aeb..b162933 100644
--- a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
+++ b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/bootstrap/DataGenerator.java
@@ -32,7 +32,7 @@ import org.apache.camel.quarkus.component.optaplanner.it.domain.Timeslot;
/**
* adapted from optaplanner quarkus quickstart :
- * https://github.com/quarkusio/quarkus-quickstarts/blob/master/optaplanner-quickstart/src/main/java/org/acme/optaplanner/bootstrap/DemoDataGenerator.java
+ * https://github.com/kiegroup/optaplanner-quickstarts/blob/stable/quarkus-school-timetabling/src/main/java/org/acme/schooltimetabling/bootstrap/DemoDataGenerator.java
*/
@ApplicationScoped
public class DataGenerator {
diff --git a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
index c749745..03db29e 100644
--- a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
+++ b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Lesson.java
@@ -18,9 +18,6 @@ package org.apache.camel.quarkus.component.optaplanner.it.domain;
import java.util.concurrent.atomic.AtomicLong;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
import org.optaplanner.core.api.domain.entity.PlanningEntity;
import org.optaplanner.core.api.domain.lookup.PlanningId;
import org.optaplanner.core.api.domain.variable.PlanningVariable;
@@ -33,14 +30,10 @@ import org.optaplanner.core.api.domain.variable.PlanningVariable;
public class Lesson {
@PlanningId
- @NotNull
private Long id;
- @NotBlank
private String subject;
- @NotBlank
private String teacher;
- @NotBlank
private String studentGroup;
@PlanningVariable(valueRangeProviderRefs = "timeslotRange")
diff --git a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
index 4fed920..a7a5deb 100644
--- a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
+++ b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Room.java
@@ -18,9 +18,6 @@ package org.apache.camel.quarkus.component.optaplanner.it.domain;
import java.util.concurrent.atomic.AtomicLong;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
import org.optaplanner.core.api.domain.lookup.PlanningId;
/**
@@ -30,10 +27,7 @@ import org.optaplanner.core.api.domain.lookup.PlanningId;
public class Room {
@PlanningId
- @NotNull
private Long id;
-
- @NotBlank
private String name;
private static AtomicLong increment = new AtomicLong(1);
diff --git a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
index a14a5f4..1d44ef6 100644
--- a/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
+++ b/integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/domain/Timeslot.java
@@ -20,8 +20,6 @@ import java.time.DayOfWeek;
import java.time.LocalTime;
import java.util.concurrent.atomic.AtomicLong;
-import javax.validation.constraints.NotNull;
-
import org.optaplanner.core.api.domain.lookup.PlanningId;
/**
@@ -31,14 +29,9 @@ import org.optaplanner.core.api.domain.lookup.PlanningId;
public class Timeslot {
@PlanningId
- @NotNull
private Long id;
-
- @NotNull
private DayOfWeek dayOfWeek;
- @NotNull
private LocalTime startTime;
- @NotNull
private LocalTime endTime;
private static AtomicLong increment = new AtomicLong(1);
diff --git a/pom.xml b/pom.xml
index db4875b..0e380bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version><!-- Mess in hdfs transitive deps -->
<okhttp.version>${squareup-okhttp-version}</okhttp.version><!-- keep in sync with okio -->
<okio.version>${squareup-okio-version}</okio.version><!-- keep in sync with okhttp -->
- <optaplanner.version>7.46.0.Final</optaplanner.version>
+ <optaplanner.version>8.2.0.Final</optaplanner.version><!-- keep in sync with quarkus -->
<quarkiverse-minio.version>0.2.0</quarkiverse-minio.version>
<quarkus.version>1.12.0.CR1</quarkus.version>
<quarkus-google-cloud.version>0.3.0</quarkus-google-cloud.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 28edf3b..2e17877 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -17,7 +17,8 @@
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">
+<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>
@@ -33,7 +34,8 @@
<name>Camel Quarkus :: BOM</name>
<properties>
- <camel-quarkus.version>1.7.0-SNAPSHOT</camel-quarkus.version><!-- kept in sync with project.version by the release plugin -->
+ <camel-quarkus.version>1.7.0-SNAPSHOT
+ </camel-quarkus.version><!-- kept in sync with project.version by the release plugin -->
</properties>
<dependencyManagement>
@@ -5969,16 +5971,6 @@
<version>${jsoup.version}</version>
</dependency>
<dependency>
- <groupId>org.kie.soup</groupId>
- <artifactId>kie-soup-commons</artifactId>
- <version>${optaplanner.version}</version>
- </dependency>
- <dependency>
- <groupId>org.kie.soup</groupId>
- <artifactId>kie-soup-project-datamodel-commons</artifactId>
- <version>${optaplanner.version}</version>
- </dependency>
- <dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>${mvel2.version}</version>
@@ -5994,6 +5986,16 @@
<version>${optaplanner.version}</version>
</dependency>
<dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson</artifactId>
+ <version>${optaplanner.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
+ <version>${optaplanner.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>