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 all commits
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
2 changes: 2 additions & 0 deletions docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
*** xref:reference/extensions/attachments.adoc[Attachments]
*** xref:reference/extensions/avro.adoc[Avro]
*** xref:reference/extensions/jackson-avro.adoc[Avro Jackson]
*** xref:reference/extensions/avro-rpc.adoc[Avro RPC]
*** xref:reference/extensions/azure-cosmosdb.adoc[Azure CosmosDB]
*** xref:reference/extensions/azure-eventhubs.adoc[Azure Event Hubs]
*** xref:reference/extensions/azure-key-vault.adoc[Azure Key Vault]
Expand Down Expand Up @@ -263,6 +264,7 @@
*** xref:reference/extensions/ref.adoc[Ref]
*** xref:reference/extensions/rest.adoc[Rest]
*** xref:reference/extensions/robotframework.adoc[Robot Framework]
*** xref:reference/extensions/sap.adoc[SAP]
*** xref:reference/extensions/sap-netweaver.adoc[SAP NetWeaver]
*** xref:reference/extensions/jsch.adoc[SCP]
*** xref:reference/extensions/seda.adoc[SEDA]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $ cd target/checkout
+
[source,shell]
----
mvn deploy -Dapache-release -DskipTests -Denforcer.skip -Dquarkus.build.skip -Dformatter.skip -Dimpsort.skip -rf :camel-quarkus-openapi-java
mvn deploy -Papache-release -DskipTests -Denforcer.skip -Dquarkus.build.skip -Dformatter.skip -Dimpsort.skip -rf :camel-quarkus-openapi-java
----

== Close the Apache staging repository
Expand Down
45 changes: 45 additions & 0 deletions docs/modules/ROOT/pages/reference/extensions/sap.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Do not edit directly!
// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
[id="extensions-sap"]
= SAP
:linkattrs:
:cq-artifact-id: camel-quarkus-sap
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
:cq-description: Provides SAP Camel Component
:cq-deprecated: false
:cq-jvm-since: 3.2.0
:cq-native-since: n/a

ifeval::[{doc-show-badges} == true]
[.badges]
[.badge-key]##JVM since##[.badge-supported]##3.2.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
endif::[]

Provides SAP Camel Component

[id="extensions-sap-maven-coordinates"]
== Maven coordinates

[source,xml]
----
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-sap</artifactId>
</dependency>
----
ifeval::[{doc-show-user-guide-link} == true]
Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
endif::[]

[id="extensions-sap-camel-quarkus-limitations"]
== Camel Quarkus limitations

The SAP extension does not support the packaging type `uber-jar` which causes the application to throw a runtime exception similar to this:

[source, console, subs="attributes+"]
----
Caused by: java.lang.ExceptionInInitializerError: JCo initialization failed with java.lang.ExceptionInInitializerError: Illegal JCo archive "sap-1.0.0-SNAPSHOT-runner.jar". It is not allowed to rename or repackage the original archive "sapjco3.jar".
----

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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"supportLevel": "Stable",
"groupId": "org.apache.camel.quarkus",
"artifactId": "camel-quarkus-qute-component",
"version": "3.15.0-SNAPSHOT",
"version": "3.15.0.fuse-SNAPSHOT",
"scheme": "qute",
"extendsScheme": "",
"syntax": "qute:resourceUri",
Expand Down
29 changes: 9 additions & 20 deletions 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 Expand Up @@ -287,8 +287,6 @@
<camel-quarkus.extension.finder.strict>false</camel-quarkus.extension.finder.strict>
</properties>

<!-- Core modules -->
<!-- Any modules that do not need to be deployed during the Maven release, should be added to the 'standard-build' profile below -->
<modules>
<module>poms</module>
<module>tooling</module>
Expand All @@ -299,6 +297,9 @@
<module>catalog</module>
<module>integration-tests-support</module>
<!-- <module>integration-tests</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<!-- <module>integration-test-groups</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<!-- <module>docs</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<!-- <module>integration-tests-jvm</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<!-- <module>test-framework</module> disabled by cq-prod-maven-plugin:prod-excludes -->
<module>integration-tests/messaging</module>
<module>product</module>
Expand Down Expand Up @@ -418,13 +419,14 @@
<version>${maven-release-plugin.version}</version>
<configuration>
<!-- release:prepare config -->
<preparationGoals>clean validate -Pstandard-build -Pcommit-release-changes "-Dcq.commit.message.prefix=[maven-release-plugin] Prepare release" -N</preparationGoals>
<completionGoals>clean validate -Pstandard-build -Pcommit-release-changes "-Dcq.commit.message.prefix=[maven-release-plugin] Set next development version" -N</completionGoals>
<preparationGoals>clean validate -Pcommit-release-changes "-Dcq.commit.message.prefix=[maven-release-plugin] Prepare release" -N</preparationGoals>
<completionGoals>clean validate -Pcommit-release-changes "-Dcq.commit.message.prefix=[maven-release-plugin] Set next development version" -N</completionGoals>
<!-- release:perform config -->
<releaseProfiles combine.self="override"/>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>apache-release</releaseProfiles>
<goals>deploy</goals>
<!-- Both release:prepare and release:perform config -->
<arguments>-Dapache-release -DskipTests -Denforcer.skip -Dquarkus.build.skip -Dformatter.skip -Dimpsort.skip</arguments>
<arguments>-DskipTests -Denforcer.skip -Dquarkus.build.skip -Dformatter.skip -Dimpsort.skip</arguments>
</configuration>
</plugin>

Expand Down Expand Up @@ -1085,19 +1087,6 @@
</plugins>
</build>
</profile>
<profile>
<id>standard-build</id>
<activation>
<property>
<name>!apache-release</name>
</property>
</activation>
<modules>
<module>docs</module>
<module>integration-test-groups</module>
<module>integration-tests-jvm</module>
</modules>
</profile>
<profile>
<id>apache-release</id>
<activation>
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
Loading