Skip to content

Commit 2cf8320

Browse files
Upgrade Quarkus to 3.30.0.CR1
1 parent 37aa3bb commit 2cf8320

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
import org.junit.jupiter.api.AfterEach;
2727
import org.junit.jupiter.api.Test;
2828

29+
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION_NAME;
2930
import static org.apache.camel.quarkus.component.opentelemetry.it.OpenTelemetryTestHelper.getSpans;
3031
import static org.awaitility.Awaitility.await;
32+
import static org.hamcrest.CoreMatchers.endsWith;
3133
import static org.hamcrest.CoreMatchers.equalTo;
3234
import static org.junit.jupiter.api.Assertions.assertEquals;
3335
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -139,6 +141,7 @@ public void testTracedJdbcQuery() {
139141
assertEquals(spans.get(4).get("camel.uri"), "direct://jdbcQuery");
140142

141143
assertEquals(spans.get(5).get("parentId"), "0000000000000000");
142-
assertEquals(spans.get(5).get("code.function"), "jdbcQuery");
144+
assertEquals(spans.get(5).get(CODE_FUNCTION_NAME.getKey()),
145+
"org.apache.camel.quarkus.component.opentelemetry.it.OpenTelemetryResource.jdbcQuery");
143146
}
144147
}

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
6262
<quarkiverse-mybatis.version>2.4.1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
6363
<quarkiverse-pooled-jms.version>2.8.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
64-
<quarkus.version>3.29.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
64+
<quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
6565
<quarkus-hazelcast-client.version>4.1.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
6666
<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/ -->
6767

@@ -79,7 +79,7 @@
7979
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
8080
<azure-core.version>1.56.1</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core -->
8181
<azure-identity.version>1.18.0</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity -->
82-
<caffeine.version>3.2.2</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine -->
82+
<caffeine.version>3.2.3</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine -->
8383
<chicory.version>${chicory-version}</chicory.version>
8484
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
8585
<commons-cli.version>1.8.0</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
@@ -132,10 +132,10 @@
132132
<jedis-client.version>${jedis-client-version}</jedis-client.version>
133133
<json-smart.version>${json-smart-version}</json-smart.version>
134134
<jxmpp.version>1.1.0</jxmpp.version><!-- @sync org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid -->
135-
<kafka.version>4.0.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
135+
<kafka.version>4.0.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
136136
<keycloak.version>26.4.0</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version -->
137137
<kudu.version>${kudu-version}</kudu.version>
138-
<kotlin.version>2.2.20</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
138+
<kotlin.version>2.2.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
139139
<kotlinx.version>1.4.0</kotlinx.version><!--Used by com.squareup.wire:wire-compiler referenced from aws2:kinesis -->
140140
<kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo -->
141141
<langchain4j.version>1.5.0</langchain4j.version><!-- @sync io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version} prop:langchain4j.version -->
@@ -202,7 +202,7 @@
202202
<formatter-maven-plugin.version>2.29.0</formatter-maven-plugin.version>
203203
<gmavenplus-maven-plugin.version>3.0.0</gmavenplus-maven-plugin.version>
204204
<impsort-maven-plugin.version>1.12.0</impsort-maven-plugin.version>
205-
<jandex-maven-plugin.version>3.5.0</jandex-maven-plugin.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:jandex.version -->
205+
<jandex-maven-plugin.version>3.5.1</jandex-maven-plugin.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:jandex.version -->
206206
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
207207
<license-maven-plugin.version>5.0.0</license-maven-plugin.version>
208208
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>

poms/bom/src/main/generated/flattened-full-pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7583,12 +7583,12 @@
75837583
<dependency>
75847584
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75857585
<artifactId>connect-json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7586-
<version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7586+
<version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75877587
</dependency>
75887588
<dependency>
75897589
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75907590
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7591-
<version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7591+
<version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75927592
<exclusions>
75937593
<exclusion>
75947594
<groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7701,12 +7701,12 @@
77017701
<dependency>
77027702
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
77037703
<artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7704-
<version>2.2.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7704+
<version>2.2.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
77057705
</dependency>
77067706
<dependency>
77077707
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
77087708
<artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7709-
<version>2.2.20</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7709+
<version>2.2.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
77107710
</dependency>
77117711
<dependency>
77127712
<groupId>org.jetbrains.kotlinx</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

poms/bom/src/main/generated/flattened-reduced-pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7528,12 +7528,12 @@
75287528
<dependency>
75297529
<groupId>org.apache.kafka</groupId>
75307530
<artifactId>connect-json</artifactId>
7531-
<version>4.0.0</version>
7531+
<version>4.0.1</version>
75327532
</dependency>
75337533
<dependency>
75347534
<groupId>org.apache.kafka</groupId>
75357535
<artifactId>connect-runtime</artifactId>
7536-
<version>4.0.0</version>
7536+
<version>4.0.1</version>
75377537
<exclusions>
75387538
<exclusion>
75397539
<groupId>io.swagger.core.v3</groupId>

poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7528,12 +7528,12 @@
75287528
<dependency>
75297529
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75307530
<artifactId>connect-json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7531-
<version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7531+
<version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75327532
</dependency>
75337533
<dependency>
75347534
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75357535
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7536-
<version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7536+
<version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
75377537
<exclusions>
75387538
<exclusion>
75397539
<groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

0 commit comments

Comments
 (0)