jiriOndrusek-agent commented on code in PR #9315: URL: https://github.com/apache/camel-quarkus/pull/9315#discussion_r4255592050
########## integration-tests/avro/src/test/java/org/apache/camel/quarkus/component/avro/it/AvroTest.java: ########## @@ -18,10 +18,12 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.is; +@Disabled //https://github.com/apache/camel-quarkus/issues/9103 Review Comment: Right, thanks. Removed the `@Disabled` in a separate commit (4242837). Avro tests pass in JVM and native. ########## integration-tests/avro/pom.xml: ########## @@ -94,6 +94,7 @@ </build> <profiles> + <!-- https://github.com/apache/camel-quarkus/issues/9103 Review Comment: The native profile is back in the same separate commit (4242837). ########## poms/build-parent-it/pom.xml: ########## @@ -70,6 +70,22 @@ <type>pom</type> <scope>import</scope> </dependency> + <!-- Direct entry to win over the older protobuf-java managed by the quarkus-bom import above. + camel-salesforce protobuf generated code requires runtime >= camel's protobuf-version. + Remove when quarkus-bom manages protobuf-java >= ${protobuf.version} --> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + <!-- Direct entry to win over the older jackson-annotations managed by the quarkus-bom import above. + Jackson 3 (tools.jackson, used by camel-jolt) requires jackson-annotations >= ${jackson-annotations.version}. + Remove when quarkus-bom manages jackson-annotations >= ${jackson-annotations.version} --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson-annotations.version}</version> + </dependency> Review Comment: Checked: Quarkus 3.40.1 (the latest 3.40.x) still has protobuf-java 4.35.0 and jackson-annotations 2.21, so it's not solved. I removed both overrides in a separate commit (4242837) and disabled what breaks: - salesforce (#9319): Camel's Pub/Sub classes are generated with protobuf 4.35.1, so every endpoint fails in JVM and native. Tests disabled. - jolt (#9320): JVM works, but the native build fails because Jackson 3.2.3 needs jackson-annotations 2.22. Native disabled. ########## pom.xml: ########## @@ -122,10 +124,11 @@ <ibm.mq.client.version>10.0.0.0</ibm.mq.client.version> <icu4j.version>${icu4j-version}</icu4j.version> <influxdb.version>${influx-java-driver-version}</influxdb.version> + <jackson-annotations.version>2.22</jackson-annotations.version><!-- @sync tools.jackson:jackson-bom:${jackson3.version} prop:jackson.version.annotations --> + <jackson3.version>${jackson3-version}</jackson3.version> Review Comment: Removed `jackson-annotations.version` in a separate commit (4242837). Without it, the jolt native build fails, so jolt native is disabled, see the jolt ticket #9320. `jackson3.version` has to stay: it's used by the `tools.jackson.core` BOM entries. Without them, jolt fails dependency convergence (camel-jolt brings 3.2.3, json-community-utils 1.3.0 brings 3.2.1). ########## pom.xml: ########## @@ -147,22 +150,24 @@ <langchain4j.version>1.20.2</langchain4j.version><!-- @sync io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version} prop:langchain4j.version --> <langchain4j-beta.version>1.20.2-beta30</langchain4j-beta.version><!-- @sync dev.langchain4j:langchain4j-bom:${langchain4j.version} prop:langchain4j.beta.version --> <mapstruct.version>${mapstruct-version}</mapstruct.version> - <mbassador.version>1.3.0</mbassador.version><!-- @sync com.hierynomus:smbj:${smbj-version} dep:net.engio:mbassador --> + <mbassador.version>1.3.2</mbassador.version><!-- @sync com.hierynomus:smbj:${smbj-version} dep:net.engio:mbassador --> <micrometer-tracing.version>1.7.1</micrometer-tracing.version><!-- Not in quarkus-bom yet, align with micrometer version in io.quarkus:quarkus-bom:${quarkus.version} - tracing 1.6.x matches core 1.16.x https://repo1.maven.org/maven2/io/micrometer/micrometer-tracing-bom/ --> <milvus-sdk-java.version>${milvus-client-version}</milvus-sdk-java.version> <mina.version>${mina-version}</mina.version> <minio.version>9.0.3</minio.version><!-- @sync io.quarkiverse.minio:quarkus-minio-parent:${quarkiverse-minio.version} prop:minio.version --> <msal4j.version>1.23.1</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity.version} dep:com.microsoft.azure:msal4j --> <murmur.version>1.0.0</murmur.version> - <mvel2.version>2.5.2.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version --> + <mvel2.version>2.5.4.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version --> <mybatis.version>3.5.19</mybatis.version><!-- @sync io.quarkiverse.mybatis:quarkus-parent:${quarkiverse-mybatis.version} prop:mybatis.version --> - <oak-jackrabbit-api.version>1.88.0</oak-jackrabbit-api.version><!-- @sync org.apache.jackrabbit:jackrabbit-parent:${jackrabbit-version} prop:oak-jackrabbit-api.version.implemented --> + <oak-jackrabbit-api.version>2.2.0</oak-jackrabbit-api.version><!-- @sync org.apache.jackrabbit:jackrabbit-parent:${jackrabbit-version} prop:oak-jackrabbit-api.version.implemented --> <okhttp.version>4.12.0</okhttp.version> <okhttp-jvm.version>5.2.1</okhttp-jvm.version> <okio.version>3.16.1</okio.version><!-- @sync com.squareup.okhttp3:okhttp-jvm:${okhttp-jvm.version} dep:com.squareup.okio:okio-jvm--> <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 --> <opentelemetry-semconv-legacy.version>1.29.0-alpha</opentelemetry-semconv-legacy.version><!-- Alignment for camel-opentelemetry and google-pubsub --> <org.json.version>20240303</org.json.version><!-- Used by google-cloud-bigquery and com.ibm.mq.jakarta.client --> + <protobuf.version>4.35.1</protobuf.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:protobuf-version --> Review Comment: Removed in a separate commit (4242837). Without it, salesforce fails in JVM and native, so its tests are disabled, see the salesforce ticket #9319. ########## pom.xml: ########## @@ -245,6 +251,7 @@ <cyberark-conjur-cli.container.image>mirror.gcr.io/cyberark/conjur-cli:9</cyberark-conjur-cli.container.image> <cyberark-nginx.container.image>mirror.gcr.io/nginx:1.30.3-alpine3.23-perl</cyberark-nginx.container.image> <db2.container.image>icr.io/db2_community/db2:12.1.5.0</db2.container.image> + <docling-java.version>${docling-java-version}</docling-java.version> Review Comment: It's needed. debezium-bom, which our BOM imports, pins docling-serve-api/client to 0.5.0, but camel-docling 4.23.0 needs 0.7.0 (it uses `DocumentRequest$Builder`, which 0.5.0 doesn't have). I moved the property up to the general dependency versions in a separate commit (4242837). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
