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 2023/03/02 17:21:13 UTC
[camel-quarkus] branch quarkus-main updated (191c992dca -> f7938b48c8)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 191c992dca Disable cxf-soap-grouped tests due to #4603
discard c6b5a5ae2c Upgrade Quarkus to 3.0.0.CR1
add 77a5999cea Telegram : improve integration tests with Telegram credentials
add eda3bb96cc Telegram: add integration test for the webhook endpoint
add 1beb466b48 Revert "Disable infinispan test temporarily #4499"
add 4f1c2ea5e0 Split infinispan testing into separate modules for the quarkus and camel managed clients
add a2e7c1bb0e Exclude banned xml-apis from org.seleniumhq.selenium:htmlunit-driver
add ed1b0a5167 Upgrade to cq-maven-plugin 3.5.3: flatten faster, sync-versions in proper order
add 0e059a15c9 Updated CHANGELOG.md
add 588b5f431a Aws2-cw: dependency io.quarkus:quarkus-jaxp is not needed for the native run #4614
new 57c4ff72bb Upgrade Quarkus to 3.0.0.CR1
new f7938b48c8 Disable cxf-soap-grouped tests due to #4603
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 (191c992dca)
\
N -- N -- N refs/heads/quarkus-main (f7938b48c8)
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 | 6 +
.../ROOT/pages/reference/extensions/core.adoc | 8 +-
extensions/aws2-cw/deployment/pom.xml | 4 -
extensions/aws2-cw/runtime/pom.xml | 4 -
.../infinispan/deployment/InfinispanProcessor.java | 15 +
integration-test-groups/pom.xml | 2 +-
.../{main-devmode => infinispan-common}/pom.xml | 73 ++--
.../common/InfinispanCommonProducers.java | 53 +++
.../common/InfinispanCommonResources.java | 325 ++++++++++++++++++
.../infinispan/common/InfinispanCommonRoutes.java | 198 +++++++++++
.../component/infinispan/common}/model/Person.java | 2 +-
.../infinispan/common}/model/PersonSchema.java | 2 +-
.../InfinispanCommonServerTestResource.java} | 40 ++-
.../infinispan/common/InfinispanCommonTest.java} | 235 ++++---------
.../src/test/resources/infinispan.xml | 18 +-
.../{consul => infinispan-quarkus-client}/pom.xml | 27 +-
.../infinispan/InfinispanQuarkusClientRoutes.java | 68 ++++
.../src/main/resources/application.properties | 0
.../infinispan/InfinispanQuarkusClientIT.java} | 2 +-
.../infinispan/InfinispanQuarkusClientTest.java} | 22 +-
.../infinispan/InfinispanServerTestResource.java | 42 +++
integration-tests/infinispan/pom.xml | 73 +---
.../infinispan/src/main/java/InfinispanRoutes.java | 75 ++++
.../component/infinispan/InfinispanResources.java | 376 ---------------------
.../component/infinispan/InfinispanRoutes.java | 305 -----------------
.../component/infinispan => }/InfinispanIT.java | 1 -
.../test/java/InfinispanServerTestResource.java | 40 +++
.../src/test/java/InfinispanTest.java} | 34 +-
.../infinispan/InfinispanServerTestResource.java | 99 ------
integration-tests/pom.xml | 4 +-
integration-tests/telegram/README.adoc | 4 +
integration-tests/telegram/pom.xml | 17 +
.../quarkus/component/telegram/it/Routes.java | 5 +-
.../component/telegram/it/TelegramResource.java | 17 +
.../src/main/resources/application.properties | 5 +
.../component/telegram/it/TelegramTest.java | 63 +++-
.../telegram/it/TelegramTestResource.java | 6 +-
.../mappings/telegramWebhook-register.json | 2 +-
pom.xml | 2 +-
poms/bom-test/pom.xml | 15 +
poms/bom/pom.xml | 264 +--------------
poms/bom/src/main/generated/flattened-full-pom.xml | 233 -------------
.../src/main/generated/flattened-reduced-pom.xml | 221 +-----------
.../generated/flattened-reduced-verbose-pom.xml | 221 +-----------
tooling/scripts/test-categories.yaml | 2 +
tooling/scripts/validate-github-workflows.groovy | 1 +
46 files changed, 1184 insertions(+), 2047 deletions(-)
copy integration-tests/{main-devmode => infinispan-common}/pom.xml (80%)
create mode 100644 integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/InfinispanCommonProducers.java
create mode 100644 integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/InfinispanCommonResources.java
create mode 100644 integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/InfinispanCommonRoutes.java
rename integration-tests/{infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan => infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common}/model/Person.java (95%)
rename integration-tests/{infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan => infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common}/model/PersonSchema.java (94%)
copy integration-tests/{couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestResource.java => infinispan-common/src/test/java/org/apache/camel/quarkus/component/infinispan/common/InfinispanCommonServerTestResource.java} (55%)
rename integration-tests/{infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java => infinispan-common/src/test/java/org/apache/camel/quarkus/component/infinispan/common/InfinispanCommonTest.java} (52%)
rename integration-tests/{infinispan => infinispan-common}/src/test/resources/infinispan.xml (81%)
copy integration-tests/{consul => infinispan-quarkus-client}/pom.xml (84%)
create mode 100644 integration-tests/infinispan-quarkus-client/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientRoutes.java
copy integration-tests/{infinispan => infinispan-quarkus-client}/src/main/resources/application.properties (100%)
copy integration-tests/{infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java => infinispan-quarkus-client/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientIT.java} (92%)
copy integration-tests/{github/src/test/java/org/apache/camel/quarkus/component/github/it/GithubTest.java => infinispan-quarkus-client/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientTest.java} (62%)
create mode 100644 integration-tests/infinispan-quarkus-client/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
create mode 100644 integration-tests/infinispan/src/main/java/InfinispanRoutes.java
delete mode 100644 integration-tests/infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanResources.java
delete mode 100644 integration-tests/infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanRoutes.java
rename integration-tests/infinispan/src/test/java/{org/apache/camel/quarkus/component/infinispan => }/InfinispanIT.java (94%)
create mode 100644 integration-tests/infinispan/src/test/java/InfinispanServerTestResource.java
copy integration-tests/{amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java => infinispan/src/test/java/InfinispanTest.java} (55%)
delete mode 100644 integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
[camel-quarkus] 01/02: Upgrade Quarkus to 3.0.0.CR1
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 57c4ff72bb1c125c6ed1a01587467a71fce2af50
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Feb 20 08:00:33 2023 +0000
Upgrade Quarkus to 3.0.0.CR1
---
docs/antora.yml | 2 +-
docs/modules/ROOT/pages/reference/extensions/core.adoc | 8 ++++----
.../component/dataformats/json/jackson/model/TestJAXBPojo.java | 3 +++
pom.xml | 6 +++---
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 0926fb98cb..479e86601f 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M1 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.0.Alpha4 # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.3.0 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index 1126dad561..075d04dc79 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc
@@ -137,7 +137,7 @@ When set to true, the `CamelRuntime` will be started automatically.
|icon:lock[title=Fixed at build time] [[quarkus.camel.service.discovery.exclude-patterns]]`link:#quarkus.camel.service.discovery.exclude-patterns[quarkus.camel.service.discovery.exclude-patterns]`
-A comma-separated list of Ant-path style patterns to match Camel service definition files in the classpath. The services defined in the matching files will not be discoverable via the `org.apache.camel.spi.FactoryFinder` mechanism.
+A comma-separated list of Ant-path style patterns to match Camel service definition files in the classpath. The services defined in the matching files will *not* be discoverable via the **`org.apache.camel.spi.FactoryFinder` mechanism.
The excludes have higher precedence than includes. The excludes defined here can also be used to veto the discoverability of services included by Camel Quarkus extensions.
Example values: `META-INF/services/org/apache/camel/foo/++*++,META-INF/services/org/apache/camel/foo/++**++/bar`
| `string`
@@ -153,9 +153,9 @@ Example values: `META-INF/services/org/apache/camel/foo/++*++,META-INF/services/
|icon:lock[title=Fixed at build time] [[quarkus.camel.service.registry.exclude-patterns]]`link:#quarkus.camel.service.registry.exclude-patterns[quarkus.camel.service.registry.exclude-patterns]`
-A comma-separated list of Ant-path style patterns to match Camel service definition files in the classpath. The services defined in the matching files will not be added to Camel registry during application's static initialization.
+A comma-separated list of Ant-path style patterns to match Camel service definition files in the classpath. The services defined in the matching files will *not* be added to Camel registry during application's static initialization.
The excludes have higher precedence than includes. The excludes defined here can also be used to veto the registration of services included by Camel Quarkus extensions.
-Example values: `META-INF/services/org/apache/camel/foo/++*++,META-INF/services/org/apache/camel/foo/++**++/bar`
+Example values: `META-INF/services/org/apache/camel/foo/++*++,META-INF/services/org/apache/camel/foo/++**++/bar`**
| `string`
|
@@ -227,7 +227,7 @@ Replaced by `quarkus.native.resources.includes` in Camel Quarkus 2.0.0. Using th
|icon:lock[title=Fixed at build time] [[quarkus.camel.native.reflection.exclude-patterns]]`link:#quarkus.camel.native.reflection.exclude-patterns[quarkus.camel.native.reflection.exclude-patterns]`
-A comma separated list of Ant-path style patterns to match class names that should be excluded from registering for reflection. Use the class name format as returned by the `java.lang.Class.getName()` method: package segments delimited by period `.` and inner classes by dollar sign `$`.
+A comma separated list of Ant-path style patterns to match class names that should be *excluded* from registering for reflection. Use the class name format as returned by the `java.lang.Class.getName()` method: package segments delimited by period `.` and inner classes by dollar sign `$`.
This option narrows down the set selected by `include-patterns`. By default, no classes are excluded.
This option cannot be used to unregister classes which have been registered internally by Quarkus extensions.
| `string`
diff --git a/integration-test-groups/dataformats-json/json-jackson/src/main/java/org/apache/camel/quarkus/component/dataformats/json/jackson/model/TestJAXBPojo.java b/integration-test-groups/dataformats-json/json-jackson/src/main/java/org/apache/camel/quarkus/component/dataformats/json/jackson/model/TestJAXBPojo.java
index 7597ec259a..e8448765cd 100644
--- a/integration-test-groups/dataformats-json/json-jackson/src/main/java/org/apache/camel/quarkus/component/dataformats/json/jackson/model/TestJAXBPojo.java
+++ b/integration-test-groups/dataformats-json/json-jackson/src/main/java/org/apache/camel/quarkus/component/dataformats/json/jackson/model/TestJAXBPojo.java
@@ -17,11 +17,14 @@
package org.apache.camel.quarkus.component.dataformats.json.jackson.model;
import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
@RegisterForReflection
@XmlRootElement(name = "XMLPojo")
+@XmlAccessorType(XmlAccessType.FIELD)
public class TestJAXBPojo {
@XmlElement(name = "PojoName")
diff --git a/pom.xml b/pom.xml
index d8f7e776a7..5502a136d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>2.0.0.CR1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.0.0.CR1</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.0.0.Alpha4</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.0.0.Alpha3</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -100,7 +100,7 @@
<google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync -->
<google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version><!-- TODO: Fix this in Camel https://github.com/apache/camel-quarkus/issues/4139 -->
<graalvm.version>22.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.52.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.53.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
@@ -137,7 +137,7 @@
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
<perfmark-api.version>0.25.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
- <protobuf.version>3.21.9</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
+ <protobuf.version>3.22.0</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<reactor-core.version>3.4.26</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.5.0</retrofit.version>
[camel-quarkus] 02/02: Disable cxf-soap-grouped tests due to #4603
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f7938b48c8772fe94ebf94c969a386f8d35acb74
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Feb 27 08:17:59 2023 +0000
Disable cxf-soap-grouped tests due to #4603
---
integration-test-groups/pom.xml | 2 +-
integration-tests/pom.xml | 2 +-
tooling/scripts/test-categories.yaml | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/integration-test-groups/pom.xml b/integration-test-groups/pom.xml
index ec8994406c..c2e6c94917 100644
--- a/integration-test-groups/pom.xml
+++ b/integration-test-groups/pom.xml
@@ -42,7 +42,7 @@
<module>aws2-quarkus-client</module>
<module>azure</module>
<module>compression</module>
- <module>cxf-soap</module>
+ <!--<module>cxf-soap</module> https://github.com/apache/camel-quarkus/issues/4603 -->
<module>dataformats-json</module>
<module>foundation</module>
<module>mongodb</module>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index f6fb866f22..f4325ca812 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -79,7 +79,7 @@
<module>crypto</module>
<module>csimple</module>
<module>csv</module>
- <module>cxf-soap-grouped</module>
+ <!--<module>cxf-soap-grouped</module> https://github.com/apache/camel-quarkus/issues/4603 -->
<module>dataformat</module>
<module>dataformats-json-grouped</module>
<!--<module>datasonnet</module>-->
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 5658ae216b..ac5bce8945 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -78,7 +78,6 @@ group-05:
- bindy
- cbor
- csv
- - cxf-soap-grouped
- dataformat
- hl7
- jaxb