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/01 07:32:10 UTC
[camel-quarkus] branch quarkus-main updated (1ec2cbb185 -> 191c992dca)
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 1ec2cbb185 Disable cxf-soap-grouped tests due to #4603
discard be4bf2b39b Upgrade Quarkus to 3.0.0.CR1
add a92a48feed Zendesk test cannot be compiled to native with Camel 4 and Quarkus 3 #4514
add b24512c649 Remove workaround for quarkus.http.test-ssl-port being ignored by REST Assured
add bb4e85ce8e Updated CHANGELOG.md
add 011f67aea8 Micrometer test coverage - @Counted
add bf5eb74a79 Updated CHANGELOG.md
new c6b5a5ae2c Upgrade Quarkus to 3.0.0.CR1
new 191c992dca 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 (1ec2cbb185)
\
N -- N -- N refs/heads/quarkus-main (191c992dca)
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 +++
.../ahc/deployment/SupportAhcProcessor.java | 6 +++
extensions-support/ahc/runtime/pom.xml | 17 ++++++++
.../ahc/runtime/graal/AhcSubstitutions.java | 23 ++++++----
integration-tests/micrometer/pom.xml | 4 ++
.../micrometer/it/MicrometerResource.java | 41 ++++++++++++------
.../component/micrometer/it/MicrometerRoutes.java | 7 ++++
.../component/micrometer/it/TestMetric.java | 49 ++++++++++++++--------
.../component/micrometer/it/MicrometerTest.java | 41 ++++++++++++++++--
integration-tests/pom.xml | 2 +-
pom.xml | 3 +-
poms/bom/pom.xml | 13 ++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 15 ++++++-
.../src/main/generated/flattened-reduced-pom.xml | 15 ++++++-
.../generated/flattened-reduced-verbose-pom.xml | 15 ++++++-
poms/build-parent-it/pom.xml | 4 --
16 files changed, 209 insertions(+), 52 deletions(-)
copy extensions/paho/runtime/src/main/java/org/apache/camel/quarkus/component/paho/graal/SubstituteBase64.java => extensions-support/ahc/runtime/src/main/java/org/apache/camel/quarkus/component/support/ahc/runtime/graal/AhcSubstitutions.java (58%)
copy integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java => integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/TestMetric.java (50%)
[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 191c992dcace29420dbd28e62fe3031efd93a4fc
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Feb 27 08:17:59 2023 +0000
Disable cxf-soap-grouped tests due to #4603
---
integration-tests/pom.xml | 2 +-
tooling/scripts/test-categories.yaml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 48b4227e0c..e2740b5b13 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 8f06e0ee78..721fbe43fb 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -76,7 +76,6 @@ group-05:
- bindy
- cbor
- csv
- - cxf-soap-grouped
- dataformat
- hl7
- jaxb
[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 c6b5a5ae2c474351f5483ab1188d4564ed6701dc
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 +-
.../component/dataformats/json/jackson/model/TestJAXBPojo.java | 3 +++
pom.xml | 6 +++---
3 files changed, 7 insertions(+), 4 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/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 d6b38c23b4..036b400b00 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>