You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2025/11/03 04:21:56 UTC
(camel-quarkus) branch quarkus-main updated (32cda73210 -> d23abe83fd)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 32cda73210 Upgrade Quarkus to 3.30.0.CR1
add 8d86bdc5b7 Regen SBOM from commit e0ab5ec314560eea68ec895519ade9fb45448e8c (#7929)
new d23abe83fd Upgrade Quarkus to 3.30.0.CR1
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 (32cda73210)
\
N -- N -- N refs/heads/quarkus-main (d23abe83fd)
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 1 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:
camel-quarkus-sbom/camel-quarkus-sbom.json | 21258 ++++++++++++++-------------
camel-quarkus-sbom/camel-quarkus-sbom.xml | 21242 +++++++++++++-------------
2 files changed, 21252 insertions(+), 21248 deletions(-)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.30.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d23abe83fd02e2d8b9e8ee5ddcbd166940397b8a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 23 13:49:47 2025 +0100
Upgrade Quarkus to 3.30.0.CR1
---
.../camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java | 5 ++++-
pom.xml | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
index 7c3b89b231..38937a4629 100644
--- a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
+++ b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
@@ -26,8 +26,10 @@ import io.restassured.RestAssured;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION_NAME;
import static org.apache.camel.quarkus.component.opentelemetry.it.OpenTelemetryTestHelper.getSpans;
import static org.awaitility.Awaitility.await;
+import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -139,6 +141,7 @@ class OpenTelemetryTest {
assertEquals(spans.get(4).get("camel.uri"), "direct://jdbcQuery");
assertEquals(spans.get(5).get("parentId"), "0000000000000000");
- assertEquals(spans.get(5).get("code.function"), "jdbcQuery");
+ assertEquals(spans.get(5).get(CODE_FUNCTION_NAME.getKey()),
+ "org.apache.camel.quarkus.component.opentelemetry.it.OpenTelemetryResource.jdbcQuery");
}
}
diff --git a/pom.xml b/pom.xml
index 8354eb84a1..b36ed02686 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>2.4.1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.8.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
- <quarkus.version>3.29.0</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>4.1.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.10.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -201,7 +201,7 @@
<formatter-maven-plugin.version>2.29.0</formatter-maven-plugin.version>
<gmavenplus-maven-plugin.version>3.0.0</gmavenplus-maven-plugin.version>
<impsort-maven-plugin.version>1.12.0</impsort-maven-plugin.version>
- <jandex-maven-plugin.version>3.5.0</jandex-maven-plugin.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:jandex.version -->
+ <jandex-maven-plugin.version>3.5.1</jandex-maven-plugin.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:jandex.version -->
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
<license-maven-plugin.version>5.0.0</license-maven-plugin.version>
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>