Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build of 3.15.0 branch #389

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bean</artifactId>
Expand Down Expand Up @@ -1644,19 +1657,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>quarkus-azure-storage-queue</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ name: "Camel Azure Storage Queue Service"
description: "The azure-storage-queue component is used for storing and retrieving the messages to/from Azure Storage Queue using Azure SDK v12"
metadata:
icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"
guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/azure-storage-queue.html"
guide: "https://access.redhat.com/documentation/en-us/red_hat_build_of_apache_camel/4.8/html/red_hat_build_of_apache_camel_for_quarkus_reference/camel-quarkus-extensions-reference#extensions-azure-storage-queue"
categories:
- "integration"
status:
Expand Down
2 changes: 1 addition & 1 deletion extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<module>azure-eventhubs</module>
<!-- <module>azure-key-vault</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<module>azure-storage-blob</module>
<!-- <module>azure-storage-queue</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<module>azure-storage-queue</module>
<!-- <module>base64</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<module>bean</module>
<module>bean-validator</module>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<maven-utils.version>0.1.0</maven-utils.version>

<!-- Maven plugin versions (keep sorted alphabetically) -->
<cq-plugin.version>4.11.0</cq-plugin.version>
<cq-plugin.version>4.12.0</cq-plugin.version>
<cyclonedx-maven-plugin-version>2.8.1</cyclonedx-maven-plugin-version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-queue</artifactId>
<version>${camel-community.version}</version>
<version>${camel.version}</version>
<exclusions>
<exclusion>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -3363,12 +3363,12 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue</artifactId>
<version>${camel-quarkus-community.version}</version>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue-deployment</artifactId>
<version>${camel-quarkus-community.version}</version>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down
4 changes: 2 additions & 2 deletions poms/bom/src/main/generated/flattened-full-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3289,12 +3289,12 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-azure-storage-queue</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0.fuse-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-azure-storage-queue-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0.fuse-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down
4 changes: 2 additions & 2 deletions poms/bom/src/main/generated/flattened-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3289,12 +3289,12 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue</artifactId>
<version>3.15.0</version>
<version>3.15.0.fuse-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue-deployment</artifactId>
<version>3.15.0</version>
<version>3.15.0.fuse-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down
4 changes: 2 additions & 2 deletions poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3289,12 +3289,12 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-azure-storage-queue</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0.fuse-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-azure-storage-queue-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.15.0.fuse-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down
2 changes: 1 addition & 1 deletion product/integration-tests-mixed-native/group-01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<module>../../../integration-test-groups/aws2-quarkus-client/aws2-ses</module>
<module>../../../integration-test-groups/aws2/aws2-ses</module>
<module>../../../integration-test-groups/azure/azure-key-vault</module>
<module>../../../integration-test-groups/azure/azure-storage-queue</module>
<module>../../../integration-test-groups/compression/lzf</module>
<module>../../../integration-test-groups/dataformats-json/json-jsonb</module>
<module>../../../integration-test-groups/foundation/customized-log-component</module>
Expand Down Expand Up @@ -69,5 +68,6 @@
<module>../../../integration-tests/freemarker</module>
<module>../../../integration-tests/geocoder</module>
<module>../../../integration-tests/git</module>
<module>../../../integration-tests/github</module>
</modules>
</project>
1 change: 0 additions & 1 deletion product/integration-tests-mixed-native/group-02/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<name>Camel Quarkus :: Integration Tests :: Mixed Native :: Group 02</name>

<modules>
<module>../../../integration-tests/github</module>
<module>../../../integration-tests/google</module>
<module>../../../integration-tests/google-storage</module>
<module>../../../integration-tests/grok</module>
Expand Down
2 changes: 1 addition & 1 deletion product/integration-tests-product/group-01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<module>../../../integration-test-groups/aws2/aws2-sqs-sns</module>
<module>../../../integration-test-groups/azure/azure-eventhubs</module>
<module>../../../integration-test-groups/azure/azure-storage-blob</module>
<module>../../../integration-test-groups/azure/azure-storage-queue</module>
<module>../../../integration-test-groups/compression/zip-deflater</module>
<module>../../../integration-test-groups/compression/zipfile</module>
<module>../../../integration-test-groups/cxf-soap/cxf-soap-client</module>
Expand All @@ -65,6 +66,5 @@
<module>../../../integration-test-groups/foundation/controlbus</module>
<module>../../../integration-test-groups/foundation/core</module>
<module>../../../integration-test-groups/foundation/core-annotations</module>
<module>../../../integration-test-groups/foundation/core-languages</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion product/integration-tests-product/group-02/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<name>Camel Quarkus :: Integration Tests :: Product :: Group 02</name>

