You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/02/13 17:45:10 UTC
[camel-quarkus] branch quarkus-master updated (df73414 -> a3d0fbd)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard df73414 Fix MongoDbProcessor according to the latest changes in the mongodb extension
discard 982d7ff Set quarkus.version to 999-SNAPSHOT
add 68f9774 Add olingo4 extension
add 74c51b1 chore: Remove redundant note related to fileWatcher param in stream extension docs
add 6e759cd Add olingo4 itest to project list
add ca39d37 Remove enableJni from integration tests as JNI si always enabled on GraalVM 19.3.1
add a766a3a Use camel-quarkus-support-httpclient in slack extension
add 53ffbc5 Cleanup: Declare quarkus-development-mode-spi as a nonExtensionArtifact
add 7634cc0 Fix #696 Test HTTPS with the HTTP clients
add d5c59e1 Re-use the cached local Maven repo even in build-alternative-jvm job
add 73afcd2 Merge pull request #697 from ppalaga/i696
add 95ecf8f #670 fix PDF itests in native mode
add 4deda38 Merge pull request #707 from ffang/issue670
add f140b71 Ensure that catalog files are added to the native image #686
add 95a081e Ensure that catalog files are added to the native image #686 (fix findings)
add 08201fe Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
add 559fbdb Update <mvnd.builder.rule> via -Pformat
add cd5d161 Update mvnd.builder.rules by running mvn process-resources -Pformat
add c9a5ddd Fix #688 Create extension mojo not working after Quarkus 1.3.0.Alpha1 upgrade
add a2c8b41 Fix #694 quarkus-maven-plugin generate application.properties file for IT tests
new e435e65 Set quarkus.version to 999-SNAPSHOT
new a3d0fbd Fix MongoDbProcessor according to the latest changes in the mongodb extension
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 (df73414)
\
N -- N -- N refs/heads/quarkus-master (a3d0fbd)
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:
.github/workflows/pr-build.yaml | 9 ++
.mvn/maven.config | 1 +
docs/modules/ROOT/pages/extensions/stream.adoc | 4 -
.../pages/list-of-camel-quarkus-extensions.adoc | 5 +-
examples/file-split-log-xml/pom.xml | 10 ++
examples/observability/pom.xml | 10 ++
examples/rest-json/pom.xml | 10 ++
examples/timer-log-cdi/pom.xml | 10 ++
examples/timer-log-kotlin/pom.xml | 7 ++
examples/timer-log-spring/pom.xml | 10 ++
examples/timer-log-xml/pom.xml | 10 ++
examples/timer-log/pom.xml | 10 ++
.../quarkus/core/deployment/BuildProcessor.java | 6 +-
.../core/deployment/NativeImageProcessor.java | 86 ++++++++++++++-
.../org/apache/camel/quarkus/core/CamelConfig.java | 48 ++++++++
.../camel/quarkus/core/CamelMainRecorder.java | 1 -
.../apache/camel/quarkus/core/CamelRecorder.java | 6 +-
.../camel/quarkus/core/CamelRuntimeCatalog.java | 66 +++++++++++
.../camel/quarkus/core/FastCamelContext.java | 107 +++++++++++++++++-
.../java/org/apache/camel/quarkus/core/Flags.java | 10 ++
.../mongodb/deployment/MongoDbProcessor.java | 22 ++--
.../{aws-kinesis => olingo4}/deployment/pom.xml | 22 ++--
.../olingo4/deployment/Olingo4Processor.java | 72 ++++++++++++
extensions/{bindy => olingo4}/pom.xml | 4 +-
extensions/{sql => olingo4}/runtime/pom.xml | 32 +++---
.../olingo4/graal/ODataImplSubstitutions.java} | 16 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 9 +-
extensions/pdf/deployment/pom.xml | 4 +
.../component/pdf/deployment/PdfProcessor.java | 10 +-
extensions/pdf/runtime/pom.xml | 10 ++
extensions/pom.xml | 3 +-
extensions/readme.adoc | 5 +-
extensions/slack/deployment/pom.xml | 4 +
.../component/slack/deployment/SlackProcessor.java | 8 --
extensions/slack/runtime/pom.xml | 4 +
.../httpclient/deployment/HttpClientProcessor.java | 7 ++
integration-tests/aws/pom.xml | 11 +-
integration-tests/base64/pom.xml | 11 +-
integration-tests/bean-validator/pom.xml | 11 +-
integration-tests/bean/pom.xml | 11 +-
integration-tests/bindy/pom.xml | 11 +-
integration-tests/consul/pom.xml | 11 +-
integration-tests/controlbus/pom.xml | 11 +-
integration-tests/core-impl/pom.xml | 11 +-
integration-tests/core-main-collector/pom.xml | 10 ++
integration-tests/core-main-xml/pom.xml | 11 +-
integration-tests/core-main/pom.xml | 11 +-
integration-tests/core/pom.xml | 11 +-
.../apache/camel/quarkus/core/CamelServlet.java | 23 ++++
.../core/src/main/resources/application.properties | 5 +-
.../org/apache/camel/quarkus/core/CamelTest.java | 8 ++
integration-tests/csv/pom.xml | 11 +-
integration-tests/dataformat/pom.xml | 11 +-
integration-tests/dozer/pom.xml | 11 +-
integration-tests/exec/pom.xml | 11 +-
integration-tests/fhir/pom.xml | 11 +-
integration-tests/file/pom.xml | 11 +-
integration-tests/ftp/pom.xml | 11 +-
integration-tests/http/pom.xml | 11 +-
.../quarkus/component/http/it/HttpResource.java | 30 +++++
.../camel/quarkus/component/http/it/HttpTest.java | 29 +++++
integration-tests/hystrix/pom.xml | 11 +-
integration-tests/infinispan/pom.xml | 11 +-
integration-tests/jackson/pom.xml | 11 +-
integration-tests/jdbc/pom.xml | 11 +-
integration-tests/jsonpath/pom.xml | 11 +-
integration-tests/kafka/pom.xml | 2 +-
integration-tests/mail/pom.xml | 11 +-
integration-tests/microprofile/pom.xml | 11 +-
integration-tests/mongodb/pom.xml | 11 +-
integration-tests/netty/pom.xml | 11 +-
integration-tests/{bindy => olingo4}/pom.xml | 25 +++--
.../component/olingo4/it/Olingo4Resource.java | 120 ++++++++++++++++++++
.../quarkus/component/olingo4/it/Person.java} | 46 ++++----
.../quarkus/component/olingo4/it/Olingo4IT.java} | 4 +-
.../quarkus/component/olingo4/it/Olingo4Test.java | 120 ++++++++++++++++++++
integration-tests/opentracing/pom.xml | 11 +-
integration-tests/paho/pom.xml | 11 +-
integration-tests/pdf/pom.xml | 11 +-
.../quarkus/component/pdf/it/PdfResource.java | 2 +-
integration-tests/platform-http-engine/pom.xml | 11 +-
integration-tests/platform-http/pom.xml | 11 +-
integration-tests/pom.xml | 1 +
integration-tests/reactive-streams/pom.xml | 10 ++
integration-tests/salesforce/pom.xml | 11 +-
integration-tests/scheduler/pom.xml | 11 +-
integration-tests/seda/pom.xml | 11 +-
integration-tests/servlet/pom.xml | 11 +-
integration-tests/sjms/pom.xml | 11 +-
integration-tests/slack/pom.xml | 11 +-
integration-tests/snakeyaml/pom.xml | 11 +-
integration-tests/sql/pom.xml | 11 +-
integration-tests/stream/pom.xml | 11 +-
.../camel/quarkus/test/TrustStoreResource.java | 58 ++++++++++
integration-tests/tagsoup/pom.xml | 11 +-
integration-tests/tarfile/pom.xml | 11 +-
integration-tests/twitter/pom.xml | 11 +-
integration-tests/validator/pom.xml | 11 +-
integration-tests/xslt/pom.xml | 11 +-
integration-tests/zipfile/pom.xml | 11 +-
pom.xml | 2 +
poms/bom-deployment/pom.xml | 5 +
poms/bom/pom.xml | 21 ++++
.../integration-test-application.properties} | 0
.../integration-test-pom.xml | 1 -
tooling/scripts/sort-poms.groovy | 122 +++++++++++++++++++++
tooling/scripts/validate-dependencies.groovy | 4 +-
107 files changed, 1676 insertions(+), 158 deletions(-)
create mode 100644 .mvn/maven.config
create mode 100644 extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
copy extensions/{aws-kinesis => olingo4}/deployment/pom.xml (80%)
create mode 100644 extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
copy extensions/{bindy => olingo4}/pom.xml (93%)
copy extensions/{sql => olingo4}/runtime/pom.xml (74%)
copy extensions/{bean-validator/runtime/src/main/java/org/apache/camel/quarkus/component/bean/validator/graal/SubstituteBeanValidatorEndpoint.java => olingo4/runtime/src/main/java/org/apache/camel/quarkus/component/olingo4/graal/ODataImplSubstitutions.java} (63%)
copy extensions/{consul => olingo4}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (87%)
copy integration-tests/{bindy => olingo4}/pom.xml (82%)
create mode 100644 integration-tests/olingo4/src/main/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Resource.java
copy integration-tests/{dozer/src/main/java/org/apache/camel/quarkus/component/dozer/it/model/CustomerA.java => olingo4/src/main/java/org/apache/camel/quarkus/component/olingo4/it/Person.java} (63%)
copy integration-tests/{csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvIT.java => olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4IT.java} (90%)
create mode 100644 integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java
create mode 100644 integration-tests/support/test-support/src/main/java/org/apache/camel/quarkus/test/TrustStoreResource.java
copy tooling/{package-maven-plugin/src/main/resources/camel-quarkus-package-maven-plugin.properties => create-extension-templates/integration-test-application.properties} (100%)
[camel-quarkus] 02/02: Fix MongoDbProcessor according to the latest
changes in the mongodb extension
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a3d0fbdc26aa47741f3c3e94455248f42d0f69e3
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Feb 7 10:49:27 2020 +0100
Fix MongoDbProcessor according to the latest changes in the mongodb extension
---
.../mongodb/deployment/MongoDbProcessor.java | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
index f14c0c9..00abff7 100644
--- a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
+++ b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.quarkus.component.mongodb.deployment;
-import com.mongodb.MongoClient;
+import java.util.List;
+
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
+import io.quarkus.mongodb.runtime.MongoClientRecorder;
import org.apache.camel.quarkus.component.mongodb.CamelMongoClientRecorder;
import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
@@ -36,10 +39,21 @@ class MongoDbProcessor {
@BuildStep
@Record(ExecutionTime.RUNTIME_INIT)
- CamelRuntimeBeanBuildItem registerCamelMongoClientProducer(MongoClientBuildItem mongoClientBuildItem,
+ void registerCamelMongoClientProducer(
+ List<MongoClientBuildItem> mongoClients,
+ BuildProducer<CamelRuntimeBeanBuildItem> runtimeBeans,
CamelMongoClientRecorder recorder) {
- return new CamelRuntimeBeanBuildItem("camelMongoClient", MongoClient.class.getName(),
- recorder.createCamelMongoClient(mongoClientBuildItem.getClient()));
+ for (MongoClientBuildItem mongoClient : mongoClients) {
+ // If there is a default mongo client instance, then bind it to the camel registry
+ // with the default mongo client name used by the camel-mongodb component
+ if (MongoClientRecorder.DEFAULT_MONGOCLIENT_NAME.equals(mongoClient.getName())) {
+ runtimeBeans.produce(
+ new CamelRuntimeBeanBuildItem(
+ "camelMongoClient",
+ "com.mongodb.MongoClient",
+ recorder.createCamelMongoClient(mongoClients.get(0).getClient())));
+ }
+ }
}
}
[camel-quarkus] 01/02: Set quarkus.version to 999-SNAPSHOT
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e435e652ddf1d7110f356709a7600053550bbc6e
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Feb 7 10:48:54 2020 +0100
Set quarkus.version to 999-SNAPSHOT
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index aa66c18..7ab93e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<ahc.version>2.10.4</ahc.version>
<camel.version>3.0.1</camel.version>
<hapi.version>4.1.0</hapi.version>
- <quarkus.version>1.3.0.Alpha1</quarkus.version>
+ <quarkus.version>999-SNAPSHOT</quarkus.version>
<httpmime.version>4.1.3</httpmime.version>
<jetty.version>9.4.18.v20190429</jetty.version>
<xstream.version>1.4.11</xstream.version>