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/30 06:47:45 UTC
[camel-quarkus] branch quarkus-main updated (0316142ecf -> 7dc49070aa)
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 0316142ecf Upgrade Quarkus to 3.0.0.CR1
add c939424d0b Regen SBOM from commit 87719239f937199b246a8b23321cdd6aa024cf5b
add ae1840edad Updated CHANGELOG.md
add 665510e2ec Update SNAPSHOT deploy build to use JDK 17
add eac88f7c4f Update Sonarcloud build to use JDK 17
add 66c5c71862 Fix (jira): Add jira model classes and jackson joda datatype
add d727e424f8 Updated CHANGELOG.md
add f724916d7b Introduce mapstruct JVM extension
add 40968c3583 Introduce Elasticsearch JVM extension
add 88743158e2 Drop Dozer extension
add 387b525ba7 Drop Elasticsearch-rest extension
add c0c95ca486 Update alternative extensions for Dozer and Elacticsearch-rest
add 71ad90ed11 Updated CHANGELOG.md
add 34bf4efd7d Complete vertx-http test coverage #4658 (#4708)
add 19ca84d78e Upgrade to CXF test container quay.io/l2x6/calculator-ws:1.1
add f6a6bc6f6c Test CXF client with HTTP BASIC authentication #4705
add 939cc90613 Cxf-soap: Extend test coverage with Ssl scenario #4679
add d34f7be109 Updated CHANGELOG.md
new 01b74fb462 Upgrade Quarkus to 3.0.0.CR1
new 7dc49070aa Upgrade quarkus-jgit to 2.3.2
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 (0316142ecf)
\
N -- N -- N refs/heads/quarkus-main (7dc49070aa)
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 | 12 +
Jenkinsfile | 2 +-
Jenkinsfile.sonarcloud | 2 +-
camel-quarkus-sbom/camel-quarkus-sbom.json | 12994 +++++++++++--------
camel-quarkus-sbom/camel-quarkus-sbom.xml | 10276 ++++++++-------
.../ROOT/examples/components/elasticsearch.yml | 13 +
.../modules/ROOT/examples/components/mapstruct.yml | 13 +
docs/modules/ROOT/nav.adoc | 2 +
docs/modules/ROOT/pages/migration-guide/3.0.0.adoc | 4 +-
.../pages/reference/extensions/elasticsearch.adoc | 41 +
.../ROOT/pages/reference/extensions/mapstruct.adoc | 41 +
.../pages/reference/extensions/vertx-http.adoc | 15 +
.../elasticsearch}/deployment/pom.xml | 16 +-
.../deployment/ElasticsearchProcessor.java | 33 +-
.../elasticsearch}/pom.xml | 10 +-
.../elasticsearch}/runtime/pom.xml | 25 +-
.../main/resources/META-INF/quarkus-extension.yaml | 11 +-
.../mapstruct}/deployment/pom.xml | 20 +-
.../mapstruct/deployment/MapstructProcessor.java | 33 +-
.../dozer => extensions-jvm/mapstruct}/pom.xml | 10 +-
.../mapstruct}/runtime/pom.xml | 38 +-
.../main/resources/META-INF/quarkus-extension.yaml | 11 +-
extensions-jvm/pom.xml | 2 +
.../component/dozer/deployment/DozerProcessor.java | 175 -
.../dozer/runtime/src/main/doc/configuration.adoc | 23 -
.../component/dozer/CamelDozerRecorder.java | 40 -
.../dozer/graal/DozerOSGiSubstitutions.java | 113 -
.../runtime/src/main/doc/usage.adoc | 24 -
.../component/jackson/JacksonProcessor.java | 8 +-
.../component/jira/deployment/JiraProcessor.java | 29 +-
extensions/pom.xml | 2 -
.../runtime/src/main/doc/configuration.adoc | 8 +
.../cxf/soap/client/it/CxfSoapClientResource.java | 34 +-
.../cxf/soap/client/it/CxfSoapClientRoutes.java | 20 +
.../src/main/resources/application.properties | 6 +-
.../resources/wsdl/BasicAuthCalculatorService.wsdl | 75 +
.../src/main/resources/wsdl/CalculatorService.wsdl | 188 +-
.../cxf/soap/client/it/CxfClientTestResource.java | 11 +-
.../cxf/soap/client/it/CxfSoapClientTest.java | 57 +-
.../cxf-soap/cxf-soap-ssl/pom.xml | 236 +
.../cxf/soap/ssl/it/CxfSoapSslResource.java | 83 +
.../cxf/soap/ssl/it/CxfSoapSslRoutes.java | 209 +
.../component/cxf/soap/ssl/it/GreeterImpl.java | 15 +-
.../component/cxf/soap/ssl/it/GreeterService.java | 11 +-
.../src/main/resources/application.properties | 11 +-
.../cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java | 4 +-
.../soap/ssl/it/CxfSoapGlobalTrustedSslTest.java | 43 +
.../soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java | 4 +-
.../soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java | 43 +
.../component/cxf/soap/ssl/it/CxfSoapSslIT.java | 5 +-
.../component/cxf/soap/ssl/it/CxfSoapSslTest.java | 65 +
.../soap/wss/client/it/CxfSoapWssClientTest.java | 16 +-
.../wss/client/it/CxfWssClientTestResource.java | 2 +-
integration-test-groups/cxf-soap/pom.xml | 1 +
integration-tests-jvm/elasticsearch/pom.xml | 57 +
integration-tests-jvm/mapstruct/pom.xml | 57 +
integration-tests-jvm/pom.xml | 2 +
integration-tests/cxf-soap-grouped/pom.xml | 62 +
integration-tests/dozer/pom.xml | 132 -
.../quarkus/component/dozer/it/DozerResource.java | 79 -
.../quarkus/component/dozer/it/DozerRoutes.java | 37 -
.../component/dozer/it/model/CustomerA.java | 115 -
.../component/dozer/it/model/CustomerB.java | 166 -
.../src/main/resources/expression-mapping.xml | 35 -
.../dozer/src/main/resources/simple-mapping.xml | 40 -
.../dozer/src/main/resources/variable-mapping.xml | 42 -
.../quarkus/component/dozer/it/DozerTest.java | 74 -
integration-tests/elasticsearch-rest/pom.xml | 159 -
.../rest/it/ElasticsearchRestResource.java | 320 -
.../rest/it/ElasticsearchRestRoutes.java | 73 -
.../rest/it/ElasticSearchTestResource.java | 87 -
.../rest/it/ElasticsearchRestTest.java | 376 -
integration-tests/http/pom.xml | 4 +
.../quarkus/component/http/it/HttpResource.java | 107 +
.../camel/quarkus/component/http/it/HttpRoute.java | 3 +
.../quarkus/component/http/it/HttpService.java | 59 +
.../http/it/VertxClientRelatedBeansProducer.java | 41 +-
.../http/src/main/resources/application.properties | 1 +
.../camel/quarkus/component/http/it/HttpTest.java | 67 +
integration-tests/pom.xml | 2 -
pom.xml | 3 +-
poms/bom/pom.xml | 45 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 49 +-
.../src/main/generated/flattened-reduced-pom.xml | 49 +-
.../generated/flattened-reduced-verbose-pom.xml | 49 +-
85 files changed, 14625 insertions(+), 12952 deletions(-)
create mode 100644 docs/modules/ROOT/examples/components/elasticsearch.yml
create mode 100644 docs/modules/ROOT/examples/components/mapstruct.yml
create mode 100644 docs/modules/ROOT/pages/reference/extensions/elasticsearch.adoc
create mode 100644 docs/modules/ROOT/pages/reference/extensions/mapstruct.adoc
rename {extensions/dozer => extensions-jvm/elasticsearch}/deployment/pom.xml (77%)
copy extensions/jackson/deployment/src/main/java/org/apache/camel/quarkus/component/jackson/JacksonProcessor.java => extensions-jvm/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java (54%)
rename {extensions/elasticsearch-rest => extensions-jvm/elasticsearch}/pom.xml (75%)
rename {extensions/elasticsearch-rest => extensions-jvm/elasticsearch}/runtime/pom.xml (77%)
rename {extensions/dozer => extensions-jvm/elasticsearch}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (82%)
rename {extensions/elasticsearch-rest => extensions-jvm/mapstruct}/deployment/pom.xml (70%)
copy extensions/jackson/deployment/src/main/java/org/apache/camel/quarkus/component/jackson/JacksonProcessor.java => extensions-jvm/mapstruct/deployment/src/main/java/org/apache/camel/quarkus/component/mapstruct/deployment/MapstructProcessor.java (54%)
rename {extensions/dozer => extensions-jvm/mapstruct}/pom.xml (75%)
rename {extensions/dozer => extensions-jvm/mapstruct}/runtime/pom.xml (71%)
rename {extensions/elasticsearch-rest => extensions-jvm/mapstruct}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (84%)
delete mode 100644 extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
delete mode 100644 extensions/dozer/runtime/src/main/doc/configuration.adoc
delete mode 100644 extensions/dozer/runtime/src/main/java/org/apache/camel/quarkus/component/dozer/CamelDozerRecorder.java
delete mode 100644 extensions/dozer/runtime/src/main/java/org/apache/camel/quarkus/component/dozer/graal/DozerOSGiSubstitutions.java
delete mode 100644 extensions/elasticsearch-rest/runtime/src/main/doc/usage.adoc
create mode 100644 extensions/vertx-http/runtime/src/main/doc/configuration.adoc
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/BasicAuthCalculatorService.wsdl
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-ssl/pom.xml
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-ssl/src/main/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslResource.java
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-ssl/src/main/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslRoutes.java
rename extensions/elasticsearch-rest/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/rest/deployment/ElasticsearchRestProcessor.java => integration-test-groups/cxf-soap/cxf-soap-ssl/src/main/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/GreeterImpl.java (67%)
copy integration-tests/dozer/src/test/java/org/apache/camel/quarkus/component/dozer/it/DozerIT.java => integration-test-groups/cxf-soap/cxf-soap-ssl/src/main/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/GreeterService.java (78%)
rename {integration-tests/dozer => integration-test-groups/cxf-soap/cxf-soap-ssl}/src/main/resources/application.properties (75%)
copy integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticsearchRestIT.java => integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java (87%)
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java
rename integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticsearchRestIT.java => integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java (86%)
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java
rename integration-tests/dozer/src/test/java/org/apache/camel/quarkus/component/dozer/it/DozerIT.java => integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java (89%)
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java
create mode 100644 integration-tests-jvm/elasticsearch/pom.xml
create mode 100644 integration-tests-jvm/mapstruct/pom.xml
delete mode 100644 integration-tests/dozer/pom.xml
delete mode 100644 integration-tests/dozer/src/main/java/org/apache/camel/quarkus/component/dozer/it/DozerResource.java
delete mode 100644 integration-tests/dozer/src/main/java/org/apache/camel/quarkus/component/dozer/it/DozerRoutes.java
delete mode 100644 integration-tests/dozer/src/main/java/org/apache/camel/quarkus/component/dozer/it/model/CustomerA.java
delete mode 100644 integration-tests/dozer/src/main/java/org/apache/camel/quarkus/component/dozer/it/model/CustomerB.java
delete mode 100644 integration-tests/dozer/src/main/resources/expression-mapping.xml
delete mode 100644 integration-tests/dozer/src/main/resources/simple-mapping.xml
delete mode 100644 integration-tests/dozer/src/main/resources/variable-mapping.xml
delete mode 100644 integration-tests/dozer/src/test/java/org/apache/camel/quarkus/component/dozer/it/DozerTest.java
delete mode 100644 integration-tests/elasticsearch-rest/pom.xml
delete mode 100644 integration-tests/elasticsearch-rest/src/main/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticsearchRestResource.java
delete mode 100644 integration-tests/elasticsearch-rest/src/main/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticsearchRestRoutes.java
delete mode 100644 integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
delete mode 100644 integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticsearchRestTest.java
rename extensions/dozer/runtime/src/main/java/org/apache/camel/quarkus/component/dozer/CamelDozerConfig.java => integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/VertxClientRelatedBeansProducer.java (50%)
[camel-quarkus] 02/02: Upgrade quarkus-jgit to 2.3.2
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 7dc49070aa750183e4d2e9320ae9f905145f2f1f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Mar 30 07:47:09 2023 +0100
Upgrade quarkus-jgit to 2.3.2
---
pom.xml | 3 +--
poms/bom/pom.xml | 5 -----
poms/bom/src/main/generated/flattened-full-pom.xml | 9 ++-------
poms/bom/src/main/generated/flattened-reduced-pom.xml | 9 ++-------
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 9 ++-------
5 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e97c8ff1d..b9790419cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
<quarkiverse-cxf.version>2.0.0.Alpha4</quarkiverse-cxf.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
<quarkiverse-freemarker.version>1.0.0.Alpha2</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-jackson-jq.version>2.0.0.Alpha</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ -->
- <quarkiverse-jgit.version>2.3.1</quarkiverse-jgit.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
+ <quarkiverse-jgit.version>2.3.2</quarkiverse-jgit.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
<quarkiverse-jsch.version>2.0.3</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
<quarkiverse-minio.version>3.0.0.Alpha3</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>2.0.0.CR2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
@@ -122,7 +122,6 @@
<jaxen.version>1.2.0</jaxen.version>
<javassist.version>3.22.0-CR2</javassist.version><!-- debezium -->
<jetty.version>${jetty-version}</jetty.version>
- <jgit.version>6.4.0.202211300538-r</jgit.version><!-- @sync io.quarkiverse.jgit:quarkus-jgit-parent:${quarkiverse-jgit.version} prop:jgit.version -->
<jna-platform.version>5.6.0</jna-platform.version><!-- @sync com.azure:azure-identity:${azure-identity.version} dep:net.java.dev.jna:jna-platform -->
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
<jsch.version>0.2.6</jsch.version><!-- @sync io.quarkiverse.jsch:quarkus-jsch-parent:${quarkiverse-jsch.version} prop:jsch.version -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index aa5abd189b..80d01f8b04 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6483,11 +6483,6 @@
<artifactId>angus-mail</artifactId>
<version>${angus-mail.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>${jgit.version}</version>
- </dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 1385c3209b..0339708895 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6073,12 +6073,12 @@
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.3.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.3.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jsch</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6346,11 +6346,6 @@
<artifactId>angus-mail</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>org.eclipse.jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.4.0.202211300538-r</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 2dd8a67ea5..d7ac3ff7e2 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6073,12 +6073,12 @@
<dependency>
<groupId>io.quarkiverse.jgit</groupId>
<artifactId>quarkus-jgit</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.jgit</groupId>
<artifactId>quarkus-jgit-deployment</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.jsch</groupId>
@@ -6316,11 +6316,6 @@
<artifactId>angus-mail</artifactId>
<version>1.1.0</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>6.4.0.202211300538-r</version>
- </dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index c286f7d51d..856f19deed 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6073,12 +6073,12 @@
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.3.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.3.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jsch</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6316,11 +6316,6 @@
<artifactId>angus-mail</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>org.eclipse.jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.4.0.202211300538-r</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
[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 01b74fb462c5943e32a3aea08cc1ba06cafada38
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 22 17:09:39 2023 +0000
Upgrade Quarkus to 3.0.0.CR1
---
docs/antora.yml | 2 +-
.../quarkus/component/grpc/deployment/GrpcProcessor.java | 14 +++++++++++++-
pom.xml | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index cc57ac4945..25e569f825 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M2 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.0.Beta1 # 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/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
index 8d2657c404..df49f64a04 100644
--- a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
+++ b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.grpc.deployment;
import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.List;
+import java.util.Optional;
import io.grpc.BindableService;
import io.grpc.stub.AbstractAsyncStub;
@@ -102,6 +103,7 @@ class GrpcProcessor {
if (!Modifier.isAbstract(service.flags())) {
continue;
}
+
if (service.name().withoutPackagePrefix().startsWith("Mutiny")) {
/* The generate-code goal of quarkus-maven-plugin generates also Mutiny service that we do not use
* Not skipping it here results in randomly registering the Mutiny one or the right one.
@@ -110,6 +112,15 @@ class GrpcProcessor {
continue;
}
+ Optional<String> asyncServiceInterface = service.interfaceNames()
+ .stream()
+ .map(DotName::toString)
+ .filter(className -> className.endsWith("AsyncService"))
+ .findFirst();
+ if (asyncServiceInterface.isEmpty()) {
+ continue;
+ }
+
String superClassName = service.name().toString();
String generatedClassName = superClassName + "QuarkusMethodHandler";
@@ -156,7 +167,8 @@ class GrpcProcessor {
// Override service methods that the gRPC component is interested in
// E.g methods with one or two parameters where one is of type StreamObserver
- List<MethodInfo> methods = service.methods();
+ ClassInfo asyncServiceClassInfo = index.getClassByName(asyncServiceInterface.get());
+ List<MethodInfo> methods = asyncServiceClassInfo.methods();
for (MethodInfo method : methods) {
if (isCandidateServiceMethod(method)) {
String[] params = method.parameters()
diff --git a/pom.xml b/pom.xml
index 0f1e0b5dd6..6e97c8ff1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>2.0.0.CR2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.0.0.CR2</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.Beta1</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/ -->
@@ -102,7 +102,7 @@
<google-cloud-pubsub-bom.version>1.121.0</google-cloud-pubsub-bom.version><!-- @sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version} dep:com.google.cloud:google-cloud-pubsub-bom -->
<google-cloud-pubsub.version>1.121.0</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub -->
<graalvm.version>22.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.53.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.54.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>