<modules>
<module>../../../integration-test-groups/foundation/core-languages</module>
<module>../../../integration-test-groups/foundation/core-thread-pools</module>
<module>../../../integration-test-groups/foundation/dataset</module>
<module>../../../integration-test-groups/foundation/direct</module>
Expand Down Expand Up @@ -65,6 +66,5 @@
<module>../../../integration-test-groups/xml/jvm/xslt-http</module>
<module>../../../integration-test-groups/xml/jvm/xslt-ref</module>
<module>../../../integration-tests-jvm/azure-servicebus</module>
<module>../../../integration-tests-jvm/beanio</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion product/integration-tests-product/group-03/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<name>Camel Quarkus :: Integration Tests :: Product :: Group 03</name>

<modules>
<module>../../../integration-tests-jvm/beanio</module>
<module>../../../integration-tests-jvm/cli-connector</module>
<module>../../../integration-tests-jvm/console</module>
<module>../../../integration-tests-jvm/controlbus-statistics</module>
Expand Down Expand Up @@ -65,6 +66,5 @@
<module>../../../integration-tests/jira</module>
<module>../../../integration-tests/jms-artemis-client</module>
<module>../../../integration-tests/jms-ibmmq-client</module>
<module>../../../integration-tests/jms-qpid-amqp-client</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion product/integration-tests-product/group-04/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<name>Camel Quarkus :: Integration Tests :: Product :: Group 04</name>

<modules>
<module>../../../integration-tests/jms-qpid-amqp-client</module>
<module>../../../integration-tests/jpa</module>
<module>../../../integration-tests/jq</module>
<module>../../../integration-tests/jslt</module>
Expand Down Expand Up @@ -65,6 +66,5 @@
<module>../../../integration-tests/microprofile-health</module>
<module>../../../integration-tests/minio</module>
<module>../../../integration-tests/mllp</module>
<module>../../../integration-tests/mybatis</module>
</modules>
</project>
1 change: 1 addition & 0 deletions product/integration-tests-product/group-05/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<name>Camel Quarkus :: Integration Tests :: Product :: Group 05</name>

