You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zb...@apache.org on 2021/05/03 11:38:18 UTC
[camel-quarkus] branch camel-main updated (16d001d -> d308fb9)
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 16d001d Configure Vert.x BodyHandler for GraphQLTest server
discard 69e4a1d fix junit platform launcher error
discard abd99c0 Adapt MicroProfile Health to Camel 3.10
discard a14cb22 Adapt to latest Camel API changes
discard b801f55 Disable MP health test temporarily #2521
discard b61e9f7 Align Zookeeper dependencies
discard f785a91 Make AtlasMap work on Quarkus 2.0.0
discard fe39627 Workaround for #2514 quarkus.test.flat-class-path=true required to run Avro tests
discard 5b99419 Temporary workaround for #2503 Upgrade to minio 8.2.1 in Camel 3.10 breaks Quarkiverse Minio and MinioClientProducer in our test
discard bf373fe Upgrade to Quarkus 2.0.0.Alpha1
discard 0ea51e5 Kamelet.adoc changes
discard 5ff30f5 fix compilation errors in camel-master branch
discard 4744bb8 Upgrade to Camel 3.10.0
add 7a0d75c Rename routes and JAX-RS endpoints classes to match Camel Quarkus convemntions
add bdbc355 Test bean binding #2492
add 185ee80 Updated CHANGELOG.md
add 3f1c32c Updated CHANGELOG.md
add 4b8aef4 Updated CHANGELOG.md
new 4f8e3b7 Upgrade to Camel 3.10.0
new 0a83913 fix compilation errors in camel-master branch
new 7049c9f Kamelet.adoc changes
new 4426843 Upgrade to Quarkus 2.0.0.Alpha1
new d7a129f Temporary workaround for #2503 Upgrade to minio 8.2.1 in Camel 3.10 breaks Quarkiverse Minio and MinioClientProducer in our test
new c771b59 Workaround for #2514 quarkus.test.flat-class-path=true required to run Avro tests
new 476d8fc Make AtlasMap work on Quarkus 2.0.0
new ea54392 Align Zookeeper dependencies
new f0f9c00 Disable MP health test temporarily #2521
new fcae195 Adapt to latest Camel API changes
new 3989226 Adapt MicroProfile Health to Camel 3.10
new 7d9e76d fix junit platform launcher error
new 4bc456c Configure Vert.x BodyHandler for GraphQLTest server
new d308fb9 fix junit-platform-laucher fo catalog
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 (16d001d)
\
N -- N -- N refs/heads/camel-main (d308fb9)
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 14 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 | 9 +-
catalog/pom.xml | 5 +
.../bean/{CamelResource.java => BeanResource.java} | 103 +++++++++---------
.../bean/{CamelRoute.java => BeanRoutes.java} | 23 +++-
.../{NamedBean.java => CompletionStageBean.java} | 21 +++-
.../component/bean/ConsumeAnnotationBean.java} | 14 ++-
.../component/bean/EagerAppScopedRouteBuilder.java | 4 +-
...tatedParamBean.java => EndpointInjectBean.java} | 15 ++-
.../camel/quarkus/component/bean/NamedBean.java | 15 +++
.../bean/{NamedBean.java => ParametersBean.java} | 33 +++++-
.../quarkus/component/bean/BeanInjectMockTest.java | 4 +-
.../camel/quarkus/component/bean/BeanTest.java | 119 +++++++++++++++++++--
12 files changed, 275 insertions(+), 90 deletions(-)
rename integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/{CamelResource.java => BeanResource.java} (59%)
rename integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/{CamelRoute.java => BeanRoutes.java} (89%)
copy integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/{NamedBean.java => CompletionStageBean.java} (66%)
copy integration-tests/bean/src/{test/java/org/apache/camel/quarkus/component/bean/BeanMethodIT.java => main/java/org/apache/camel/quarkus/component/bean/ConsumeAnnotationBean.java} (77%)
copy integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/{CalledFromLanguageAnnotatedParamBean.java => EndpointInjectBean.java} (76%)
copy integration-tests/bean/src/main/java/org/apache/camel/quarkus/component/bean/{NamedBean.java => ParametersBean.java} (51%)
[camel-quarkus] 02/14: fix compilation errors in camel-master branch
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0a839137c63bab802f45f6e710a3725c337cff13
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed Apr 7 17:04:34 2021 +0200
fix compilation errors in camel-master branch
---
.../apache/camel/quarkus/core/FastCamelContext.java | 17 +++++++++++++++--
extensions-jvm/kotlin-dsl/runtime/pom.xml | 12 ++++++++++++
extensions/jsonpath/runtime/pom.xml | 4 ++++
.../json/path/it/JsonPathTransformTest.java | 9 ++++-----
pom.xml | 1 +
poms/bom/pom.xml | 20 ++++++++++++++++++++
6 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index a0e8a93..992028d 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -74,8 +74,8 @@ import org.apache.camel.impl.engine.DefaultTransformerRegistry;
import org.apache.camel.impl.engine.DefaultUnitOfWorkFactory;
import org.apache.camel.impl.engine.DefaultUriFactoryResolver;
import org.apache.camel.impl.engine.DefaultValidatorRegistry;
-import org.apache.camel.impl.engine.EndpointKey;
import org.apache.camel.impl.engine.PrototypeExchangeFactory;
+import org.apache.camel.impl.engine.PrototypeProcessorExchangeFactory;
import org.apache.camel.impl.engine.RouteService;
import org.apache.camel.impl.engine.TransformerKey;
import org.apache.camel.impl.engine.ValidatorKey;
@@ -139,6 +139,7 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanResourceResolver;
+import org.apache.camel.spi.ProcessorExchangeFactory;
import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
@@ -163,6 +164,7 @@ import org.apache.camel.spi.ValidatorRegistry;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultUuidGenerator;
+import org.apache.camel.support.NormalizedUri;
import org.apache.camel.support.ResolverHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -474,7 +476,7 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
}
@Override
- protected EndpointRegistry<EndpointKey> createEndpointRegistry(Map<EndpointKey, Endpoint> endpoints) {
+ protected EndpointRegistry<NormalizedUri> createEndpointRegistry(Map<NormalizedUri, Endpoint> endpoints) {
return new DefaultEndpointRegistry(this, endpoints);
}
@@ -688,6 +690,17 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
}
@Override
+ protected ProcessorExchangeFactory createProcessorExchangeFactory() {
+ Optional<ProcessorExchangeFactory> result = ResolverHelper.resolveService(
+ getCamelContextReference(),
+ getBootstrapFactoryFinder(),
+ ProcessorExchangeFactory.FACTORY,
+ ProcessorExchangeFactory.class);
+
+ return result.orElseGet(PrototypeProcessorExchangeFactory::new);
+ }
+
+ @Override
public List<RouteDefinition> getRouteDefinitions() {
return model.getRouteDefinitions();
}
diff --git a/extensions-jvm/kotlin-dsl/runtime/pom.xml b/extensions-jvm/kotlin-dsl/runtime/pom.xml
index 27ae382..1449a53 100644
--- a/extensions-jvm/kotlin-dsl/runtime/pom.xml
+++ b/extensions-jvm/kotlin-dsl/runtime/pom.xml
@@ -59,6 +59,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-kotlin-dsl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-script-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm-host</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/jsonpath/runtime/pom.xml b/extensions/jsonpath/runtime/pom.xml
index ea26471..436d146 100644
--- a/extensions/jsonpath/runtime/pom.xml
+++ b/extensions/jsonpath/runtime/pom.xml
@@ -56,6 +56,10 @@
<artifactId>camel-jsonpath</artifactId>
</dependency>
<dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
diff --git a/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java b/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
index b9c1b23..2ffea10 100644
--- a/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
+++ b/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.quarkus.component.json.path.it;
import java.util.Arrays;
-import java.util.List;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
@@ -26,7 +25,7 @@ import org.apache.camel.quarkus.component.json.path.it.CarsRequest.Car;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
class JsonPathTransformTest {
@@ -45,11 +44,11 @@ class JsonPathTransformTest {
@Test
public void getAllCarColorsShouldSucceed() {
- List<String> colors = RestAssured.given() //
+ String colors = RestAssured.given() //
.contentType(ContentType.JSON).body(carsRequest).get("/jsonpath/getAllCarColors").then().statusCode(200)
- .extract().body().jsonPath().getList(".", String.class);
+ .extract().body().asString();
- assertIterableEquals(Arrays.asList("red", "green"), colors);
+ assertEquals("[red, green]", colors);
}
}
diff --git a/pom.xml b/pom.xml
index 337470f..db770cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
<jersey-sun.version>1.19.4</jersey-sun.version><!-- Spark -->
<jetty.version>${jetty9-version}</jetty.version>
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
+ <json-smart.version>2.4.2</json-smart.version>
<kafka.version>2.5.0</kafka.version>
<kudu.version>${kudu-version}</kudu.version><!-- keep in sync with Camel -->
<kotlin.version>1.4.31</kotlin.version><!-- keep in sync with Quarkus -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8129b49..f510aa1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5959,6 +5959,21 @@
<version>${javassist.version}</version>
</dependency>
<dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-script-util</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm-host</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>${jcodings.version}</version>
@@ -6065,6 +6080,11 @@
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>${json-smart.version}</version>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
[camel-quarkus] 05/14: Temporary workaround for #2503 Upgrade to
minio 8.2.1 in Camel 3.10 breaks Quarkiverse Minio and MinioClientProducer
in our test
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d7a129f874fa585519d7334e008cabf37d6ba79b
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Apr 22 12:19:07 2021 +0200
Temporary workaround for #2503 Upgrade to minio 8.2.1 in Camel 3.10 breaks Quarkiverse Minio and MinioClientProducer in our test
---
pom.xml | 1 +
poms/bom/pom.xml | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index fdb12d0..9572ce5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
<kudu.version>${kudu-version}</kudu.version><!-- keep in sync with Camel -->
<kotlin.version>1.4.32</kotlin.version><!-- keep in sync with Quarkus -->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
+ <minio.version>8.1.0</minio.version><!-- Hardcoded as a workaround for https://github.com/apache/camel-quarkus/issues/2503 otherwise should be kept in sync with quarkiverse-minio and camel -->
<mvel2.version>${mvel-version}</mvel2.version><!-- keep in sync with Camel and Optaplanner -->
<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 -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 2f36a15..6712901 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5754,6 +5754,11 @@
<version>${debezium.version}</version>
</dependency>
<dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>${minio.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>${opencensus.version}</version>
[camel-quarkus] 08/14: Align Zookeeper dependencies
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ea543924e6003636f2ea9fda4fb58de6801c3809
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Apr 27 14:12:50 2021 +0200
Align Zookeeper dependencies
---
pom.xml | 1 +
poms/bom/pom.xml | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/pom.xml b/pom.xml
index 9572ce5..a634811 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,7 @@
<web3j.version>${web3j-version}</web3j.version><!-- keep in sync with Camel -->
<web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version><!-- keep in sync with Camel -->
<woodstox-core.version>${woodstox-core-version}</woodstox-core.version><!-- keep in sync with Camel -->
+ <zookeeper.version>${solr-zookeeper-version}</zookeeper.version><!-- ${solr-zookeeper-version} is newer than ${zookeeper-version} -->
<zxing.version>3.3.3</zxing.version><!-- Mess in IOTA transitive deps -->
<!-- Test dependency versions (keep sorted alphabetically) -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 6712901..548d84c 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5904,6 +5904,16 @@
<version>${xmlgraphics-commons.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.asynchttpclient</groupId>
<artifactId>async-http-client</artifactId>
<version>${ahc.version}</version>
[camel-quarkus] 09/14: Disable MP health test temporarily #2521
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f0f9c00a6a489f8ffaf7b10f18791e7005b7a551
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Apr 27 17:03:22 2021 +0200
Disable MP health test temporarily #2521
---
.../component/microprofile/it/health/MicroProfileHealthTest.java | 2 ++
.../quarkus/component/microprofile/it/health/MicroprofileHealthIT.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
index 3bbd62a..2e728bd 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
@@ -24,12 +24,14 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/2521")
@QuarkusTest
class MicroProfileHealthTest {
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
index 9d3e33b..9a21dde 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.microprofile.it.health;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/2521")
@NativeImageTest
class MicroprofileHealthIT extends MicroProfileHealthTest {
[camel-quarkus] 01/14: Upgrade to Camel 3.10.0
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4f8e3b78bef50039e2deb74562091a5fe63e577f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 29 13:27:45 2021 +0100
Upgrade to Camel 3.10.0
---
docs/antora-playbook-dev.yml | 2 +-
docs/antora-playbook.yml | 2 +-
docs/antora.yml | 4 ++--
docs/modules/ROOT/pages/reference/extensions/apns.adoc | 6 +++---
docs/modules/ROOT/partials/reference/components/apns.adoc | 2 +-
docs/modules/ROOT/partials/reference/components/crypto-cms.adoc | 1 -
pom.xml | 6 +++---
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml
index b0695df..019625f 100644
--- a/docs/antora-playbook-dev.yml
+++ b/docs/antora-playbook-dev.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: git@github.com:apache/camel.git
branches:
- - camel-3.9.x # replace ${camel.docs.branch}
+ - camel-3.10.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- url: git@github.com:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index b76a903..3d8396e 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: git@github.com:apache/camel.git
branches:
- - camel-3.9.x # replace ${camel.docs.branch}
+ - camel-3.10.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- url: git@github.com:apache/camel.git
diff --git a/docs/antora.yml b/docs/antora.yml
index 2066fec..80e9fcf 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -22,6 +22,6 @@ nav:
- modules/ROOT/nav.adoc
asciidoc:
attributes:
- cq-camel-components: 3.9.x@components # replace ${camel.docs.components.xref}
+ cq-camel-components: 3.10.x@components # replace ${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
- quarkus-version: 1.13.2.Final # replace ${quarkus.version}
+ quarkus-version: 1.13.2.Final # replace ${quarkus.version}
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/reference/extensions/apns.adoc b/docs/modules/ROOT/pages/reference/extensions/apns.adoc
index 89af05f..3604a25 100644
--- a/docs/modules/ROOT/pages/reference/extensions/apns.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/apns.adoc
@@ -5,14 +5,14 @@
:cq-artifact-id: camel-quarkus-apns
:cq-native-supported: false
:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-status-deprecation: Preview Deprecated
:cq-description: Send notifications to Apple iOS devices.
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.1.0
:cq-native-since: n/a
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
Send notifications to Apple iOS devices.
diff --git a/docs/modules/ROOT/partials/reference/components/apns.adoc b/docs/modules/ROOT/partials/reference/components/apns.adoc
index dbc3d48..e2a3d26 100644
--- a/docs/modules/ROOT/partials/reference/components/apns.adoc
+++ b/docs/modules/ROOT/partials/reference/components/apns.adoc
@@ -4,7 +4,7 @@
:cq-artifact-id-base: apns
:cq-native-supported: false
:cq-status: Preview
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.1.0
:cq-native-since: n/a
:cq-camel-part-name: apns
diff --git a/docs/modules/ROOT/partials/reference/components/crypto-cms.adoc b/docs/modules/ROOT/partials/reference/components/crypto-cms.adoc
deleted file mode 100644
index a509c1d..0000000
--- a/docs/modules/ROOT/partials/reference/components/crypto-cms.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// 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/pom.xml b/pom.xml
index 4626003..337470f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.9.0</version>
+ <version>3.10.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -47,8 +47,8 @@
<bouncycastle.version>${bouncycastle-version}</bouncycastle.version><!-- keep in sync with Camel -->
- <camel.major.minor>3.9</camel.major.minor> <!-- run after each change: cd docs && mvndev validate -->
- <camel.version>${camel.major.minor}.0</camel.version>
+ <camel.major.minor>3.10</camel.major.minor> <!-- run after each change: cd docs && mvndev validate -->
+ <camel.version>${camel.major.minor}.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 -->
[camel-quarkus] 13/14: Configure Vert.x BodyHandler for GraphQLTest
server
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4bc456c3043fbd628b93d65836e2f4e26fbf791e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Apr 30 15:25:05 2021 +0100
Configure Vert.x BodyHandler for GraphQLTest server
---
.../org/apache/camel/quarkus/component/graphql/it/GraphQLResource.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/GraphQLResource.java b/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/GraphQLResource.java
index e419119..da59d2e 100644
--- a/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/GraphQLResource.java
+++ b/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/GraphQLResource.java
@@ -43,6 +43,7 @@ import graphql.schema.idl.SchemaGenerator;
import graphql.schema.idl.SchemaParser;
import graphql.schema.idl.TypeDefinitionRegistry;
import io.vertx.ext.web.Router;
+import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandler;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.quarkus.component.graphql.it.model.Book;
@@ -85,6 +86,7 @@ public class GraphQLResource {
GraphQL graphQL = GraphQL.newGraphQL(graphQLSchema).build();
+ router.post().handler(BodyHandler.create());
router.route("/graphql/server").handler(GraphQLHandler.create(graphQL));
}
[camel-quarkus] 10/14: Adapt to latest Camel API changes
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit fcae195970952dc86362e19ded998476c1eab2f3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Apr 30 09:03:37 2021 +0100
Adapt to latest Camel API changes
---
.../runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java
index df3c89a..ddb0d15 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java
@@ -406,7 +406,7 @@ public abstract class BaseModel implements Model {
public ProcessorDefinition getProcessorDefinition(String id) {
for (RouteDefinition route : getRouteDefinitions()) {
Iterator<ProcessorDefinition> it = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(),
- ProcessorDefinition.class);
+ ProcessorDefinition.class).iterator();
while (it.hasNext()) {
ProcessorDefinition proc = it.next();
if (id.equals(proc.getId())) {
[camel-quarkus] 07/14: Make AtlasMap work on Quarkus 2.0.0
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 476d8fc3e84bf8c9042058d9f61d1b1889f82181
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Apr 27 00:05:57 2021 +0200
Make AtlasMap work on Quarkus 2.0.0
---
.../atlasmap/deployment/AtlasmapProcessor.java | 20 +++++
.../component/atlasmap/AtlasmapRecorder.java | 90 ++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java
index 4eee6bf..0e35d58 100644
--- a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java
+++ b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java
@@ -180,11 +180,20 @@ import io.atlasmap.xml.v2.XmlNamespace;
import io.atlasmap.xml.v2.XmlNamespaces;
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.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.recording.RecorderContext;
import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.runtime.RuntimeValue;
+import org.apache.camel.component.atlasmap.AtlasMapComponent;
+import org.apache.camel.quarkus.component.atlasmap.AtlasmapRecorder;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CompiledCSimpleExpressionBuildItem;
class AtlasmapProcessor {
@@ -382,4 +391,15 @@ class AtlasmapProcessor {
});
}
+ @Record(ExecutionTime.STATIC_INIT)
+ @BuildStep
+ CamelBeanBuildItem configureComponent(
+ RecorderContext recorderContext,
+ AtlasmapRecorder recorder,
+ CamelContextBuildItem camelContext,
+ List<CompiledCSimpleExpressionBuildItem> compiledCSimpleExpressions) {
+
+ final RuntimeValue<?> atlasmapComponent = recorder.createAtlasmapComponent();
+ return new CamelBeanBuildItem("atlasmap", AtlasMapComponent.class.getName(), atlasmapComponent);
+ }
}
diff --git a/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/AtlasmapRecorder.java b/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/AtlasmapRecorder.java
new file mode 100644
index 0000000..146484c
--- /dev/null
+++ b/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/AtlasmapRecorder.java
@@ -0,0 +1,90 @@
+package org.apache.camel.quarkus.component.atlasmap;
+
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import io.atlasmap.core.DefaultAtlasContextFactory;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import org.apache.camel.component.atlasmap.AtlasMapComponent;
+import org.jboss.logging.Logger;
+
+@Recorder
+public class AtlasmapRecorder {
+
+ public RuntimeValue<AtlasMapComponent> createAtlasmapComponent() {
+ /*
+ * TODO simplify once https://github.com/atlasmap/atlasmap/issues/2704 is solved
+ * Currently there is no way to directly create a DefaultAtlasContextFactory with a custom compound class loader
+ */
+ final DefaultAtlasContextFactory cf = DefaultAtlasContextFactory.getInstance();
+ cf.destroy();
+ final CamelQuarkusCompoundClassLoader compoundClassLoader = new CamelQuarkusCompoundClassLoader();
+ final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ compoundClassLoader.addAlternativeLoader(tccl);
+ cf.init(compoundClassLoader);
+
+ final AtlasMapComponent component = new AtlasMapComponent();
+ component.setAtlasContextFactory(cf);
+ return new RuntimeValue<AtlasMapComponent>(component);
+ }
+
+ /**
+ * TODO: remove once https://github.com/atlasmap/atlasmap/pull/2703 is fixed in an AtlasMap version we use
+ */
+ static class CamelQuarkusCompoundClassLoader extends io.atlasmap.core.CompoundClassLoader {
+ private static final Logger LOG = Logger.getLogger(CamelQuarkusCompoundClassLoader.class);
+
+ private Set<ClassLoader> delegates = new LinkedHashSet<>();
+
+ @Override
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
+ for (ClassLoader cl : delegates) {
+ try {
+ return cl.loadClass(name);
+ } catch (Throwable t) {
+ LOG.debugf(t, "Class '%s' was not found with ClassLoader '%s'", name, cl);
+ }
+ }
+ throw new ClassNotFoundException(name);
+ }
+
+ @Override
+ public URL getResource(String name) {
+ for (ClassLoader cl : delegates) {
+ URL url = cl.getResource(name);
+ if (url != null) {
+ return url;
+ }
+ LOG.debugf("Resource '%s' was not found with ClassLoader '%s'", name, cl);
+ }
+ return null;
+ }
+
+ @Override
+ public Enumeration<URL> getResources(String name) {
+ List<URL> answer = new LinkedList<>();
+ for (ClassLoader cl : delegates) {
+ try {
+ Enumeration<URL> urls = cl.getResources(name);
+ while (urls != null && urls.hasMoreElements()) {
+ answer.add(urls.nextElement());
+ }
+ } catch (Exception e) {
+ LOG.debugf(e, "I/O error while looking for a resource '%s' with ClassLoader '%s'", name, cl);
+ }
+ }
+ return Collections.enumeration(answer);
+ }
+
+ @Override
+ public synchronized void addAlternativeLoader(ClassLoader cl) {
+ delegates.add(cl);
+ }
+ }
+}
[camel-quarkus] 06/14: Workaround for #2514
quarkus.test.flat-class-path=true required to run Avro tests
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c771b59fb91a4723c582bf31757f9fd5f72019f4
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Apr 26 14:02:47 2021 +0200
Workaround for #2514 quarkus.test.flat-class-path=true required to run Avro tests
---
.../src/main/resources/application.properties | 19 +++++++++++++++++++
.../avro/src/main/resources/application.properties | 19 +++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/integration-tests/avro-rpc/src/main/resources/application.properties b/integration-tests/avro-rpc/src/main/resources/application.properties
new file mode 100644
index 0000000..0364c80
--- /dev/null
+++ b/integration-tests/avro-rpc/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+# Workaround for https://github.com/apache/camel-quarkus/issues/2514
+quarkus.test.flat-class-path=true
diff --git a/integration-tests/avro/src/main/resources/application.properties b/integration-tests/avro/src/main/resources/application.properties
new file mode 100644
index 0000000..a7e9ab0
--- /dev/null
+++ b/integration-tests/avro/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+# Workaround for https://github.com/apache/camel-quarkus/issues/2514
+quarkus.test.flat-class-path=true
\ No newline at end of file
[camel-quarkus] 04/14: Upgrade to Quarkus 2.0.0.Alpha1
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4426843db2f48a30d7b5a28c0c58bef8a97c6273
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed Apr 21 15:59:48 2021 +0200
Upgrade to Quarkus 2.0.0.Alpha1
---
docs/antora.yml | 2 +-
.../camel/quarkus/core/CamelContextRecorder.java | 2 +
.../quarkus/core/CamelQuarkusClassResolver.java | 99 ++++++++++++++++++++++
.../camel/quarkus/core/FastCamelContext.java | 5 +-
.../org/apache/camel/quarkus/main/CamelMain.java | 4 +-
.../component/minio/it/MinioClientProducer.java | 2 +-
.../component/minio/it/MinioConfigProvider.java | 6 ++
.../vertx/kafka/it/VertxKafkaProducers.java | 3 +-
pom.xml | 8 +-
poms/bom/pom.xml | 10 +++
10 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 80e9fcf..8863269 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -24,4 +24,4 @@ asciidoc:
attributes:
cq-camel-components: 3.10.x@components # replace ${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
- quarkus-version: 1.13.2.Final # replace ${quarkus.version}
\ No newline at end of file
+ quarkus-version: 2.0.0.Alpha1 # replace ${quarkus.version}
\ No newline at end of file
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
index c73e8f7..f8cb34c 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -56,6 +56,8 @@ public class CamelContextRecorder {
context.setLoadTypeConverters(false);
context.setModelJAXBContextFactory(contextFactory.getValue());
context.adapt(ExtendedCamelContext.class).setStartupStepRecorder(startupStepRecorder.getValue());
+ final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ context.setApplicationContextClassLoader(tccl);
context.build();
context.addLifecycleStrategy(new CamelLifecycleEventBridge());
context.getManagementStrategy().addEventNotifier(new CamelManagementEventBridge());
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java
new file mode 100644
index 0000000..361763c
--- /dev/null
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java
@@ -0,0 +1,99 @@
+package org.apache.camel.quarkus.core;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.util.CastUtils;
+import org.apache.camel.util.ObjectHelper;
+
+public class CamelQuarkusClassResolver implements ClassResolver {
+
+ private final ClassLoader applicationContextClassLoader;
+
+ public CamelQuarkusClassResolver(ClassLoader applicationContextClassLoader) {
+ this.applicationContextClassLoader = applicationContextClassLoader;
+ }
+
+ @Override
+ public Class<?> resolveClass(String name) {
+ return loadClass(name, applicationContextClassLoader);
+ }
+
+ @Override
+ public <T> Class<T> resolveClass(String name, Class<T> type) {
+ return CastUtils.cast(loadClass(name, applicationContextClassLoader));
+ }
+
+ @Override
+ public Class<?> resolveClass(String name, ClassLoader loader) {
+ return loadClass(name, loader);
+ }
+
+ @Override
+ public <T> Class<T> resolveClass(String name, Class<T> type, ClassLoader loader) {
+ return CastUtils.cast(loadClass(name, loader));
+ }
+
+ @Override
+ public Class<?> resolveMandatoryClass(String name) throws ClassNotFoundException {
+ Class<?> answer = resolveClass(name);
+ if (answer == null) {
+ throw new ClassNotFoundException(name);
+ }
+ return answer;
+ }
+
+ @Override
+ public <T> Class<T> resolveMandatoryClass(String name, Class<T> type) throws ClassNotFoundException {
+ Class<T> answer = resolveClass(name, type);
+ if (answer == null) {
+ throw new ClassNotFoundException(name);
+ }
+ return answer;
+ }
+
+ @Override
+ public Class<?> resolveMandatoryClass(String name, ClassLoader loader) throws ClassNotFoundException {
+ Class<?> answer = resolveClass(name, loader);
+ if (answer == null) {
+ throw new ClassNotFoundException(name);
+ }
+ return answer;
+ }
+
+ @Override
+ public <T> Class<T> resolveMandatoryClass(String name, Class<T> type, ClassLoader loader) throws ClassNotFoundException {
+ Class<T> answer = resolveClass(name, type, loader);
+ if (answer == null) {
+ throw new ClassNotFoundException(name);
+ }
+ return answer;
+ }
+
+ @Override
+ public InputStream loadResourceAsStream(String uri) {
+ return ObjectHelper.loadResourceAsStream(uri, applicationContextClassLoader);
+ }
+
+ @Override
+ public URL loadResourceAsURL(String uri) {
+ return ObjectHelper.loadResourceAsURL(uri, applicationContextClassLoader);
+ }
+
+ @Override
+ public Enumeration<URL> loadResourcesAsURL(String uri) {
+ return loadAllResourcesAsURL(uri);
+ }
+
+ @Override
+ public Enumeration<URL> loadAllResourcesAsURL(String uri) {
+ return ObjectHelper.loadResourcesAsURL(uri);
+ }
+
+ protected Class<?> loadClass(String name, ClassLoader loader) {
+ return ObjectHelper.loadClass(name, loader);
+ }
+
+}
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index 992028d..a7ba15d 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.function.Function;
@@ -46,7 +47,6 @@ import org.apache.camel.impl.engine.DefaultAsyncProcessorAwaitManager;
import org.apache.camel.impl.engine.DefaultBeanIntrospection;
import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
import org.apache.camel.impl.engine.DefaultCamelContextNameStrategy;
-import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.impl.engine.DefaultComponentNameResolver;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.impl.engine.DefaultConfigurerResolver;
@@ -298,7 +298,8 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
@Override
protected ClassResolver createClassResolver() {
- return new DefaultClassResolver(this);
+ return new CamelQuarkusClassResolver(Objects.requireNonNull(getApplicationContextClassLoader(),
+ "applicationContextClassLoader must be set before calling createClassResolver()"));
}
@Override
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
index 6078f35..579e668 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
@@ -121,11 +121,11 @@ public final class CamelMain extends MainCommandLineSupport implements HasCamelC
throw new IllegalStateException("Should not be invoked");
}
- Collection<MainListener> getMainListeners() {
+ public Collection<MainListener> getMainListeners() {
return Collections.unmodifiableCollection(listeners);
}
- MainConfigurationProperties getMainConfigurationProperties() {
+ public MainConfigurationProperties getMainConfigurationProperties() {
return mainConfigurationProperties;
}
diff --git a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java
index d3ea59d..74fe08f 100644
--- a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java
+++ b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java
@@ -17,8 +17,8 @@
package org.apache.camel.quarkus.component.minio.it;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
import javax.inject.Named;
-import javax.ws.rs.Produces;
import io.minio.MinioClient;
diff --git a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioConfigProvider.java b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioConfigProvider.java
index 809a7d4..496cc29 100644
--- a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioConfigProvider.java
+++ b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioConfigProvider.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.minio.it;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
import org.eclipse.microprofile.config.spi.ConfigSource;
import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
@@ -57,5 +58,10 @@ public class MinioConfigProvider implements ConfigSourceProvider {
public String getName() {
return MinioConfig.class.getName();
}
+
+ @Override
+ public Set<String> getPropertyNames() {
+ return values.keySet();
+ }
}
}
diff --git a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java b/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java
index 4ad0be0..6674b85 100644
--- a/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java
+++ b/integration-tests/vertx-kafka/src/main/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaProducers.java
@@ -52,7 +52,8 @@ public class VertxKafkaProducers {
config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
KafkaConsumer<String, String> consumer = KafkaConsumer.create(vertx, config);
- return consumer.subscribe(TOPIC_OUTBOUND);
+ consumer.subscribe(TOPIC_OUTBOUND);
+ return consumer;
}
@Produces
diff --git a/pom.xml b/pom.xml
index db770cc..fdb12d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,20 +94,22 @@
<json-smart.version>2.4.2</json-smart.version>
<kafka.version>2.5.0</kafka.version>
<kudu.version>${kudu-version}</kudu.version><!-- keep in sync with Camel -->
- <kotlin.version>1.4.31</kotlin.version><!-- keep in sync with Quarkus -->
+ <kotlin.version>1.4.32</kotlin.version><!-- keep in sync with Quarkus -->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
<mvel2.version>${mvel-version}</mvel2.version><!-- keep in sync with Camel and Optaplanner -->
<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 -->
+ <opencensus.version>0.28.0</opencensus.version><!-- mess in google-pubsub deps -->
<optaplanner.version>8.2.0.Final</optaplanner.version>
+ <perfmark.version>0.23.0</perfmark.version><!-- mess in google-pubsub deps -->
+ <protobuf.version>${protobuf-version}</protobuf.version>
<quarkiverse.freemarker.version>0.2.2</quarkiverse.freemarker.version>
<quarkiverse-minio.version>0.2.2</quarkiverse-minio.version>
- <quarkus.version>1.13.2.Final</quarkus.version>
+ <quarkus.version>2.0.0.Alpha1</quarkus.version>
<quarkus-google-cloud.version>0.5.0</quarkus-google-cloud.version>
<quarkus-hazelcast-client.version>1.1.1</quarkus-hazelcast-client.version>
<quarkus-qpid-jms.version>0.24.0</quarkus-qpid-jms.version>
- <protobuf.version>${protobuf-version}</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
<scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
<smallrye.reactive.messaging.camel.version>2.9.0</smallrye.reactive.messaging.camel.version> <!-- keep in sync with Quarkus SmallRye Reactive Messaging -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index f510aa1..2f36a15 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5754,6 +5754,16 @@
<version>${debezium.version}</version>
</dependency>
<dependency>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-api</artifactId>
+ <version>${opencensus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.perfmark</groupId>
+ <artifactId>perfmark-api</artifactId>
+ <version>${perfmark.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker</artifactId>
<version>${quarkiverse.freemarker.version}</version>
[camel-quarkus] 12/14: fix junit platform launcher error
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7d9e76dc5c317dbb5fe39ab71a96a1bda17c97f3
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Fri Apr 30 14:09:27 2021 +0200
fix junit platform launcher error
---
extensions/jolt/runtime/pom.xml | 6 +++++-
extensions/qute/component/pom.xml | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/extensions/jolt/runtime/pom.xml b/extensions/jolt/runtime/pom.xml
index 87ae92f..ee33e52 100644
--- a/extensions/jolt/runtime/pom.xml
+++ b/extensions/jolt/runtime/pom.xml
@@ -71,7 +71,11 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/qute/component/pom.xml b/extensions/qute/component/pom.xml
index a16aa39..06d07b9 100644
--- a/extensions/qute/component/pom.xml
+++ b/extensions/qute/component/pom.xml
@@ -87,6 +87,11 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
[camel-quarkus] 14/14: fix junit-platform-laucher fo catalog
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d308fb9b9e5d1cdd4101dfcf0abcb00e322b6ac4
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Mon May 3 13:36:19 2021 +0200
fix junit-platform-laucher fo catalog
---
catalog/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 4cd06eb..1ca4fad 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -58,6 +58,11 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependency>
[camel-quarkus] 03/14: Kamelet.adoc changes
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7049c9f2760d2d08f4876e79521f5e014859324b
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Fri Apr 16 10:02:25 2021 +0200
Kamelet.adoc changes
---
docs/modules/ROOT/partials/reference/components/kamelet.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/partials/reference/components/kamelet.adoc b/docs/modules/ROOT/partials/reference/components/kamelet.adoc
index 0d5ba2c..f1f5c22 100644
--- a/docs/modules/ROOT/partials/reference/components/kamelet.adoc
+++ b/docs/modules/ROOT/partials/reference/components/kamelet.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.7.0
:cq-camel-part-name: kamelet
:cq-camel-part-title: Kamelet
-:cq-camel-part-description: The Kamelet Component provides support for interacting with the Camel Route Template engine
+:cq-camel-part-description: To call Kamelets
:cq-extension-page-title: Kamelet
[camel-quarkus] 11/14: Adapt MicroProfile Health to Camel 3.10
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 39892267fa62df6275ef86e7165b26775d609195
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Apr 30 09:46:44 2021 +0100
Adapt MicroProfile Health to Camel 3.10
Fixes #2521
---
.../it/health/MicroProfileHealthTest.java | 63 ++++++++++------------
.../it/health/MicroprofileHealthIT.java | 2 -
2 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
index 2e728bd..b8d2834 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java
@@ -24,30 +24,27 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import org.awaitility.Awaitility;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
-@Disabled("https://github.com/apache/camel-quarkus/issues/2521")
@QuarkusTest
class MicroProfileHealthTest {
@Test
public void testHealthUpStatus() {
- RestAssured.when().get("/health").then()
+ RestAssured.when().get("/q/health").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("UP"),
- "checks.status", containsInAnyOrder("UP", "UP", "UP"),
+ "checks.status", containsInAnyOrder("UP", "UP"),
"checks.name",
- containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks", "camel-context-check"),
- "checks.data.contextStatus", containsInAnyOrder(null, null, "Started"),
- "checks.data.'route:healthyRoute'", containsInAnyOrder(null, null, "UP"),
- "checks.data.always-up", containsInAnyOrder(null, "UP", "UP"),
- "checks.data.name", containsInAnyOrder(null, null, "quarkus-camel-example"));
+ containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks"),
+ "checks.data.context", containsInAnyOrder(null, "UP"),
+ "checks.data.'route:healthyRoute'", containsInAnyOrder(null, "UP"),
+ "checks.data.always-up", containsInAnyOrder("UP", "UP"));
}
@Test
@@ -57,16 +54,14 @@ class MicroProfileHealthTest {
.then()
.statusCode(204);
- RestAssured.when().get("/health").then()
+ RestAssured.when().get("/q/health").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("DOWN"),
- "checks.status", containsInAnyOrder("DOWN", "UP", "DOWN"),
+ "checks.status", containsInAnyOrder("DOWN", "DOWN"),
"checks.name",
- containsInAnyOrder("camel-readiness-checks", "camel-context-check", "camel-liveness-checks"),
- "checks.data.contextStatus", containsInAnyOrder(null, null, "Started"),
- "checks.data.name",
- containsInAnyOrder(null, null, "quarkus-camel-example"));
+ containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks"),
+ "checks.data.context", containsInAnyOrder(null, "UP"));
} finally {
RestAssured.get("/microprofile-health/checks/failing/false")
.then()
@@ -76,7 +71,7 @@ class MicroProfileHealthTest {
@Test
public void testLivenessUpStatus() {
- RestAssured.when().get("/health/live").then()
+ RestAssured.when().get("/q/health/live").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("UP"),
@@ -93,7 +88,7 @@ class MicroProfileHealthTest {
.then()
.statusCode(204);
- RestAssured.when().get("/health/live").then()
+ RestAssured.when().get("/q/health/live").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("DOWN"),
@@ -111,15 +106,14 @@ class MicroProfileHealthTest {
@Test
public void testReadinessUpStatus() {
- RestAssured.when().get("/health/ready").then()
+ RestAssured.when().get("/q/health/ready").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("UP"),
- "checks.status", containsInAnyOrder("UP", "UP"),
- "checks.name", containsInAnyOrder("camel-readiness-checks", "camel-context-check"),
- "checks.data.contextStatus", containsInAnyOrder(null, "Started"),
- "checks.data.name", containsInAnyOrder(null, "quarkus-camel-example"),
- "checks.data.test-readiness", containsInAnyOrder(null, "UP"));
+ "checks.status", containsInAnyOrder("UP"),
+ "checks.name", containsInAnyOrder("camel-readiness-checks"),
+ "checks.data.context", containsInAnyOrder("UP"),
+ "checks.data.test-readiness", containsInAnyOrder("UP"));
}
@Test
@@ -129,15 +123,14 @@ class MicroProfileHealthTest {
.then()
.statusCode(204);
- RestAssured.when().get("/health/ready").then()
+ RestAssured.when().get("/q/health/ready").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("DOWN"),
- "checks.status", containsInAnyOrder("UP", "DOWN"),
- "checks.name", containsInAnyOrder("camel-readiness-checks", "camel-context-check"),
- "checks.data.contextStatus", containsInAnyOrder(null, "Started"),
- "checks.data.name", containsInAnyOrder(null, "quarkus-camel-example"),
- "checks.data.test-readiness", containsInAnyOrder(null, "UP"));
+ "checks.status", containsInAnyOrder("DOWN"),
+ "checks.name", containsInAnyOrder("camel-readiness-checks"),
+ "checks.data.context", containsInAnyOrder("UP"),
+ "checks.data.test-readiness", containsInAnyOrder("UP"));
} finally {
RestAssured.get("/microprofile-health/checks/failing/false")
.then()
@@ -152,11 +145,11 @@ class MicroProfileHealthTest {
.then()
.statusCode(204);
- RestAssured.when().get("/health").then()
+ RestAssured.when().get("/q/health").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("DOWN"),
- "checks.data.'route:healthyRoute'", containsInAnyOrder(null, null, "DOWN"));
+ "checks.data.'route:healthyRoute'", containsInAnyOrder(null, "DOWN"));
} finally {
RestAssured.get("/microprofile-health/route/healthyRoute/start")
.then()
@@ -172,15 +165,15 @@ class MicroProfileHealthTest {
.statusCode(204);
// Configured failure threshold and interval should allow the initial health state be UP
- RestAssured.when().get("/health").then()
+ RestAssured.when().get("/q/health").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.body("status", is("UP"),
- "checks.data.'route:checkIntervalThreshold'", containsInAnyOrder(null, null, "UP"));
+ "checks.data.'route:checkIntervalThreshold'", containsInAnyOrder(null, "UP"));
// Poll the health endpoint until the threshold / interval is exceeded and the health state transitions to DOWN
Awaitility.await().atMost(10, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> {
- JsonPath result = RestAssured.when().get("/health").then()
+ JsonPath result = RestAssured.when().get("/q/health").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.extract()
@@ -197,7 +190,7 @@ class MicroProfileHealthTest {
// Wait for the threshold check to report status UP
Awaitility.await().atMost(10, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> {
- JsonPath result = RestAssured.when().get("/health").then()
+ JsonPath result = RestAssured.when().get("/q/health").then()
.contentType(ContentType.JSON)
.header("Content-Type", containsString("charset=UTF-8"))
.extract()
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
index 9a21dde..9d3e33b 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroprofileHealthIT.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.component.microprofile.it.health;
import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.Disabled;
-@Disabled("https://github.com/apache/camel-quarkus/issues/2521")
@NativeImageTest
class MicroprofileHealthIT extends MicroProfileHealthTest {