This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d0fa3fa37459fc247e49d7b3ac04e82f20446661 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Wed Jun 5 13:49:04 2024 +0200 TestSupport fixes (CAMEL-20785) and langchain4j version conflict --- pom.xml | 10 +- poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml | 405 +++++++++++---------- .../src/main/generated/flattened-reduced-pom.xml | 49 +-- .../generated/flattened-reduced-verbose-pom.xml | 113 +++--- .../quarkus/test/CamelQuarkusTestSupport.java | 16 +- .../test/ContextNotStoppingManagerFactory.java | 46 +++ .../test/LegacyCamelContextNotStoppingManager.java | 41 +++ .../TransientCamelContextNotStoppingManager.java | 41 +++ .../quarkus/test/common/AbstractCallbacksTest.java | 264 -------------- .../test/common/CallbacksPerTestFalse01Test.java | 71 ---- .../test/common/CallbacksPerTestFalse02Test.java | 40 -- .../test/common/CallbacksPerTestTrue01Test.java | 71 ---- .../test/common/CallbacksPerTestTrue02Test.java | 40 -- .../test/junit5/patterns/DebugJUnit5Test.java | 18 +- .../patterns/DebugNoLazyTypeConverterTest.java | 18 +- .../quarkus/test/junit5/patterns/DebugTest.java | 19 +- 17 files changed, 484 insertions(+), 783 deletions(-) diff --git a/pom.xml b/pom.xml index 00a9c8ad32..0987eef53f 100644 --- a/pom.xml +++ b/pom.xml @@ -78,8 +78,8 @@ <assertj.version>3.26.0</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version --> <aws-java-sdk.version>1.11.714</aws-java-sdk.version> <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version> - <azure-core.version>1.48.0</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core --> - <azure-identity.version>1.12.0</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity --> + <azure-core.version>1.49.0</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core --> + <azure-identity.version>1.12.1</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity --> <azure-core-http-vertx.version>1.0.0-beta.18</azure-core-http-vertx.version> <!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 --> <cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep in sync with testcontainers instead of Debezium bom --> <bouncycastle.version>1.78.1</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> @@ -98,9 +98,9 @@ <github-api.version>1.313</github-api.version><!-- Used in a Groovy script bellow --> <google-auth-library.version>1.23.0</google-auth-library.version><!-- @sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version} dep:com.google.auth:google-auth-library-oauth2-http --> <google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version> - <google-cloud-bom.version>0.220.0</google-cloud-bom.version><!-- @sync com.google.cloud:libraries-bom:${google-cloud-bom-version} dep:com.google.cloud:google-cloud-bom --> - <google-cloud-pubsub-bom.version>1.129.3</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.129.3</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub --> + <google-cloud-bom.version>0.221.0</google-cloud-bom.version><!-- @sync com.google.cloud:libraries-bom:${google-cloud-bom-version} dep:com.google.cloud:google-cloud-bom --> + <google-cloud-pubsub-bom.version>1.129.6</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.129.6</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>23.1.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> <graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync io.quarkus:quarkus-documentation:${quarkus.version} prop:graal-community.tag-for-documentation --> <groovy.version>4.0.21</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 0e49cba95f..7d4df42bb6 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6617,6 +6617,11 @@ <artifactId>commons-lang</artifactId> <version>${commons-lang.version}</version> </dependency> + <dependency> + <groupId>dev.langchain4j</groupId> + <artifactId>langchain4j</artifactId> + <version>${langchain4j-version}</version> + </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>dropwizard-core</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 00fcfef684..22952304cc 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6247,7 +6247,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-base</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6266,12 +6266,12 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu2.1</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6286,22 +6286,22 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu3</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6388,7 +6388,7 @@ <dependency> <groupId>com.google.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>google-cloud-pubsub</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.129.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.129.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.android</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6539,6 +6539,11 @@ <artifactId>commons-lang</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>dev.langchain4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>langchain4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.31.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>dropwizard-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7209,7 +7214,7 @@ <dependency> <groupId>org.springframework.data</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-data-redis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -22493,314 +22498,324 @@ <version>12.0.8</version><!-- org.eclipse.jetty:jetty-bom:12.0.8 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-ai-contentsafety</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-ai-contentsafety</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> + </dependency> + <dependency> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-ai-formrecognizer</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.1.8</version><!-- com.azure:azure-sdk-bom:1.2.24 --> + </dependency> + <dependency> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-ai-metricsadvisor</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.25</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-ai-formrecognizer</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.1.7</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-ai-textanalytics</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>5.4.6</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-ai-metricsadvisor</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.24</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-ai-translation-text</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-ai-textanalytics</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>5.4.5</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-callautomation</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.2.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-callautomation</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-chat</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.5.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-chat</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.5.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-common</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.3.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-common</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.3.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-email</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.13</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-email</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.12</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-identity</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.5.5</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-identity</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.5.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-jobrouter</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-jobrouter</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-messages</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-messages</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-phonenumbers</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.13</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-phonenumbers</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.12</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-rooms</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.2</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-rooms</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.1</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-communication-sms</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.24</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-communication-sms</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.23</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-containers-containerregistry</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.2.8</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-containers-containerregistry</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.2.7</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.49.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.48.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-amqp</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>2.9.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-amqp</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>2.9.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-http-netty</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.15.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-http-netty</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.14.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-http-okhttp</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.11.21</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-http-okhttp</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.11.20</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-management</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.14.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-management</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.13.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-serializer-json-gson</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.2.12</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-serializer-json-gson</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.2.11</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-serializer-json-jackson</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.4.12</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-serializer-json-jackson</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.4.11</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-cosmos</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.61.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-cosmos</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.58.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-cosmos-encryption</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>2.12.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-cosmos-encryption</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>2.10.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-data-appconfiguration</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.6.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-data-appconfiguration</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.6.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-data-schemaregistry</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.4.6</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-data-schemaregistry</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.4.5</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-data-schemaregistry-apacheavro</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.17</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-data-schemaregistry-apacheavro</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.16</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-data-tables</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.4.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-data-tables</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.4.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-developer-devcenter</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-developer-loadtesting</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.12</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-developer-loadtesting</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.13</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-digitaltwins-core</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.3.19</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-digitaltwins-core</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.3.20</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-identity</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.12.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-identity</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.12.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-identity-broker</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-identity-broker</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-identity-extensions</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.15</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-identity-extensions</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.16</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-iot-deviceupdate</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.17</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-iot-deviceupdate</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.18</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-json</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-json</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-eventgrid</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.22.1</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-eventgrid</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.22.2</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-eventhubs</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>5.18.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-eventhubs</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>5.18.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.19.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.19.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-servicebus</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>7.16.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-servicebus</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>7.17.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-webpubsub</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.2.14</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-webpubsub</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.2.15</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-webpubsub-client</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-webpubsub-client</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-mixedreality-authentication</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.2.23</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-mixedreality-authentication</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.2.24</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-mixedreality-remoterendering</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.28</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-mixedreality-remoterendering</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.29</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-monitor-ingestion</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.2.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-monitor-ingestion</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.2.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-monitor-query</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.3.1</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-monitor-query</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.3.2</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-search-documents</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>11.6.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-search-documents</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>11.6.5</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-attestation</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.23</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-attestation</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.24</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-confidentialledger</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.19</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-confidentialledger</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.20</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-keyvault-administration</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.5.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-keyvault-administration</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.5.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-keyvault-certificates</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.6.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-keyvault-certificates</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.6.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-keyvault-jca</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>2.8.1</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-keyvault-jca</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>2.8.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-keyvault-keys</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.8.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-keyvault-keys</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.8.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-keyvault-secrets</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.8.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-keyvault-secrets</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.8.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.25.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.26.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-blob-batch</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.21.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-blob-batch</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.22.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-blob-cryptography</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.24.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-blob-cryptography</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.25.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-common</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.24.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-common</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.25.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-file-datalake</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.18.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-file-datalake</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.19.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-file-share</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.21.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-file-share</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.22.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-internal-avro</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.10.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-internal-avro</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.11.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-queue</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.20.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-queue</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.21.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-xml</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-xml</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> <groupId>com.datastax.oss</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 292ff78059..88df08ffe7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6247,7 +6247,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-base</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -6266,12 +6266,12 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-client</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu2.1</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -6286,22 +6286,22 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu3</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r4</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r5</artifactId> - <version>7.2.0</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> @@ -6388,7 +6388,7 @@ <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-pubsub</artifactId> - <version>1.129.3</version> + <version>1.129.6</version> <exclusions> <exclusion> <groupId>com.google.android</groupId> @@ -6519,6 +6519,11 @@ <artifactId>commons-cli</artifactId> <version>1.4</version> </dependency> + <dependency> + <groupId>dev.langchain4j</groupId> + <artifactId>langchain4j</artifactId> + <version>0.31.0</version> + </dependency> <dependency> <groupId>io.minio</groupId> <artifactId>minio</artifactId> @@ -7113,7 +7118,7 @@ <dependency> <groupId>org.springframework.data</groupId> <artifactId>spring-data-redis</artifactId> - <version>3.2.5</version> + <version>3.3.0</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -8041,22 +8046,22 @@ <dependency> <groupId>com.azure</groupId> <artifactId>azure-core</artifactId> - <version>1.48.0</version> + <version>1.49.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-core-amqp</artifactId> - <version>2.9.3</version> + <version>2.9.4</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-cosmos</artifactId> - <version>4.58.0</version> + <version>4.61.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-identity</artifactId> - <version>1.12.0</version> + <version>1.12.1</version> </dependency> <dependency> <groupId>com.azure</groupId> @@ -8066,47 +8071,47 @@ <dependency> <groupId>com.azure</groupId> <artifactId>azure-messaging-eventhubs</artifactId> - <version>5.18.3</version> + <version>5.18.4</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId> - <version>1.19.3</version> + <version>1.19.4</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-messaging-servicebus</artifactId> - <version>7.16.0</version> + <version>7.17.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-security-keyvault-secrets</artifactId> - <version>4.8.2</version> + <version>4.8.3</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-blob</artifactId> - <version>12.25.4</version> + <version>12.26.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-common</artifactId> - <version>12.24.4</version> + <version>12.25.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-file-datalake</artifactId> - <version>12.18.4</version> + <version>12.19.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-internal-avro</artifactId> - <version>12.10.4</version> + <version>12.11.0</version> </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-queue</artifactId> - <version>12.20.4</version> + <version>12.21.0</version> </dependency> <dependency> <groupId>com.azure</groupId> 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 91ba522589..4bbd71ad5f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6247,7 +6247,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-base</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6266,12 +6266,12 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu2.1</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6286,22 +6286,22 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu3</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>7.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>7.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6388,7 +6388,7 @@ <dependency> <groupId>com.google.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>google-cloud-pubsub</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.129.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.129.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.android</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6519,6 +6519,11 @@ <artifactId>commons-cli</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>dev.langchain4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>langchain4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.31.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>io.minio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>minio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7113,7 +7118,7 @@ <dependency> <groupId>org.springframework.data</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-data-redis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -8039,79 +8044,79 @@ <version>12.0.8</version><!-- org.eclipse.jetty:jetty-bom:12.0.8 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.48.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.49.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-core-amqp</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>2.9.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-core-amqp</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>2.9.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-cosmos</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.58.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-cosmos</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.61.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-identity</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.12.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-identity</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.12.1</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-json</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.1.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-json</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.1.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-eventhubs</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>5.18.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-eventhubs</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>5.18.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.19.3</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.19.4</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-messaging-servicebus</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>7.16.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-messaging-servicebus</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>7.17.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-security-keyvault-secrets</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>4.8.2</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-security-keyvault-secrets</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>4.8.3</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.25.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-blob</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.26.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-common</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.24.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-common</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.25.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-file-datalake</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.18.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-file-datalake</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.19.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-internal-avro</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.10.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-internal-avro</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.11.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-storage-queue</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>12.20.4</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-storage-queue</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>12.21.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> - <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <artifactId>azure-xml</artifactId><!-- com.azure:azure-sdk-bom:1.2.23 --> - <version>1.0.0</version><!-- com.azure:azure-sdk-bom:1.2.23 --> + <groupId>com.azure</groupId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <artifactId>azure-xml</artifactId><!-- com.azure:azure-sdk-bom:1.2.24 --> + <version>1.0.0</version><!-- com.azure:azure-sdk-bom:1.2.24 --> </dependency> <dependency> <groupId>com.datastax.oss</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0 --> diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 62c1a21af7..e91435d977 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -27,7 +27,6 @@ import io.quarkus.test.junit.callback.QuarkusTestMethodContext; import jakarta.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.Route; -import org.apache.camel.Service; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.RouteDefinition; @@ -86,6 +85,13 @@ public class CamelQuarkusTestSupport extends CamelTestSupport */ Set<String> createdRoutes; + public CamelQuarkusTestSupport() { + super(new ContextNotStoppingManagerFactory()); + + //CQ starts and stops context with the application start/stop + testConfiguration().withAutoStartContext(false); + } + //------------------------ quarkus callbacks --------------- /** @@ -355,14 +361,6 @@ public class CamelQuarkusTestSupport extends CamelTestSupport super.doPostSetup(); } - /** - * Internal disablement of the context stop functionality. - */ - @Override - protected final void doStopCamelContext(CamelContext context, Service camelContextService) { - //don't stop - } - /** * This method does nothing. The context starts together with Quarkus engine. */ diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java new file mode 100644 index 0000000000..60700ae250 --- /dev/null +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.quarkus.test; + +import org.apache.camel.test.junit5.CamelContextConfiguration; +import org.apache.camel.test.junit5.CamelContextManager; +import org.apache.camel.test.junit5.ContextManagerFactory; +import org.apache.camel.test.junit5.TestExecutionConfiguration; + +/** + * A factory class for creating context managers + */ +public class ContextNotStoppingManagerFactory extends ContextManagerFactory { + /** + * Callback types + */ + public enum Type { + BEFORE_ALL, + BEFORE_EACH, + } + + @Override + public CamelContextManager createContextManager(ContextManagerFactory.Type type, TestExecutionConfiguration testConfiguration, CamelContextConfiguration contextConfiguration) { + return switch (type) { + case BEFORE_ALL: + yield new LegacyCamelContextNotStoppingManager(testConfiguration, contextConfiguration); + case BEFORE_EACH: + yield new TransientCamelContextNotStoppingManager(testConfiguration, contextConfiguration); + }; + } +} diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java new file mode 100644 index 0000000000..2ca589e6b3 --- /dev/null +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.quarkus.test; + +import org.apache.camel.CamelContext; +import org.apache.camel.Service; +import org.apache.camel.test.junit5.CamelContextConfiguration; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit5.LegacyCamelContextManager; +import org.apache.camel.test.junit5.TestExecutionConfiguration; + +/** + * A {@link CamelContext} test lifecycle manager based on the behavior that was built in {@link CamelTestSupport} up to + * Camel 4.7.0 + */ +public class LegacyCamelContextNotStoppingManager extends LegacyCamelContextManager { + + public LegacyCamelContextNotStoppingManager(TestExecutionConfiguration testConfigurationBuilder, CamelContextConfiguration camelContextConfiguration) { + super(testConfigurationBuilder, camelContextConfiguration); + } + + @Override + protected void doStopCamelContext(CamelContext context, Service camelContextService) { + //do not stop context + } +} diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java new file mode 100644 index 0000000000..8d9fa69e8d --- /dev/null +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.quarkus.test; + +import org.apache.camel.CamelContext; +import org.apache.camel.Service; +import org.apache.camel.test.junit5.CamelContextConfiguration; +import org.apache.camel.test.junit5.TestExecutionConfiguration; +import org.apache.camel.test.junit5.TransientCamelContextManager; + +public class TransientCamelContextNotStoppingManager extends TransientCamelContextManager { + + public TransientCamelContextNotStoppingManager(TestExecutionConfiguration testConfigurationBuilder, CamelContextConfiguration camelContextConfiguration) { + super(testConfigurationBuilder, camelContextConfiguration); + } + + @Override + protected void doStopCamelContext(CamelContext context, Service camelContextService) { + //do not stop context + } + + @Override + public void startCamelContext() throws Exception { + super.startCamelContext(); + } +} diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java deleted file mode 100644 index 597ccc7df7..0000000000 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.test.common; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.stream.Collectors; - -import io.quarkus.test.junit.callback.QuarkusTestContext; -import io.quarkus.test.junit.callback.QuarkusTestMethodContext; -import org.apache.camel.CamelContext; -import org.apache.camel.Produce; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; -import org.apache.camel.util.StopWatch; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { - - private static final Logger LOG = Logger.getLogger(AbstractCallbacksTest.class); - - public enum Callback { - postTearDown, - preSetup, - postSetup, - contextCreation, - afterAll, - afterConstruct, - afterEach, - beforeEach; - } - - private final String testName; - private final String afterClassTestName; - - @Produce("direct:start") - protected ProducerTemplate template; - - public AbstractCallbacksTest(String testName, String afterClassTestName) { - this.testName = testName; - this.afterClassTestName = afterClassTestName; - } - - @Override - protected CamelContext createCamelContext() throws Exception { - createTmpFile(testName, Callback.contextCreation); - createTmpFile(afterClassTestName, Callback.contextCreation); - return super.createCamelContext(); - } - - @Override - protected void doPreSetup() throws Exception { - createTmpFile(testName, Callback.preSetup); - createTmpFile(afterClassTestName, Callback.preSetup); - super.doPostSetup(); - } - - @Override - protected void doPostSetup() throws Exception { - createTmpFile(testName, Callback.postSetup); - createTmpFile(afterClassTestName, Callback.postSetup); - super.doPostSetup(); - } - - @Override - protected void doPostTearDown() throws Exception { - createTmpFile(testName, Callback.postTearDown); - createTmpFile(afterClassTestName, Callback.postTearDown); - super.doPostTearDown(); - } - - @Test - public void testMock() throws Exception { - getMockEndpoint("mock:result").expectedBodiesReceived("Hello World"); - template.sendBody("direct:start", "Hello World"); - MockEndpoint.assertIsSatisfied(context); - } - - @Test - public void testMock2() throws Exception { - getMockEndpoint("mock:result").expectedBodiesReceived("Hello World 2"); - template.sendBody("direct:start", "Hello World 2"); - MockEndpoint.assertIsSatisfied(context); - } - - @Test - public void testMock3() throws Exception { - getMockEndpoint("mock:result").expectedBodiesReceived("Hello World 2"); - template.sendBody("direct:start", "Hello World 2"); - MockEndpoint.assertIsSatisfied(context); - } - - @Override - protected RoutesBuilder createRouteBuilder() { - return new RouteBuilder() { - @Override - public void configure() { - from("direct:start").to("mock:result"); - } - }; - } - - @Override - protected void doAfterAll(QuarkusTestContext context) throws Exception { - createTmpFile(testName, Callback.afterAll); - createTmpFile(afterClassTestName, Callback.afterAll); - super.doAfterAll(context); - } - - @Override - protected void doAfterConstruct() throws Exception { - createTmpFile(testName, Callback.afterConstruct); - createTmpFile(afterClassTestName, Callback.afterConstruct); - super.doAfterConstruct(); - } - - @Override - protected void doAfterEach(QuarkusTestMethodContext context) throws Exception { - createTmpFile(testName, Callback.afterEach); - createTmpFile(afterClassTestName, Callback.afterEach); - super.doAfterEach(context); - } - - @Override - protected void doBeforeEach(QuarkusTestMethodContext context) throws Exception { - createTmpFile(testName, Callback.beforeEach); - createTmpFile(afterClassTestName, Callback.beforeEach); - super.doAfterConstruct(); - } - - static void assertCount(int expectedCount, Long count, Callback c, String testName) { - Assertions.assertEquals(expectedCount, count, - c.name() + " should be called exactly " + expectedCount + " times in " + testName); - } - - static void testAfterAll(String testName, BiConsumer<Callback, Long> consumer) { - // we are called before doPostTearDown so lets wait for that to be - // called - Runnable r = () -> { - Map<AbstractCallbacksTest.Callback, Long> counts = new HashMap<>(); - try { - StopWatch watch = new StopWatch(); - while (watch.taken() < 5000) { - checkCallbacks(Callback.values(), testName, counts); - - if (counts.size() == AbstractCallbacksTest.Callback.values().length) { - break; - } else { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - break; - } - } - } - } finally { - LOG.info("Should only call postTearDown 1 time per test class, called: "); - for (Callback c : Callback.values()) { - consumer.accept(c, counts.get(c)); - } - } - - }; - Thread t = new Thread(r); - t.setDaemon(false); - t.setName("shouldTearDown checker"); - t.start(); - } - - /** - * Return -1 if there is no file. Numer of passed test otherwise. - */ - public static int testFromAnotherClass(String testName, BiConsumer<Callback, Long> consumer) { - int i = 0; - Map<AbstractCallbacksTest.Callback, Long> counts = new HashMap<>(); - checkCallbacks(Callback.values(), testName, counts); - if (counts.size() == 0) { - return -1; - } - for (Callback c : Callback.values()) { - consumer.accept(c, counts.get(c)); - i++; - } - return i; - } - - private static void checkCallbacks(Callback[] values, String testName, Map<Callback, Long> counts) { - LOG.debug("Checking for callbacks called correctly"); - try { - for (Callback c : values) { - long count = doesTmpFileExist(testName, c); - if (count > 0) { - counts.put(c, count); - } - } - } catch (Exception e) { - //ignore - } - } - - private static void createTmpFile(String testName, Callback callback) throws Exception { - Set<File> testDirs = Arrays.stream(Paths.get("target").toFile().listFiles()) - .filter(f -> f.isDirectory() && f.getName().startsWith(testName)) - .collect(Collectors.toSet()); - - Path tmpDir; - if (testDirs.size() == 1) { - tmpDir = testDirs.stream().findFirst().get().toPath(); - } else if (testDirs.size() > 1) { - throw new RuntimeException(); - } else { - tmpDir = Files.createTempDirectory(Paths.get("target"), testName); - tmpDir.toFile().deleteOnExit(); - } - - Path tmpFile = Files.createTempFile(tmpDir, callback.name(), ".log"); - tmpFile.toFile().deleteOnExit(); - } - - private static long doesTmpFileExist(String testName, Callback callback) throws Exception { - //find test dir - Set<File> testDirs = Arrays.stream(Paths.get("target").toFile().listFiles()) - .filter(f -> f.isDirectory() && f.getName().contains(testName)) - .collect(Collectors.toSet()); - if (testDirs.size() > 1) { - LOG.warn("There are more tmp folders for the Callback tests."); - return -1; - } - if (testDirs.isEmpty()) { - LOG.warn("There is no tmp folder for the Callback tests."); - return 0; - } - - return Arrays.stream(testDirs.stream().findFirst().get().listFiles()) - .filter(f -> f.getName().startsWith(callback.name())) - .count(); - } -} diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java deleted file mode 100644 index 591a40eb5c..0000000000 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.test.common; - -import java.util.function.BiConsumer; - -import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.TestInstance; - -// replaces CreateCamelContextPerTestTrueTest -@QuarkusTest -@TestInstance(TestInstance.Lifecycle.PER_METHOD) -public class CallbacksPerTestFalse01Test extends AbstractCallbacksTest { - - public CallbacksPerTestFalse01Test() { - super(CallbacksPerTestFalse01Test.class.getSimpleName(), CallbacksPerTestFalse02Test.class.getSimpleName()); - } - - @AfterAll - public static void shouldTearDown() { - testAfterAll(CallbacksPerTestFalse01Test.class.getSimpleName(), createAssertionConsumer()); - } - - protected static BiConsumer<Callback, Long> createAssertionConsumer() { - return (callback, count) -> { - switch (callback) { - case contextCreation: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case postSetup: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case postTearDown: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case preSetup: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case afterAll: - assertCount(1, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case afterConstruct: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case afterEach: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case beforeEach: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - default: - throw new IllegalArgumentException("Unknown callback type"); - } - }; - } -} diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse02Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse02Test.java deleted file mode 100644 index cfd85fff3e..0000000000 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse02Test.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.test.common; - -import java.util.concurrent.TimeUnit; - -import io.quarkus.test.junit.QuarkusTest; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; - -import static org.awaitility.Awaitility.await; - -// requires CallbacksPerTestFalse01Test to be run before -@QuarkusTest -public class CallbacksPerTestFalse02Test { - - @Test - public void testAfter01Class() { - - await().atMost(5, TimeUnit.SECONDS).until(() -> AbstractCallbacksTest.testFromAnotherClass( - CallbacksPerTestFalse02Test.class.getSimpleName(), - CallbacksPerTestFalse01Test.createAssertionConsumer()), - Matchers.is(AbstractCallbacksTest.Callback.values().length)); - - } -} diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java deleted file mode 100644 index 295a7a166c..0000000000 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.test.common; - -import java.util.function.BiConsumer; - -import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.TestInstance; - -// replaces CreateCamelContextPerTestTrueTest -@QuarkusTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class CallbacksPerTestTrue01Test extends AbstractCallbacksTest { - - public CallbacksPerTestTrue01Test() { - super(CallbacksPerTestTrue01Test.class.getSimpleName(), CallbacksPerTestTrue02Test.class.getSimpleName()); - } - - @AfterAll - public static void shouldTearDown() { - testAfterAll(CallbacksPerTestTrue01Test.class.getSimpleName(), createAssertionConsumer()); - } - - protected static BiConsumer<Callback, Long> createAssertionConsumer() { - return (callback, count) -> { - switch (callback) { - case contextCreation: - assertCount(1, count, callback, CallbacksPerTestTrue01Test.class.getSimpleName()); - break; - case postSetup: - assertCount(1, count, callback, CallbacksPerTestTrue01Test.class.getSimpleName()); - break; - case postTearDown: - assertCount(1, count, callback, CallbacksPerTestTrue01Test.class.getSimpleName()); - break; - case preSetup: - assertCount(1, count, callback, CallbacksPerTestTrue01Test.class.getSimpleName()); - break; - case afterAll: - assertCount(1, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case afterConstruct: - assertCount(1, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case afterEach: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - case beforeEach: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; - default: - throw new IllegalArgumentException("Unknown callback type"); - } - }; - } -} diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue02Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue02Test.java deleted file mode 100644 index 9bcf600cdb..0000000000 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue02Test.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.test.common; - -import java.util.concurrent.TimeUnit; - -import io.quarkus.test.junit.QuarkusTest; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; - -import static org.awaitility.Awaitility.await; - -// requires CallbacksPerTestTrue01Test to be run before -@QuarkusTest -public class CallbacksPerTestTrue02Test { - - @Test - public void testAfter01Class() { - - await().atMost(5, TimeUnit.SECONDS).until(() -> AbstractCallbacksTest.testFromAnotherClass( - CallbacksPerTestTrue02Test.class.getSimpleName(), - CallbacksPerTestTrue01Test.createAssertionConsumer()), - Matchers.is(AbstractCallbacksTest.Callback.values().length)); - - } -} diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java index 9fcbdae017..fe85af6424 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java @@ -36,6 +36,20 @@ public class DebugJUnit5Test extends CamelQuarkusTestSupport { private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class); + private TestDebugBreakpoint testDebugBreakpoint; + + @Override + public void doPreSetup() throws Exception { + super.doPreSetup(); + + camelContextConfiguration() + .withBreakpoint(createBreakpoint()); + } + + protected DebugBreakpoint createBreakpoint() { + testDebugBreakpoint = new TestDebugBreakpoint(); + return testDebugBreakpoint; + } // START SNIPPET: e1 @Override public boolean isUseDebugger() { @@ -94,8 +108,4 @@ public class DebugJUnit5Test extends CamelQuarkusTestSupport { } // END SNIPPET: e2 - @Override - protected DebugBreakpoint createBreakpoint() { - return new TestDebugBreakpoint(); - } } diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java index 4bddefd3c3..d9ae75dc0c 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java @@ -32,6 +32,20 @@ public class DebugNoLazyTypeConverterTest extends CamelQuarkusTestSupport { private static final Logger LOG = Logger.getLogger(DebugNoLazyTypeConverterTest.class); + private TestDebugBreakpoint testDebugBreakpoint; + + @Override + public void doPreSetup() throws Exception { + super.doPreSetup(); + + camelContextConfiguration() + .withBreakpoint(createBreakpoint()); + } + + protected DebugBreakpoint createBreakpoint() { + testDebugBreakpoint = new TestDebugBreakpoint(); + return testDebugBreakpoint; + } // START SNIPPET: e1 @Override public boolean isUseDebugger() { @@ -90,8 +104,4 @@ public class DebugNoLazyTypeConverterTest extends CamelQuarkusTestSupport { } // END SNIPPET: e2 - @Override - protected DebugBreakpoint createBreakpoint() { - return new TestDebugBreakpoint(); - } } diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java index eec6c9af9d..318cb0dd55 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java @@ -32,11 +32,26 @@ public class DebugTest extends CamelQuarkusTestSupport { private static final Logger LOG = Logger.getLogger(DebugTest.class); + private TestDebugBreakpoint testDebugBreakpoint; + + @Override + public void doPreSetup() throws Exception { + super.doPreSetup(); + + camelContextConfiguration() + .withBreakpoint(createBreakpoint()); + } + + protected DebugBreakpoint createBreakpoint() { + testDebugBreakpoint = new TestDebugBreakpoint(); + return testDebugBreakpoint; + } @Override public boolean isUseAdviceWith() { return true; } + // START SNIPPET: e1 @Override public boolean isUseDebugger() { @@ -97,8 +112,4 @@ public class DebugTest extends CamelQuarkusTestSupport { } // END SNIPPET: e2 - @Override - protected DebugBreakpoint createBreakpoint() { - return new TestDebugBreakpoint(); - } }