<modules>
<module>../../../integration-tests/mybatis</module>
<module>../../../integration-tests/netty</module>
<module>../../../integration-tests/openapi-java</module>
<module>../../../integration-tests/opentelemetry</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ camel-quarkus-azure-servicebus-parent
camel-quarkus-azure-storage-blob
camel-quarkus-azure-storage-blob-deployment
camel-quarkus-azure-storage-blob-parent
camel-quarkus-azure-storage-queue
camel-quarkus-azure-storage-queue-deployment
camel-quarkus-azure-storage-queue-parent
camel-quarkus-bean
camel-quarkus-bean-deployment
camel-quarkus-bean-parent
Expand Down Expand Up @@ -158,6 +161,7 @@ camel-quarkus-integration-test-aws2-sqs-sns-quarkus-client
camel-quarkus-integration-test-azure-eventhubs
camel-quarkus-integration-test-azure-servicebus
camel-quarkus-integration-test-azure-storage-blob
camel-quarkus-integration-test-azure-storage-queue
camel-quarkus-integration-test-bean
camel-quarkus-integration-test-bean-validator
camel-quarkus-integration-test-beanio
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ camel-aws2-sqs
camel-azure-eventhubs
camel-azure-servicebus
camel-azure-storage-blob
camel-azure-storage-queue
camel-base
camel-bean
camel-bean-validator
Expand Down
1 change: 0 additions & 1 deletion product/src/main/generated/transitive-dependencies-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,6 @@ org.apache.camel.quarkus:camel-quarkus-zookeeper
org.apache.camel.quarkus:camel-quarkus-zookeeper-deployment
org.apache.camel.quarkus:camel-quarkus-zookeeper-master
org.apache.camel.quarkus:camel-quarkus-zookeeper-master-deployment
org.apache.camel.quarkus:quarkus-azure-storage-queue-deployment
org.apache.commons:commons-collections4
org.apache.commons:commons-compress
org.apache.commons:commons-csv
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ com.arangodb:jackson-serde-json
com.azure:azure-cosmos
com.azure:azure-security-keyvault-secrets
com.azure:azure-storage-file-datalake
com.azure:azure-storage-queue
com.bazaarvoice.jolt:jolt-core
com.bazaarvoice.jolt:json-utils
com.beanit:asn1bean
Expand Down Expand Up @@ -305,7 +304,6 @@ org.apache.camel:camel-aws2-translate
org.apache.camel:camel-azure-cosmosdb
org.apache.camel:camel-azure-key-vault
org.apache.camel:camel-azure-storage-datalake
org.apache.camel:camel-azure-storage-queue
org.apache.camel:camel-barcode
org.apache.camel:camel-base64
org.apache.camel:camel-bonita
Expand Down Expand Up @@ -522,8 +520,6 @@ org.apache.camel.quarkus:camel-quarkus-azure-key-vault
org.apache.camel.quarkus:camel-quarkus-azure-key-vault-deployment
org.apache.camel.quarkus:camel-quarkus-azure-storage-datalake
org.apache.camel.quarkus:camel-quarkus-azure-storage-datalake-deployment
org.apache.camel.quarkus:camel-quarkus-azure-storage-queue
org.apache.camel.quarkus:camel-quarkus-azure-storage-queue-deployment
org.apache.camel.quarkus:camel-quarkus-barcode
org.apache.camel.quarkus:camel-quarkus-barcode-deployment
org.apache.camel.quarkus:camel-quarkus-base64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ com.azure:azure-storage-blob
com.azure:azure-storage-blob-changefeed
com.azure:azure-storage-common
com.azure:azure-storage-internal-avro
com.azure:azure-storage-queue
com.azure:azure-xml
com.carrotsearch.thirdparty:simple-xml-safe
com.cronutils:cron-utils
Expand Down Expand Up @@ -624,6 +625,7 @@ org.apache.camel:camel-aws2-sqs
org.apache.camel:camel-azure-eventhubs
org.apache.camel:camel-azure-servicebus
org.apache.camel:camel-azure-storage-blob
org.apache.camel:camel-azure-storage-queue
org.apache.camel:camel-base
org.apache.camel:camel-base-engine
org.apache.camel:camel-bean
Expand Down Expand Up @@ -793,6 +795,8 @@ org.apache.camel.quarkus:camel-quarkus-azure-servicebus
org.apache.camel.quarkus:camel-quarkus-azure-servicebus-deployment
org.apache.camel.quarkus:camel-quarkus-azure-storage-blob
org.apache.camel.quarkus:camel-quarkus-azure-storage-blob-deployment
org.apache.camel.quarkus:camel-quarkus-azure-storage-queue
org.apache.camel.quarkus:camel-quarkus-azure-storage-queue-deployment
org.apache.camel.quarkus:camel-quarkus-bean
org.apache.camel.quarkus:camel-quarkus-bean-deployment
org.apache.camel.quarkus:camel-quarkus-bean-validator
Expand Down Expand Up @@ -1058,7 +1062,6 @@ org.apache.camel.quarkus:camel-quarkus-zip-deflater
org.apache.camel.quarkus:camel-quarkus-zip-deflater-deployment
org.apache.camel.quarkus:camel-quarkus-zipfile
org.apache.camel.quarkus:camel-quarkus-zipfile-deployment
org.apache.camel.quarkus:quarkus-azure-storage-queue-deployment
org.apache.commons:commons-collections4
org.apache.commons:commons-compress
org.apache.commons:commons-lang3
Expand Down
6 changes: 3 additions & 3 deletions product/src/main/resources/camel-quarkus-product-source.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
"camel-quarkus-azure-storage-blob": {
"jvm": "supported",
"native": "supported",
"comment": "supported since CEQ 3.15.0"
"comment": "community/community since 2.2.0, tp/tp since 2.7.1 (bc. of the future change to vert.x Azure client), supported since CEQ 3.15.0"
},
"quarkus-azure-storage-queue": {
"camel-quarkus-azure-storage-queue": {
"jvm": "supported",
"native": "supported",
"comment": "supported since CEQ 3.15.0"
"comment": "community/community since 2.2.0, tp/tp since 2.7.1 (bc. of the future change to vert.x Azure client), supported since CEQ 3.15.0"
},
"camel-quarkus-bean": {
"jvm": "supported",
Expand Down
8 changes: 4 additions & 4 deletions product/superapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-blob</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-queue</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bean</artifactId>
Expand Down Expand Up @@ -517,10 +521,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-zipfile</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>quarkus-azure-storage-queue</artifactId>
</dependency>
</dependencies>

<build>
Expand Down