(camel-quarkus) branch 3.8.x updated: Upgrade upload & download GitHub actions to v4
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.8.x by this push: new ee04bb58fa Upgrade upload & download GitHub actions to v4 ee04bb58fa is described below commit ee04bb58faa22f391679987b6d76e42513a6a0fb Author: James Netherton AuthorDate: Mon Apr 15 07:54:49 2024 +0100 Upgrade upload & download GitHub actions to v4 --- .github/workflows/camel-master-cron.yaml | 16 .github/workflows/ci-build.yaml| 16 .github/workflows/quarkus-master-cron.yaml | 16 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml index 77bd145183..8d223c6670 100644 --- a/.github/workflows/camel-master-cron.yaml +++ b/.github/workflows/camel-master-cron.yaml @@ -88,7 +88,7 @@ jobs: ls -lh ${{ runner.temp }}/maven-repo.tgz df -h / - name: Persist Maven Repo -uses: actions/upload-artifact@v3 +uses: actions/upload-artifact@v4 with: name: maven-repo path: ${{ runner.temp }}/maven-repo.tgz @@ -139,7 +139,7 @@ jobs: matrix: ${{ fromJson(needs.initial-mvn-install.outputs.matrix) }} steps: - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -221,7 +221,7 @@ jobs: MAVEN_OPTS: -Xmx3000m steps: - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -298,7 +298,7 @@ jobs: MAVEN_OPTS: -Xmx3000m steps: - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -365,7 +365,7 @@ jobs: distribution: 'temurin' java-version: '21' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -399,7 +399,7 @@ jobs: MAVEN_OPTS: -Xmx3000m steps: - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -452,7 +452,7 @@ jobs: distribution: 'temurin' java-version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -534,7 +534,7 @@ jobs: distribution: 'temurin' java-version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 4bbf541c3d..d905d6cb36 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -110,7 +110,7 @@ jobs: echo "continue-build=true" >> $GITHUB_OUTPUT fi - name: Upload dependabot changeset -uses: actions/upload-artifact@v3 +uses: actions/upload-artifact@v4 if: steps.pre-build-checks.outputs.continue-build == 'false' with: name: dependabot-pr-changeset @@ -178,7 +178,7 @@ jobs: ls -lh ${{ runner.temp }}/maven-repo.tgz df -h / - name: Persist Maven Repo -uses: actions/upload-artifact@v3 +uses: actions/upload-artifact@v4 with: name: maven-repo path: ${{ runner.temp }}/maven-repo.tgz @@ -237,7 +237,7 @@ jobs: distribution: 'temurin' java-version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -312,7 +312,7 @@ jobs: distribution: 'temurin' java-version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -383,7 +383,7 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4 with: name: maven-repo path: .. @@ -430,7 +430,7 @@ jobs: distribution: 'temurin' java-ver
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/net.revelc.code.formatter-formatter-maven-plugin-2.24.1 deleted (was a26d4db)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/net.revelc.code.formatter-formatter-maven-plugin-2.24.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was a26d4db Bump formatter-maven-plugin in contract first example The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-54c105e3cc deleted (was 243f68c)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-54c105e3cc in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 243f68c Bump formatter-maven-plugin in contract first example The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch camel-quarkus-main updated: Bump the maven group across 21 directories with 1 update
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new fda0757 Bump the maven group across 21 directories with 1 update fda0757 is described below commit fda0757b2f106f87f6382f02b68bfe12e889b6ed Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jun 6 07:46:03 2024 +0100 Bump the maven group across 21 directories with 1 update * Bump the maven group across 21 directories with 1 update Bumps the maven group with 1 update in the /aws-lambda directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /cluster-leader-election directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /cxf-soap directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /file-bindy-ftp directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /file-split-log-xml directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /health directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /http-log directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jdbc-datasource directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jms-jpa directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jpa-idempotent-repository directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jta-jpa directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /kafka directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /kamelet-chucknorris directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /message-bridge directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /observability directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /platform-http-security-keycloak directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /rest-json directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /timer-log directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /timer-log-kotlin directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /timer-log-main directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /vertx-websocket-chat directory: net.revelc.code.formatter:formatter-maven-plugin. Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.24.0 to 2.24.1 U
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-54c105e3cc updated (b29daa7 -> 243f68c)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-54c105e3cc in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git from b29daa7 Bump the maven group across 21 directories with 1 update add 243f68c Bump formatter-maven-plugin in contract first example No new revisions were added by this update. Summary of changes: openapi-contract-first/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/net.revelc.code.formatter-formatter-maven-plugin-2.24.1 updated (12a302b -> a26d4db)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/net.revelc.code.formatter-formatter-maven-plugin-2.24.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git from 12a302b Bump net.revelc.code.formatter:formatter-maven-plugin in /aws-lambda add a26d4db Bump formatter-maven-plugin in contract first example No new revisions were added by this update. Summary of changes: openapi-contract-first/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-quarkus-examples) branch main updated: Add openapi-contract-first in dependabot
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/main by this push: new 007a29d Add openapi-contract-first in dependabot 007a29d is described below commit 007a29d357f3c62c023a23e869d0816cd5d4ddaa Author: Zheng Feng AuthorDate: Thu Jun 6 06:56:38 2024 +0800 Add openapi-contract-first in dependabot --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 87763cd..6721016 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -46,6 +46,7 @@ updates: - "/kamelet-chucknorris" - "/message-bridge" - "/observability" + - "/openapi-contract-first" - "/platform-http-security-keycloak" - "/rest-json" - "/timer-log-kotlin"
(camel-quarkus) branch main updated: Add missing HTTP client dependency to azure-key-vault extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new c2a088f1d6 Add missing HTTP client dependency to azure-key-vault extension c2a088f1d6 is described below commit c2a088f1d671f48d23ab52423b6c34fb18c5969a Author: James Netherton AuthorDate: Wed Jun 5 14:06:31 2024 +0100 Add missing HTTP client dependency to azure-key-vault extension Fixes #6157 --- extensions-jvm/azure-key-vault/deployment/pom.xml | 4 + extensions-jvm/azure-key-vault/runtime/pom.xml | 16 +--- integration-tests-jvm/azure-key-vault/pom.xml | 22 + .../azure/key/vault/it/AzureKeyVaultResource.java | 59 ++ .../azure/key/vault/it/AzureKeyVaultRoutes.java| 58 + .../src/main/resources/application.properties | 21 + .../azure/key/vault/it/AzureKeyVaultTest.java | 94 -- 7 files changed, 241 insertions(+), 33 deletions(-) diff --git a/extensions-jvm/azure-key-vault/deployment/pom.xml b/extensions-jvm/azure-key-vault/deployment/pom.xml index e7d4d0d4fc..a3642a7ecf 100644 --- a/extensions-jvm/azure-key-vault/deployment/pom.xml +++ b/extensions-jvm/azure-key-vault/deployment/pom.xml @@ -34,6 +34,10 @@ org.apache.camel.quarkus camel-quarkus-core-deployment + +org.apache.camel.quarkus + camel-quarkus-support-azure-core-http-client-vertx-deployment + org.apache.camel.quarkus camel-quarkus-azure-key-vault diff --git a/extensions-jvm/azure-key-vault/runtime/pom.xml b/extensions-jvm/azure-key-vault/runtime/pom.xml index ebc1a7b4b0..6279f65c2e 100644 --- a/extensions-jvm/azure-key-vault/runtime/pom.xml +++ b/extensions-jvm/azure-key-vault/runtime/pom.xml @@ -40,20 +40,12 @@ camel-quarkus-core -org.apache.camel -camel-azure-key-vault - - -reactor-core -io.projectreactor - - +org.apache.camel.quarkus + camel-quarkus-support-azure-core-http-client-vertx - - -reactor-core -io.projectreactor +org.apache.camel +camel-azure-key-vault diff --git a/integration-tests-jvm/azure-key-vault/pom.xml b/integration-tests-jvm/azure-key-vault/pom.xml index ec34faf50f..970b2fc789 100644 --- a/integration-tests-jvm/azure-key-vault/pom.xml +++ b/integration-tests-jvm/azure-key-vault/pom.xml @@ -54,6 +54,10 @@ org.apache.camel.quarkus camel-quarkus-azure-key-vault + +org.apache.camel.quarkus +camel-quarkus-direct + io.quarkus quarkus-resteasy @@ -70,6 +74,11 @@ rest-assured test + +org.apache.camel.quarkus + camel-quarkus-integration-tests-support-azure +test + @@ -95,6 +104,19 @@ + +org.apache.camel.quarkus +camel-quarkus-direct-deployment +${project.version} +pom +test + + +* +* + + + diff --git a/integration-tests-jvm/azure-key-vault/src/main/java/org/apache/camel/quarkus/component/azure/key/vault/it/AzureKeyVaultResource.java b/integration-tests-jvm/azure-key-vault/src/main/java/org/apache/camel/quarkus/component/azure/key/vault/it/AzureKeyVaultResource.java index c2687569cb..3251da5c43 100644 --- a/integration-tests-jvm/azure-key-vault/src/main/java/org/apache/camel/quarkus/component/azure/key/vault/it/AzureKeyVaultResource.java +++ b/integration-tests-jvm/azure-key-vault/src/main/java/org/apache/camel/quarkus/component/azure/key/vault/it/AzureKeyVaultResource.java @@ -16,35 +16,64 @@ */ package org.apache.camel.quarkus.component.azure.key.vault.it; +import com.azure.security.keyvault.secrets.models.KeyVaultSecret; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.camel.CamelContext; -import org.jboss.logging.Logger; +import org.apache.camel.ProducerTemplate; +import
(camel) branch main updated (07654a6ae64 -> 0e26aa97459)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 07654a6ae64 camel-catalog - Also check pojo beans for matching artifact add 9cce197f73b camel-qdrant: Make rest-assured test scoped add 0e26aa97459 CAMEL-20836: Add support for deleting a Qdrant collection No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/components/qdrant.json| 2 +- components/camel-qdrant/pom.xml| 1 + .../org/apache/camel/component/qdrant/qdrant.json | 2 +- .../src/main/docs/qdrant-component.adoc| 66 ++- .../org/apache/camel/component/qdrant/Qdrant.java | 2 +- .../camel/component/qdrant/QdrantAction.java | 1 + .../camel/component/qdrant/QdrantProducer.java | 18 .../camel/component/qdrant/QdrantCommonTest.java | 4 +- .../qdrant/it/QdrantDeleteCollectionIT.java| 98 ++ 9 files changed, 169 insertions(+), 25 deletions(-) create mode 100644 components/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/it/QdrantDeleteCollectionIT.java
(camel-quarkus-examples) branch camel-quarkus-main updated: Update Maven wrapper distribution URL to Maven 3.9.7
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new e5b53f1 Update Maven wrapper distribution URL to Maven 3.9.7 e5b53f1 is described below commit e5b53f11c9d4f5246e37799c3a39bb5b8099a41d Author: James Netherton AuthorDate: Wed Jun 5 09:46:41 2024 +0100 Update Maven wrapper distribution URL to Maven 3.9.7 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 346d645..11f5868 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
(camel-quarkus) branch main updated: Update Maven wrapper distribution URL to Maven 3.9.7
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new d0b4de6f11 Update Maven wrapper distribution URL to Maven 3.9.7 d0b4de6f11 is described below commit d0b4de6f11674fbae805867e8e69bcf80a127b5a Author: James Netherton AuthorDate: Wed Jun 5 07:59:17 2024 +0100 Update Maven wrapper distribution URL to Maven 3.9.7 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 346d645fd0..11f586804e 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
(camel-quarkus) branch dependabot/maven/quarkiverse-minio.version-3.7.2 deleted (was e323dbf9b1)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/quarkiverse-minio.version-3.7.2 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was e323dbf9b1 Auto generated changes for dependabot commit 1112a507f48176bf99fe5c91ed45bd1670ffbecd The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated: Bump quarkiverse-minio.version from 3.7.1 to 3.7.2
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 4815768d5d Bump quarkiverse-minio.version from 3.7.1 to 3.7.2 4815768d5d is described below commit 4815768d5d47aea95e33f5269a9322cf0fb69dff Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jun 5 09:45:03 2024 +0100 Bump quarkiverse-minio.version from 3.7.1 to 3.7.2 * Bump quarkiverse-minio.version from 3.7.1 to 3.7.2 Bumps `quarkiverse-minio.version` from 3.7.1 to 3.7.2. Updates `io.quarkiverse.minio:quarkus-minio` from 3.7.1 to 3.7.2 Updates `io.quarkiverse.minio:quarkus-minio-deployment` from 3.7.1 to 3.7.2 Updates `io.quarkiverse.minio:quarkus-minio-native` from 3.7.1 to 3.7.2 Updates `io.quarkiverse.minio:quarkus-minio-native-deployment` from 3.7.1 to 3.7.2 --- updated-dependencies: - dependency-name: io.quarkiverse.minio:quarkus-minio dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkiverse.minio:quarkus-minio-deployment dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkiverse.minio:quarkus-minio-native dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkiverse.minio:quarkus-minio-native-deployment dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Auto generated changes for dependabot commit 1112a507f48176bf99fe5c91ed45bd1670ffbecd - Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-full-pom.xml| 10 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 7feca5c826..9212c52219 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 3.0.7 0.14.2 3.2.4 -3.7.1 +3.7.2 2.2.2 2.4.0 2.0.2 @@ -135,7 +135,7 @@ 2.24.0 0.30.0 ${mapstruct-version} -8.5.7 +8.5.10 1.15.0 1.0.0 2.5.2.Final diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 695c12a707..01935ecb56 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6537,7 +6537,7 @@ io.minio minio -8.5.7 +8.5.10 org.checkerframework @@ -6654,22 +6654,22 @@ io.quarkiverse.minio quarkus-minio -3.7.1 +3.7.2 io.quarkiverse.minio quarkus-minio-deployment -3.7.1 +3.7.2 io.quarkiverse.minio quarkus-minio-native -3.7.1 +3.7.2 io.quarkiverse.minio quarkus-minio-native-deployment -3.7.1 +3.7.2 io.quarkiverse.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a8be5f0e01..594eb8b75d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6507,7 +6507,7 @@ io.minio minio -8.5.7 +8.5.10 org.checkerframework @@ -6624,12 +6624,12 @@ io.quarkiverse.minio quarkus-minio-native -3.7.1 +3.7.2 io.quarkiverse.minio quarkus-minio-native-deployment -3.7.1 +3.7.2 io.quarkiverse.mybatis 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 40ab4af693..256be2db1f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6507,7 +6507,7 @@ io.minio minio -8.5.7 +8.5.10 org.checkerframework @@ -6624,12 +6624,12 @@ io.quarkiverse.minio quarkus-minio-native -3.7.1 +
(camel-quarkus) 01/03: Upgrade Quarkus to 3.12.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 05cb3ada2f0f18d24316246bab3b7c6451a35364 Author: James Netherton AuthorDate: Tue May 28 08:42:16 2024 +0100 Upgrade Quarkus to 3.12.0.CR1 --- pom.xml | 10 +- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 7feca5c826..1b9a174cb9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -75,7 +75,7 @@ 1.11.3 2.25.60 0.29.18 -3.25.3 +3.26.0 1.11.714 ${azure-sdk-bom-version} 1.48.0 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 -1.63.0 +1.64.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -131,7 +131,7 @@ 2.5.0 3.7.0 ${kudu-version} -1.9.23 +2.0.0 2.24.0 0.30.0 ${mapstruct-version} @@ -265,7 +265,7 @@ 3.8.2 -3.9.6 +3.9.7 [${min-maven-version},) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 695c12a707..76f271cb31 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7002,17 +7002,17 @@ org.jetbrains.kotlin kotlin-script-util -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.jolokia diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a8be5f0e01..db98dcde18 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6942,12 +6942,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject 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 40ab4af693..fcd24cc28c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6942,12 +6942,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject
(camel-quarkus) branch quarkus-main updated (101403480f -> 1deb61c63b)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 101403480f Upgrade Quarkus to 3.12.0.CR1 add 8037be814f Enable relocations profile when building Quarkus add 33b577b714 Fix auto label workflow GraphQL query new 05cb3ada2f Upgrade Quarkus to 3.12.0.CR1 new 768d8c7a58 Exclude jline native image configuration from org.jetbrains.kotlin:kotlin-compiler-embeddable #6147 new 1deb61c63b Disable couchdb tests due to #6148 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (101403480f) \ N -- N -- N refs/heads/quarkus-main (1deb61c63b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci-build.yaml | 2 +- .github/workflows/label-issue.yaml | 2 +- .github/workflows/quarkus-master-cron.yaml | 2 +- .../quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java | 13 + .../apache/camel/quarkus/component/couchdb/it/CouchbIT.java | 2 ++ .../camel/quarkus/component/couchdb/it/CouchdbTest.java | 2 ++ integration-tests/langchain4j-chat/pom.xml | 10 -- 7 files changed, 20 insertions(+), 13 deletions(-)
(camel-quarkus) 03/03: Disable couchdb tests due to #6148
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1deb61c63b2a5ed5faf92967300e70bfc2cef09e Author: James Netherton AuthorDate: Tue Jun 4 14:24:06 2024 +0100 Disable couchdb tests due to #6148 --- .../java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java| 2 ++ .../java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java index 5c7623a316..9b1810aeee 100644 --- a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java +++ b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.component.couchdb.it; import io.quarkus.test.junit.QuarkusIntegrationTest; +import org.junit.jupiter.api.Disabled; +@Disabled("https://github.com/apache/camel-quarkus/issues/6148;) @QuarkusIntegrationTest class CouchbIT extends CouchdbTest { diff --git a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java index 88d3f7d668..8a4e549fb4 100644 --- a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java +++ b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java @@ -22,6 +22,7 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.awaitility.Awaitility.await; @@ -29,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@Disabled("https://github.com/apache/camel-quarkus/issues/6148;) @QuarkusTest @QuarkusTestResource(CouchdbTestResource.class) class CouchdbTest {
(camel-quarkus) 02/03: Exclude jline native image configuration from org.jetbrains.kotlin:kotlin-compiler-embeddable #6147
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 768d8c7a589967da53fdabc5b61982fb41dfae35 Author: James Netherton AuthorDate: Tue Jun 4 13:47:34 2024 +0100 Exclude jline native image configuration from org.jetbrains.kotlin:kotlin-compiler-embeddable #6147 --- .../quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java | 13 + 1 file changed, 13 insertions(+) diff --git a/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java b/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java index c8f01b2806..a607fef0e3 100644 --- a/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java +++ b/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java @@ -39,6 +39,7 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.dev.CompilationProvider; import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem; @@ -80,6 +81,18 @@ class KotlinDslProcessor { return new FeatureBuildItem(FEATURE); } +@BuildStep +void excludeJLineNativeImageConfigs(BuildProducer nativeImageExclusions) { +// Exclude various jline native-image.properties, as the required native-image configuration files +// are not shaded into org.jetbrains.kotlin:kotlin-compiler-embeddable. +// See: https://github.com/apache/camel-quarkus/issues/6147 +String nativeResourceTemplate = "/META-INF/native-image/org\\.jline/jline-terminal%s/native-image\\.properties"; +Stream.of("", "-jansi", "-jna", "-jni") +.forEach(module -> { +nativeImageExclusions.produce(new ExcludeConfigBuildItem(".*kotlin-compiler-embeddable.*", nativeResourceTemplate.formatted(module))); +}); +} + @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) void compileScriptsAOT(BuildProducer generatedClass, BuildProducer generatedResource,
(camel-quarkus) branch main updated: Fix auto label workflow GraphQL query
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 33b577b714 Fix auto label workflow GraphQL query 33b577b714 is described below commit 33b577b714f7da02beb4a3b628c5465d1201f4ef Author: James Netherton AuthorDate: Tue Jun 4 15:52:12 2024 +0100 Fix auto label workflow GraphQL query --- .github/workflows/label-issue.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-issue.yaml b/.github/workflows/label-issue.yaml index 176ff274c9..7ea2b1369a 100644 --- a/.github/workflows/label-issue.yaml +++ b/.github/workflows/label-issue.yaml @@ -137,7 +137,7 @@ jobs: // Check to see if labels already exist, and if not, create them so we can set the color const labelQuery = `{ repository(owner: "${context.repo.owner}", name: "${context.repo.repo}") { -labels(first: 50, query: "name: ${Array.from(labels).join(' ')}") { +labels(first: 50, query: "name: ${Array.from(labels).join(' || ')}") { nodes { name }
(camel-quarkus) branch main updated: Enable relocations profile when building Quarkus
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 8037be814f Enable relocations profile when building Quarkus 8037be814f is described below commit 8037be814fce3bab4a2eae846e99a1d029531a31 Author: James Netherton AuthorDate: Tue Jun 4 14:58:32 2024 +0100 Enable relocations profile when building Quarkus --- .github/workflows/ci-build.yaml| 2 +- .github/workflows/quarkus-master-cron.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 250f94b68e..583e91b681 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -151,7 +151,7 @@ jobs: && cd quarkus \ && echo "Current Quarkus commit:" $(git rev-parse HEAD) \ && sed -i '/integration-tests<\/module>/d' pom.xml \ -&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -T1C +&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -Prelocations -T1C - name: Checkout uses: actions/checkout@v4 with: diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml index 343682dce5..6563a8b20b 100644 --- a/.github/workflows/quarkus-master-cron.yaml +++ b/.github/workflows/quarkus-master-cron.yaml @@ -71,7 +71,7 @@ jobs: && cd quarkus \ && echo "Current Quarkus commit:" $(git rev-parse HEAD) \ && sed -i '/integration-tests<\/module>/d' pom.xml \ -&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -T1C +&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -Prelocations -T1C - name: Update extension metadata run: | ./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS}
(camel-quarkus-examples) branch camel-quarkus-main updated: Observability example project improvements
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new fb7c0c0 Observability example project improvements fb7c0c0 is described below commit fb7c0c0432b867921c1ff1d287c319935d2b Author: James Netherton AuthorDate: Tue Jun 4 07:40:05 2024 +0100 Observability example project improvements * Fix typos in README * Upgrade and simplify the container setup * Add trace-processors option to application.properties --- observability/README.adoc | 4 +-- observability/docker-compose.yml | 19 +++--- observability/otel-collector-config.yaml | 42 -- .../src/main/resources/application.properties | 4 +++ 4 files changed, 10 insertions(+), 59 deletions(-) diff --git a/observability/README.adoc b/observability/README.adoc index 831b2ae..c536c8b 100644 --- a/observability/README.adoc +++ b/observability/README.adoc @@ -44,7 +44,7 @@ First using Camel micrometer component (see link:src/main/java/org/acme/observab Which will count each call to the `platform-http:/greeting-provider` endpoint. -The second approach is to benefit from CDI dependnecy injection of the `MeterRegistry`: +The second approach is to benefit from CDI dependency injection of the `MeterRegistry`: [source, java] @@ -162,7 +162,7 @@ Then configure the OpenTelemetry exporter in `application.properties`: quarkus.otel.exporter.otlp.traces.endpoint = http://${TELEMETRY_COLLECTOR_COLLECTOR_SERVICE_HOST:localhost}:4317 -NOTE: For information about other OpenTelemetry exporters, refer to the Camel Quarkus Opentelemetry https://camel.apache.org/camel-quarkus/next/reference/extensions/opentelemetry.html#extensions-opentelemetry-usage-exporters[extension documentation]. +NOTE: For information about other OpenTelemetry exporters, refer to the Camel Quarkus OpenTelemetry https://camel.apache.org/camel-quarkus/next/reference/extensions/opentelemetry.html#extensions-opentelemetry-usage-exporters[extension documentation]. To view tracing events, start a tracing server. A simple way of doing this is with Docker Compose: diff --git a/observability/docker-compose.yml b/observability/docker-compose.yml index 0dd55fe..38179d7 100644 --- a/observability/docker-compose.yml +++ b/observability/docker-compose.yml @@ -20,20 +20,9 @@ services: # Jaeger jaeger-all-in-one: -image: jaegertracing/all-in-one:1.33 +image: jaegertracing/all-in-one:1.57 ports: - "16686:16686" - - "14268:14268" - - "14250:14250" - - # Collector - otel-collector: -image: otel/opentelemetry-collector:0.50.0 -command: [ "--config=/etc/otel-collector-config.yaml" ] -volumes: - - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml -ports: - - "13133:13133" # Health_check extension - - "4317:4317" # OTLP gRPC receiver -depends_on: - - jaeger-all-in-one + - "4317:4317" +environment: + - COLLECTOR_OTLP_ENABLED=true \ No newline at end of file diff --git a/observability/otel-collector-config.yaml b/observability/otel-collector-config.yaml deleted file mode 100644 index b108831..000 --- a/observability/otel-collector-config.yaml +++ /dev/null @@ -1,42 +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. -# - -receivers: - otlp: -protocols: - grpc: -endpoint: otel-collector:4317 - -exporters: - jaeger: -endpoint: jaeger-all-in-one:14250 -tls: - insecure: true - -processors: - batch: - -extensions: - health_check: - -service: - extensions: [health_check] - pipelines: -traces: - receivers: [otlp] - processors: [batch] - exporters: [jaeger] \ No newline at end of file diff --git a/observability/src/main/resources/application.properties b/observability/src/main/resources/application.properties index 2ce095e..6b619b2 100644 --- a/obse
(camel-quarkus) 01/01: Upgrade Quarkus to 3.12.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 101403480f6345540e572921824540dd2d1c68bb Author: James Netherton AuthorDate: Tue May 28 08:42:16 2024 +0100 Upgrade Quarkus to 3.12.0.CR1 --- integration-tests/langchain4j-chat/pom.xml| 10 ++ pom.xml | 10 +- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/integration-tests/langchain4j-chat/pom.xml b/integration-tests/langchain4j-chat/pom.xml index 4fb1d102d3..29e8f0700c 100644 --- a/integration-tests/langchain4j-chat/pom.xml +++ b/integration-tests/langchain4j-chat/pom.xml @@ -47,9 +47,19 @@ io.quarkus quarkus-rest + +io.quarkus +quarkus-rest-client-jackson + io.quarkiverse.langchain4j quarkus-langchain4j-ollama + + +io.quarkus + quarkus-rest-client-reactive-jackson + + diff --git a/pom.xml b/pom.xml index 7feca5c826..1b9a174cb9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -75,7 +75,7 @@ 1.11.3 2.25.60 0.29.18 -3.25.3 +3.26.0 1.11.714 ${azure-sdk-bom-version} 1.48.0 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 -1.63.0 +1.64.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -131,7 +131,7 @@ 2.5.0 3.7.0 ${kudu-version} -1.9.23 +2.0.0 2.24.0 0.30.0 ${mapstruct-version} @@ -265,7 +265,7 @@ 3.8.2 -3.9.6 +3.9.7 [${min-maven-version},) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 695c12a707..76f271cb31 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7002,17 +7002,17 @@ org.jetbrains.kotlin kotlin-script-util -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.jolokia diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a8be5f0e01..db98dcde18 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6942,12 +6942,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject 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 40ab4af693..fcd24cc28c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6942,12 +6942,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject
(camel-quarkus) branch quarkus-main updated (c1e6a2ae0d -> 101403480f)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard c1e6a2ae0d Upgrade Quarkus to 3.12.0.CR1 new 101403480f Upgrade Quarkus to 3.12.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c1e6a2ae0d) \ N -- N -- N refs/heads/quarkus-main (101403480f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: integration-tests/langchain4j-chat/pom.xml | 10 ++ 1 file changed, 10 insertions(+)
(camel-quarkus) branch quarkus-main updated (f8276dba1a -> c1e6a2ae0d)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard f8276dba1a Upgrade Quarkus to 3.12.0.CR1 add bf388f0c93 Remove unused version properties add 283f43ddfe Bump net.revelc.code.formatter:formatter-maven-plugin (#6135) add abcb87176d Use more robust type check in test report action for test case names add da83f0dd42 MySql test does not work on FIPS enabled system - native add 6a38620f4c Next is 3.12.0-SNAPSHOT add c1bbfb8b5c Add changelog for 3.11.0 add 2dcd428b62 Fix release guide command for regenerating files post SNAPSHOT version bump add 1914d91428 Additional test coverage for GraphQL extension add 349bbda855 Add langchain4j-chat native support add bb721ff4a0 Fix #5824 to add camel trace config properties (#6130) add 6009c77310 Remove duplicated dependency from tests-support-kafka add 3e817e23d2 Regen SBOM from commit 6009c773107899d78c7ad519ccfe27a4200d9c8d (#6144) add 4188a3a3bd Replace manual certificate generation with camel-quarkus-integration-tests-support-certificate-generator add cb4557166e Add traceProcessors option to OpenTelemetry extension new c1e6a2ae0d Upgrade Quarkus to 3.12.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f8276dba1a) \ N -- N -- N refs/heads/quarkus-main (c1e6a2ae0d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/actions/test-summary-report/action.yaml| 2 +- CHANGELOG.md |56 +- camel-quarkus-sbom/camel-quarkus-sbom.json | 25641 ++- camel-quarkus-sbom/camel-quarkus-sbom.xml | 23623 - catalog/pom.xml| 2 +- docs/antora.yml| 2 +- .../ROOT/examples/components/langchain4j-chat.yml | 6 +- .../pages/contributor-guide/release-guide.adoc | 2 +- .../ROOT/pages/reference/extensions/core.adoc |86 +- .../reference/extensions/langchain4j-chat.adoc |14 +- .../pages/reference/extensions/opentelemetry.adoc |12 +- docs/pom.xml | 2 +- extensions-core/core-cloud/deployment/pom.xml | 2 +- extensions-core/core-cloud/pom.xml | 2 +- extensions-core/core-cloud/runtime/pom.xml | 2 +- extensions-core/core/deployment/pom.xml| 2 +- .../core/deployment/CamelContextProcessor.java |24 + .../camel/quarkus/core/runtime/CamelTraceTest.java |94 + extensions-core/core/pom.xml | 2 +- extensions-core/core/runtime/pom.xml | 2 +- .../org/apache/camel/quarkus/core/CamelConfig.java | 100 +- .../camel/quarkus/core/CamelContextRecorder.java |31 + extensions-core/http-common/deployment/pom.xml | 2 +- extensions-core/http-common/pom.xml| 2 +- extensions-core/http-common/runtime/pom.xml| 2 +- extensions-core/pom.xml| 2 +- .../reactive-executor/deployment/pom.xml | 2 +- extensions-core/reactive-executor/pom.xml | 2 +- extensions-core/reactive-executor/runtime/pom.xml | 2 +- .../threadpoolfactory-vertx/deployment/pom.xml | 2 +- extensions-core/threadpoolfactory-vertx/pom.xml| 2 +- .../threadpoolfactory-vertx/runtime/pom.xml| 2 +- extensions-core/xml-io-dsl/deployment/pom.xml | 2 +- extensions-core/xml-io-dsl/pom.xml | 2 +- extensions-core/xml-io-dsl/runtime/pom.xml | 2 +- extensions-core/xml-jaxb/deployment/pom.xml| 2 +- extensions-core/xml-jaxb/pom.xml | 2 +- extensions-core/xml-jaxb/runtime/pom.xml | 2 +- extensions-core/xml-jaxp/deployment/pom.xml| 2 +- extensions-core/xml-jaxp/pom.xml | 2 +- extensions-core/xml-jaxp/runtime/pom.xml | 2 +- extensions-core/yaml-dsl/deployment/po
(camel-quarkus) 01/01: Upgrade Quarkus to 3.12.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c1e6a2ae0d4ca99f528850966c53e7ebfdf1d2b0 Author: James Netherton AuthorDate: Tue May 28 08:42:16 2024 +0100 Upgrade Quarkus to 3.12.0.CR1 --- pom.xml | 10 +- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 7feca5c826..1b9a174cb9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -75,7 +75,7 @@ 1.11.3 2.25.60 0.29.18 -3.25.3 +3.26.0 1.11.714 ${azure-sdk-bom-version} 1.48.0 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 -1.63.0 +1.64.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -131,7 +131,7 @@ 2.5.0 3.7.0 ${kudu-version} -1.9.23 +2.0.0 2.24.0 0.30.0 ${mapstruct-version} @@ -265,7 +265,7 @@ 3.8.2 -3.9.6 +3.9.7 [${min-maven-version},) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 695c12a707..76f271cb31 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7002,17 +7002,17 @@ org.jetbrains.kotlin kotlin-script-util -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.jolokia diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a8be5f0e01..db98dcde18 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6942,12 +6942,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject 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 40ab4af693..fcd24cc28c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6942,12 +6942,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject
(camel-quarkus) branch main updated: Add traceProcessors option to OpenTelemetry extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new cb4557166e Add traceProcessors option to OpenTelemetry extension cb4557166e is described below commit cb4557166e4930b1b993df996c01fff522c0dc2a Author: James Netherton AuthorDate: Mon Jun 3 14:34:33 2024 +0100 Add traceProcessors option to OpenTelemetry extension Fixes #6143 --- .../pages/reference/extensions/opentelemetry.adoc | 12 +++-- .../deployment/OpenTelemetryEnabledTest.java | 14 +- .../opentelemetry/CamelOpenTelemetryConfig.java| 11 - .../opentelemetry/OpenTelemetryTracerProducer.java | 8 +++ .../opentelemetry/it/OpenTelemetryTest.java| 20 ++-- .../opentelemetry/it/OpenTelemetryTestHelper.java | 39 +++ .../it/OpenTelemetryTraceProcessorsIT.java | 23 + .../it/OpenTelemetryTraceProcessorsTest.java | 57 ++ .../it/TraceProcessorsTestProfile.java | 28 +++ 9 files changed, 190 insertions(+), 22 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc b/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc index 84982456b6..7fd7861c8b 100644 --- a/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc @@ -120,15 +120,15 @@ There is more information about CDI instrumentation in the https://quarkus.io/gu | Configuration property | Type | Default -|icon:lock[title=Fixed at build time] [[quarkus.camel.opentelemetry.encoding]]`link:#quarkus.camel.opentelemetry.encoding[quarkus.camel.opentelemetry.encoding]` +| [[quarkus.camel.opentelemetry.encoding]]`link:#quarkus.camel.opentelemetry.encoding[quarkus.camel.opentelemetry.encoding]` Sets whether header names need to be encoded. Can be useful in situations where OpenTelemetry propagators potentially set header name values in formats that are not compatible with the target system. E.g for JMS where the specification mandates header names are valid Java identifiers. | `boolean` | `false` -|icon:lock[title=Fixed at build time] [[quarkus.camel.opentelemetry.exclude-patterns]]`link:#quarkus.camel.opentelemetry.exclude-patterns[quarkus.camel.opentelemetry.exclude-patterns]` +| [[quarkus.camel.opentelemetry.exclude-patterns]]`link:#quarkus.camel.opentelemetry.exclude-patterns[quarkus.camel.opentelemetry.exclude-patterns]` -Sets whether to disable tracing for endpoint URIs that match the given comma separated patterns. The pattern can take the following forms: +Sets whether to disable tracing for endpoint URIs or Processor ids that match the given comma separated patterns. The pattern can take the following forms: @@ -143,6 +143,12 @@ Sets whether to disable tracing for endpoint URIs that match the given comma sep 3. A regular expression matching the endpoint URI. E.g platform-http:/prefix/.++*++ | `string` | + +| [[quarkus.camel.opentelemetry.trace-processors]]`link:#quarkus.camel.opentelemetry.trace-processors[quarkus.camel.opentelemetry.trace-processors]` + +Sets whether to create new OpenTelemetry spans for each Camel Processor. Use the excludePatterns property to filter out Processors. +| `boolean` +| `false` |=== [.configuration-legend] diff --git a/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryEnabledTest.java b/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryEnabledTest.java index 57ab28369e..dfbda06121 100644 --- a/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryEnabledTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryEnabledTest.java @@ -23,18 +23,25 @@ import jakarta.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.opentelemetry.CamelQuarkusOpenTelemetryTracer; import org.apache.camel.opentelemetry.OpenTelemetryTracer; +import org.apache.camel.opentelemetry.OpenTelemetryTracingStrategy; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; public class OpenTelemetryEnabledTest { +private static final String EXCLUDE_PATTERNS = "platform-http:*,platform-http:/prefix/.*"; + @RegisterExtension static final Quark
(camel-quarkus) branch main updated: Replace manual certificate generation with camel-quarkus-integration-tests-support-certificate-generator
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 4188a3a3bd Replace manual certificate generation with camel-quarkus-integration-tests-support-certificate-generator 4188a3a3bd is described below commit 4188a3a3bde1bfa25d683c750088bf4f5ff4bbfc Author: JiriOndrusek AuthorDate: Mon Jun 3 08:44:57 2024 +0200 Replace manual certificate generation with camel-quarkus-integration-tests-support-certificate-generator fixes #5967 fixes #6125 fixes #6126 fixes #6127 --- integration-test-groups/http/README.adoc | 7 --- .../http/common/generate-certs.sh | 67 .../component/http/common/CommonProducers.java | 6 +- .../src/main/resources/application.properties | 4 +- .../main/resources/jsse/client-truststore.pkcs12 | Bin 2246 -> 0 bytes .../main/resources/jsse/localhost-keystore.pkcs12 | Bin 3638 -> 0 bytes .../component/http/common/HttpTestResource.java| 4 ++ integration-test-groups/http/common/v3.ext | 3 - integration-test-groups/http/http/pom.xml | 5 ++ .../quarkus/component/http/http/it/HttpTest.java | 6 ++ integration-test-groups/http/netty-http/pom.xml| 5 ++ .../component/http/netty/it/NettyHttpJaasTest.java | 7 +++ integration-test-groups/http/vertx-http/pom.xml| 5 ++ .../component/http/vertx/it/VertxHttpTest.java | 6 ++ .../test/support/certificate/CertificatesUtil.java | 18 +++--- .../TestCertificateGenerationExtension.java| 21 +++ .../test/support/certificate/TestCertificates.java | 9 ++- integration-tests/ftp/pom.xml | 5 ++ .../quarkus/component/ftp/it/FtpTestResource.java | 21 --- .../camel/quarkus/component/ftps/it/FtpsTest.java | 9 +++ .../component/ftps/it/FtpsTestResource.java| 37 +++ .../camel/quarkus/component/sftp/it/SftpTest.java | 8 +++ .../component/sftp/it/SftpTestResource.java| 2 +- .../ftp/src/test/resources/keystore.p12| Bin 3542 -> 0 bytes .../ftp/src/test/resources/readme.adoc | 28 - integration-tests/ftp/src/test/resources/test.key | 28 - integration-tests/http-grouped/pom.xml | 5 ++ .../camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 +- .../camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 +- integration-tests/lumberjack/pom.xml | 5 ++ .../component/lumberjack/it/LumberjackRoutes.java | 2 +- .../src/main/resources/application.properties | 2 +- .../lumberjack/src/main/resources/ssl/keystore.jks | Bin 1473 -> 0 bytes .../lumberjack/it/LumberjackClientUtil.java| 2 +- .../component/lumberjack/it/LumberjackTest.java| 6 ++ integration-tests/mail/README.adoc | 17 - integration-tests/mail/pom.xml | 5 ++ .../camel/quarkus/component/mail/MailTest.java | 9 +++ .../quarkus/component/mail/MailTestResource.java | 69 ++--- .../src/test/resources/generate-certificates.sh| 32 -- .../mail/src/test/resources/greenmail.p12 | Bin 4077 -> 0 bytes integration-tests/nats/pom.xml | 5 ++ .../quarkus/component/nats/it/NatsRoutes.java | 4 +- .../nats/src/main/resources/application.properties | 2 +- .../nats/src/main/resources/certs/keystore.jks | Bin 3477 -> 0 bytes .../nats/src/main/resources/certs/truststore.jks | Bin 1162 -> 0 bytes .../camel/quarkus/component/nats/it/NatsTest.java | 6 ++ .../component/nats/it/NatsTestResource.java| 13 ++-- .../nats/src/test/resources/certs/ca.pem | 20 -- .../nats/src/test/resources/certs/key.pem | 28 - .../nats/src/test/resources/certs/server.pem | 20 -- integration-tests/netty/README.adoc| 16 - integration-tests/netty/pom.xml| 44 ++--- .../quarkus/component/netty/NettyProducers.java| 8 +-- .../src/main/resources/application.properties | 14 + .../src/main/resources/ssl/fips-keystore.bcfks | Bin 2579 -> 0 bytes .../src/main/resources/ssl/fips-truststore.bcfks | Bin 1188 -> 0 bytes .../netty/src/main/resources/ssl/keystore.p12 | Bin 2421 -> 0 bytes .../netty/src/main/resources/ssl/truststore.jks| Bin 1018 -> 0 bytes .../quarkus/component/netty/tcp/NettyTcpTest.java | 6 ++ .../quarkus/component/netty/udp/NettyUdpTest.java | 6 ++ integration-tests/oaipmh/pom.xml | 5 ++ .../component/oaipmh/it/MockOaipmhServer.java | 4 +- .../quarkus/component/oaipmh/it/OaipmhTest.java| 6 ++ .../src/test/resources/jettyKS/localhost.p12 | Bin 2533 -> 0 bytes
(camel-quarkus) branch main updated: Remove duplicated dependency from tests-support-kafka
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 6009c77310 Remove duplicated dependency from tests-support-kafka 6009c77310 is described below commit 6009c773107899d78c7ad519ccfe27a4200d9c8d Author: James Netherton AuthorDate: Fri May 31 09:40:06 2024 +0100 Remove duplicated dependency from tests-support-kafka --- integration-tests-support/kafka/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/integration-tests-support/kafka/pom.xml b/integration-tests-support/kafka/pom.xml index 1c6fa9f197..6ab332536b 100644 --- a/integration-tests-support/kafka/pom.xml +++ b/integration-tests-support/kafka/pom.xml @@ -52,10 +52,6 @@ io.quarkus quarkus-junit4-mock - -org.apache.camel.quarkus -camel-quarkus-integration-test-support -
(camel-quarkus) branch main updated: Add langchain4j-chat native support
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 349bbda855 Add langchain4j-chat native support 349bbda855 is described below commit 349bbda855316fe3a3ad1bfe936b2e3dd142cf58 Author: James Netherton AuthorDate: Fri May 31 07:47:19 2024 +0100 Add langchain4j-chat native support Fixes #6133 --- .../ROOT/examples/components/langchain4j-chat.yml | 6 ++-- .../reference/extensions/langchain4j-chat.adoc | 14 + extensions-jvm/pom.xml | 1 - .../langchain4j-chat/deployment/pom.xml| 4 +++ .../chat/deployment/LangChain4jChatProcessor.java | 23 +-- .../langchain4j-chat/pom.xml | 2 +- .../langchain4j-chat/runtime/pom.xml | 6 .../main/resources/META-INF/quarkus-extension.yaml | 3 +- extensions/pom.xml | 1 + integration-tests-jvm/pom.xml | 1 - .../langchain4j-chat/README.adoc | 2 +- .../langchain4j-chat/pom.xml | 33 -- .../langchain/chat/it/LangChain4jChatResource.java | 2 +- .../component/langchain/chat/it/OllamaRoute.java | 28 ++ .../src/main/resources/application.properties | 19 + .../langchain4j/chat/it/LangChain4jChatIT.java | 32 +++-- .../langchain4j/chat/it/LangChain4jChatTest.java | 4 +-- .../langchain4j}/chat/it/OllamaTestResource.java | 6 ++-- .../test/resources/mappings/multipleMessages.json | 0 .../src/test/resources/mappings/promptMessage.json | 0 .../src/test/resources/mappings/simpleMessage.json | 0 integration-tests/pom.xml | 1 + pom.xml| 3 +- poms/bom-test/pom.xml | 6 ++-- poms/bom/pom.xml | 16 +++ poms/bom/src/main/generated/flattened-full-pom.xml | 16 +++ .../src/main/generated/flattened-reduced-pom.xml | 16 +++ .../generated/flattened-reduced-verbose-pom.xml| 16 +++ tooling/scripts/test-categories.yaml | 1 + 29 files changed, 166 insertions(+), 96 deletions(-) diff --git a/docs/modules/ROOT/examples/components/langchain4j-chat.yml b/docs/modules/ROOT/examples/components/langchain4j-chat.yml index 555daacdc2..4396773ab2 100644 --- a/docs/modules/ROOT/examples/components/langchain4j-chat.yml +++ b/docs/modules/ROOT/examples/components/langchain4j-chat.yml @@ -2,11 +2,11 @@ # This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page cqArtifactId: camel-quarkus-langchain4j-chat cqArtifactIdBase: langchain4j-chat -cqNativeSupported: false -cqStatus: Preview +cqNativeSupported: true +cqStatus: Stable cqDeprecated: false cqJvmSince: 3.11.0 -cqNativeSince: n/a +cqNativeSince: 3.12.0 cqCamelPartName: langchain4j-chat cqCamelPartTitle: langChain4j Chat cqCamelPartDescription: LangChain4j Chat component diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc index e2be6969e6..855c43735a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc @@ -4,17 +4,17 @@ = langChain4j Chat :linkattrs: :cq-artifact-id: camel-quarkus-langchain4j-chat -:cq-native-supported: false -:cq-status: Preview -:cq-status-deprecation: Preview +:cq-native-supported: true +:cq-status: Experimental +:cq-status-deprecation: Experimental :cq-description: LangChain4j Chat component :cq-deprecated: false :cq-jvm-since: 3.11.0 -:cq-native-since: n/a +:cq-native-since: 3.12.0 ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##3.11.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##3.11.0## [.badge-key]##Native since##[.badge-supported]##3.12.0## endif::[] LangChain4j Chat component @@ -29,6 +29,10 @@ Please refer to the above link for usage and configuration details. [id="extensions-langchain4j-chat-maven-coordinates"] == Maven coordinates +https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-langchain4j-chat[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] + +Or add the coordinates to your existing project: + [source,xml] diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index b63b831c47..5f2471a6fc 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -78,7 +78,6 @@ jooq json-patch jsonapi -langchain4j-chat langchain4j-embe
(camel-quarkus) branch main updated: Additional test coverage for GraphQL extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 1914d91428 Additional test coverage for GraphQL extension 1914d91428 is described below commit 1914d914285a1e7d8332ae66e4ba0542ceb2edf3 Author: shravani AuthorDate: Fri May 31 13:59:40 2024 +0530 Additional test coverage for GraphQL extension --- integration-tests/graphql/pom.xml | 24 +++- .../component/graphql/it/BooksGraphQLResource.java | 52 .../component/graphql/it/GraphQLResource.java | 145 - .../component/graphql/it/GraphQLRouteBuilder.java | 41 ++ .../quarkus/component/graphql/it/model/Book.java | 24 ++-- .../src/main/resources/application.properties | 6 +- .../main/resources/graphql/addBookMutation.graphql | 7 + .../src/main/resources/graphql/bookQuery.graphql | 6 +- .../src/main/resources/graphql/schema.graphql | 25 ++-- ...aphQLTest.java => GraphQLAuthenticationIT.java} | 21 +-- ...hQLTest.java => GraphQLAuthenticationTest.java} | 16 ++- java => GraphQLAuthenticationTestProfile.java} | 30 ++--- .../quarkus/component/graphql/it/GraphQLTest.java | 77 ++- 13 files changed, 335 insertions(+), 139 deletions(-) diff --git a/integration-tests/graphql/pom.xml b/integration-tests/graphql/pom.xml index 54661f1e70..6a671bcc4f 100644 --- a/integration-tests/graphql/pom.xml +++ b/integration-tests/graphql/pom.xml @@ -39,9 +39,18 @@ io.quarkus quarkus-resteasy + +org.apache.camel.quarkus +camel-quarkus-direct + + io.quarkus -quarkus-vertx-graphql +quarkus-smallrye-graphql + + +io.quarkus +quarkus-elytron-security-properties-file @@ -95,6 +104,19 @@ + +org.apache.camel.quarkus +camel-quarkus-direct-deployment +${project.version} +pom +test + + +* +* + + + org.apache.camel.quarkus camel-quarkus-graphql-deployment diff --git a/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/BooksGraphQLResource.java b/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/BooksGraphQLResource.java new file mode 100644 index 00..e5dc6aba7f --- /dev/null +++ b/integration-tests/graphql/src/main/java/org/apache/camel/quarkus/component/graphql/it/BooksGraphQLResource.java @@ -0,0 +1,52 @@ +/* + * 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.component.graphql.it; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.enterprise.context.ApplicationScoped; +import org.apache.camel.quarkus.component.graphql.it.model.Book; +import org.eclipse.microprofile.graphql.GraphQLApi; +import org.eclipse.microprofile.graphql.Mutation; +import org.eclipse.microprofile.graphql.Query; + +@GraphQLApi +@ApplicationScoped +public class BooksGraphQLResource { +private static final List BOOKS = new ArrayList<>(List.of( +new Book(1, "Harry Potter and the Philosophers Stone", "J.K Rowling"), +new Book(2, "Moby Dick", "Herman Melville"), +new Book(3, "Interview with the vampire", "Anne Rice"))); + +@Query +public List getBooks() { +return BOOKS; +} + +@Query +public Book getBookById(int id) { +return BOOKS.stream().filter(book -> book.getId() == id).findFirst().orElse(null); +} + +@Mutation +public Book addBook(Book bookInput) { +Book book =
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-fd8f7f320a deleted (was 150d986)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-fd8f7f320a in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 150d986 Bump the maven group across 21 directories with 1 update The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch camel-quarkus-main updated: Bump net.revelc.code.formatter:formatter-maven-plugin from 2.23.0 to 2.24.0
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new 37ada85 Bump net.revelc.code.formatter:formatter-maven-plugin from 2.23.0 to 2.24.0 37ada85 is described below commit 37ada858fa89ecbfbe6861fa05d692c66cfaa878 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 31 07:08:39 2024 +0100 Bump net.revelc.code.formatter:formatter-maven-plugin from 2.23.0 to 2.24.0 Bumps the maven group with 1 update in the /aws-lambda directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /cluster-leader-election directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /cxf-soap directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /file-bindy-ftp directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /file-split-log-xml directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /health directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /http-log directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jdbc-datasource directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jms-jpa directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jpa-idempotent-repository directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /jta-jpa directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /kafka directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /kamelet-chucknorris directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /message-bridge directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /observability directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /platform-http-security-keycloak directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /rest-json directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /timer-log directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /timer-log-kotlin directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /timer-log-main directory: net.revelc.code.formatter:formatter-maven-plugin. Bumps the maven group with 1 update in the /vertx-websocket-chat directory: net.revelc.code.formatter:formatter-maven-plugin. Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-plugin` from 2.23.0 to 2.24.0 Updates `net.revelc.code.formatter:formatter-maven-
(camel-website) branch main updated: Camel Quarkus 3.11.0 announcement blog post
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new b88a2056 Camel Quarkus 3.11.0 announcement blog post b88a2056 is described below commit b88a2056c5e335601dfc5999e851dc35d94214ff Author: James Netherton AuthorDate: Thu May 30 13:40:56 2024 +0100 Camel Quarkus 3.11.0 announcement blog post --- .../camel-featured.jpeg| Bin 0 -> 625206 bytes .../2024/05/camel-quarkus-release-3.11.0/index.md | 24 + content/releases/q/release-3.11.0.md | 12 +++ 3 files changed, 36 insertions(+) diff --git a/content/blog/2024/05/camel-quarkus-release-3.11.0/camel-featured.jpeg b/content/blog/2024/05/camel-quarkus-release-3.11.0/camel-featured.jpeg new file mode 100644 index ..36c23a02 Binary files /dev/null and b/content/blog/2024/05/camel-quarkus-release-3.11.0/camel-featured.jpeg differ diff --git a/content/blog/2024/05/camel-quarkus-release-3.11.0/index.md b/content/blog/2024/05/camel-quarkus-release-3.11.0/index.md new file mode 100644 index ..10b43f6c --- /dev/null +++ b/content/blog/2024/05/camel-quarkus-release-3.11.0/index.md @@ -0,0 +1,24 @@ +--- +title: "Camel Quarkus 3.11.0 Released" +date: 2024-05-30 +authors: ["jamesnetherton"] +categories: ["Releases", "Camel Quarkus"] +preview: "Camel Quarkus 3.11.0 Released" +summary: "Camel Quarkus 3.11.0 release" +--- + +Image by https://www.flickr.com/photos/lanzen/5984113332;>Anders Lanzen https://creativecommons.org/licenses/by-nc-sa/2.0;>CC BY-NC-SA 2.0 + +We are pleased to announce the 3.11.0 release of Camel Quarkus. + +Camel Quarkus 3.11.0 aligns with Camel 4.6.0 and Quarkus 3.11.0 releases. + +For more information, please check the [Release notes](/releases/q-3.11.0/). + +## Camel 4.6.0 + +Please refer to the [Camel 4.6.0 release announcement](/blog/2024/05/RELEASE-4.6.0/) for more details. + +## Quarkus 3.11.0 + +Please refer to the [Quarkus 3.11.0 release announcement](https://quarkus.io/blog/quarkus-3-11-0-released/) for more details. diff --git a/content/releases/q/release-3.11.0.md b/content/releases/q/release-3.11.0.md new file mode 100644 index ..0df60472 --- /dev/null +++ b/content/releases/q/release-3.11.0.md @@ -0,0 +1,12 @@ +--- +url: "/releases/q-3.11.0/" +date: 2024-05-30 +type: release-note +version: 3.11.0 +title: "Camel Quarkus release 3.11.0" +preview: "" +changelog: "" +category: "camel-quarkus" +milestone: 58 +jdk: [17, 21] +---
(camel-quarkus-examples) tag 3.11.0 created (now cb82081)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to tag 3.11.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git at cb82081 (commit) No new revisions were added by this update.
(camel-quarkus-examples) branch main updated: Tag 3.11.0
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/main by this push: new cb82081 Tag 3.11.0 cb82081 is described below commit cb82081fffe8def8a86ab799476e9fe7e5e0536d Author: James Netherton AuthorDate: Thu May 30 15:26:59 2024 +0100 Tag 3.11.0 --- aws-lambda/pom.xml | 2 +- cluster-leader-election/pom.xml| 2 +- cxf-soap/pom.xml | 2 +- file-bindy-ftp/pom.xml | 2 +- file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 ++-- file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 ++-- file-split-log-xml/pom.xml | 2 +- health/pom.xml | 2 +- http-log/pom.xml | 2 +- jdbc-datasource/pom.xml| 2 +- jms-jpa/pom.xml| 2 +- jpa-idempotent-repository/pom.xml | 2 +- .../src/main/kubernetes/kubernetes.yml | 12 ++-- .../src/main/kubernetes/openshift.yml | 14 +++--- jta-jpa/pom.xml| 2 +- kafka/pom.xml | 2 +- kamelet-chucknorris/pom.xml| 2 +- message-bridge/pom.xml | 2 +- observability/pom.xml | 2 +- openapi-contract-first/pom.xml | 2 +- platform-http-security-keycloak/pom.xml| 2 +- rest-json/pom.xml | 2 +- timer-log-kotlin/pom.xml | 2 +- timer-log-main/pom.xml | 2 +- timer-log/pom.xml | 2 +- vertx-websocket-chat/pom.xml | 2 +- 26 files changed, 47 insertions(+), 47 deletions(-) diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml index 40061c4..2c8c5f4 100644 --- a/aws-lambda/pom.xml +++ b/aws-lambda/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.apache.camel.quarkus.examples camel-quarkus-examples-aws-lambda -3.11.0-SNAPSHOT +3.11.0 Camel Quarkus :: Examples :: AWS Lambda Camel Quarkus Example :: Deploying a Camel Route in AWS Lambda diff --git a/cluster-leader-election/pom.xml b/cluster-leader-election/pom.xml index c08823f..b2c618a 100644 --- a/cluster-leader-election/pom.xml +++ b/cluster-leader-election/pom.xml @@ -23,7 +23,7 @@ camel-quarkus-examples-cluster-leader-election org.apache.camel.quarkus.examples -3.11.0-SNAPSHOT +3.11.0 Camel Quarkus :: Examples :: Cluster leader election Camel Quarkus Example :: Cluster leader election diff --git a/cxf-soap/pom.xml b/cxf-soap/pom.xml index cde9539..949d7e1 100644 --- a/cxf-soap/pom.xml +++ b/cxf-soap/pom.xml @@ -23,7 +23,7 @@ camel-quarkus-examples-cxf-soap org.apache.camel.quarkus.examples -3.11.0-SNAPSHOT +3.11.0 Camel Quarkus :: Examples :: CXF SOAP Camel Quarkus Example :: CXF SOAP diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml index 841aabf..8a90b46 100644 --- a/file-bindy-ftp/pom.xml +++ b/file-bindy-ftp/pom.xml @@ -22,7 +22,7 @@ camel-quarkus-examples-file-bindy-ftp org.apache.camel.quarkus.examples -3.11.0-SNAPSHOT +3.11.0 Camel Quarkus :: Examples :: File Bindy FTP Camel Quarkus Example :: File Bindy FTP diff --git a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml index 4b8e77c..ce940c8 100644 --- a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml +++ b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml @@ -21,18 +21,18 @@ metadata: name: ssh-server-deployment labels: app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp -app.kubernetes.io/version: 3.11.0-SNAPSHOT +app.kubernetes.io/version: 3.11.0 spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp - app.kubernetes.io/version: 3.11.0-SNAPSHOT + app.kubernetes.io/version: 3.11.0 template: metadata: labels: app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp -app.kubernetes.io/version: 3.11.0-SNAPSHOT +app.kubernetes.io/version: 3.11.0 spec: containers: - name: openssh-server @@ -57,7 +57,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: camel-quarkus-examples-file-bindy-ftp -app.kubernetes.io/version: 3.11.0
(camel-quarkus) branch main updated: MySql test does not work on FIPS enabled system - native
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new da83f0dd42 MySql test does not work on FIPS enabled system - native da83f0dd42 is described below commit da83f0dd42ca3d125e4e549c26d20b9e48c4d622 Author: JiriOndrusek AuthorDate: Thu May 30 13:20:07 2024 +0200 MySql test does not work on FIPS enabled system - native --- .../camel/quarkus/component/jdbc/mysql/Sha256FIPSPasswordPlugin.java| 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-test-groups/jdbc/mysql/src/main/java/org/apache/camel/quarkus/component/jdbc/mysql/Sha256FIPSPasswordPlugin.java b/integration-test-groups/jdbc/mysql/src/main/java/org/apache/camel/quarkus/component/jdbc/mysql/Sha256FIPSPasswordPlugin.java index 58d3977f5f..70da05c5ad 100644 --- a/integration-test-groups/jdbc/mysql/src/main/java/org/apache/camel/quarkus/component/jdbc/mysql/Sha256FIPSPasswordPlugin.java +++ b/integration-test-groups/jdbc/mysql/src/main/java/org/apache/camel/quarkus/component/jdbc/mysql/Sha256FIPSPasswordPlugin.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.component.jdbc.mysql; import com.mysql.cj.protocol.a.authentication.Sha256PasswordPlugin; +import io.quarkus.runtime.annotations.RegisterForReflection; +@RegisterForReflection public class Sha256FIPSPasswordPlugin extends Sha256PasswordPlugin { public Sha256FIPSPasswordPlugin() {
(camel-quarkus-examples) branch camel-quarkus-main updated: Upgrade to Quarkus Platform 3.11.0
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new a7302e5 Upgrade to Quarkus Platform 3.11.0 a7302e5 is described below commit a7302e55d75263e8726bcac79e81087e476c08b7 Author: James Netherton AuthorDate: Thu May 30 13:30:43 2024 +0100 Upgrade to Quarkus Platform 3.11.0 --- aws-lambda/pom.xml | 8 cluster-leader-election/pom.xml | 8 cxf-soap/pom.xml| 8 file-bindy-ftp/pom.xml | 8 file-split-log-xml/pom.xml | 8 health/pom.xml | 8 http-log/pom.xml| 8 jdbc-datasource/pom.xml | 8 jms-jpa/pom.xml | 8 jpa-idempotent-repository/pom.xml | 8 jta-jpa/pom.xml | 8 kafka/pom.xml | 8 kamelet-chucknorris/pom.xml | 10 +- message-bridge/pom.xml | 8 observability/pom.xml | 8 openapi-contract-first/pom.xml | 8 platform-http-security-keycloak/pom.xml | 8 rest-json/pom.xml | 8 timer-log-kotlin/pom.xml| 8 timer-log-main/pom.xml | 10 +- timer-log/pom.xml | 8 vertx-websocket-chat/pom.xml| 8 22 files changed, 90 insertions(+), 90 deletions(-) diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml index a19f431..40061c4 100644 --- a/aws-lambda/pom.xml +++ b/aws-lambda/pom.xml @@ -28,12 +28,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus + io.quarkus.platform quarkus-bom - org.apache.camel.quarkus - camel-quarkus-bom + ${quarkus.platform.group-id} + quarkus-camel-bom UTF-8 UTF-8 diff --git a/cluster-leader-election/pom.xml b/cluster-leader-election/pom.xml index 13fed77..c08823f 100644 --- a/cluster-leader-election/pom.xml +++ b/cluster-leader-election/pom.xml @@ -30,12 +30,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus + io.quarkus.platform quarkus-bom - org.apache.camel.quarkus - camel-quarkus-bom + ${quarkus.platform.group-id} + quarkus-camel-bom UTF-8 UTF-8 diff --git a/cxf-soap/pom.xml b/cxf-soap/pom.xml index e24092a..cde9539 100644 --- a/cxf-soap/pom.xml +++ b/cxf-soap/pom.xml @@ -30,12 +30,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus + io.quarkus.platform quarkus-bom - org.apache.camel.quarkus - camel-quarkus-bom + ${quarkus.platform.group-id} + quarkus-camel-bom UTF-8 UTF-8 diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml index 4e11aa9..841aabf 100644 --- a/file-bindy-ftp/pom.xml +++ b/file-bindy-ftp/pom.xml @@ -29,12 +29,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus + io.quarkus.platform quarkus-bom - org.apache.camel.quarkus - camel-quarkus-bom + ${quarkus.platform.group-id} + quarkus-camel-bom UTF-8 UTF-8 diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml index 852cdd4..b21c64d 100644 --- a/file-split-log-xml/pom.xml +++ b/file-split-log-xml/pom.xml @@ -29,12 +29,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus + io.quarkus.platform quarkus-bom - org.apache.camel.quarkus - camel-quarkus-bom + ${quarkus.platform.group-id} + quarkus-camel-bom UTF-8 UTF-8 diff --git a/health/pom.xml b/health/pom.xml index fbc24e2..bc4030b 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -29,12 +29,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus + io.quarkus.platform quarkus-bom - org.apache.camel.quarkus - camel-quarkus-bom + ${quarkus.platform.group-id} + quarkus-camel-bom UTF-8 UTF-8 diff --git a/http-log/pom.xml b/http-log/pom.xml index 02fb638..0f6b854 100644 --- a/http-log/pom.xml +++ b/http-log/pom.xml @@ -29,12 +29,12 @@ 3.11.0 - 3.11.0-SNAPSHOT + ${quarkus.platform.version} -io.quarkus
svn commit: r69468 [1/5] - in /release/camel/camel-quarkus: 3.10.0/ 3.11.0/
Author: jamesnetherton Date: Thu May 30 12:44:13 2024 New Revision: 69468 Log: Apache Camel Quarkus 3.11.0 released artifacts Added: release/camel/camel-quarkus/3.11.0/ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip (with props) release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 Removed: release/camel/camel-quarkus/3.10.0/
svn commit: r69468 [3/5] - in /release/camel/camel-quarkus: 3.10.0/ 3.11.0/
Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc Thu May 30 12:44:13 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEELpIRMmP8McdMy6qyDpHC3kO3K7EFAmZQE5MACgkQDpHC3kO3 +K7FpjQf/XC5badF4ElZMRW5Vt5BSysZKjHZGJauuFj5lfZ5FNZ7NRft1JhQynks+ +838l0W5XIUN/Cj4sGEu0l9snOcW1g1rZd3Zh76gG1/SBTSC5LXkZhehg8PZrS1iF +JvVvM9tDK7tTU1f24j9e5A730yc/FTlHIXL/OiJ0fxQRsGQFw8PPQRakOlhLFt2M +3N49GiTKaxi2IKFRJy6yPYY13iAi54k3TzElN/5pvGfTQ+CnkyBzivgQytk9qXIq +4iDU/Sg7qkpI9cUuraWJw+vcjDt/YbZIvXjxJh7kFnLBCE/9efhO7B1TcKVn+Dw+ +UprLkvClZ2zn9rkEbLh1KHOv1grzbg== +=TaDG +-END PGP SIGNATURE- Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 Thu May 30 12:44:13 2024 @@ -0,0 +1 @@ +5be69a35ed2645b1d9f6dda417176953b3f300c6df1fd3334c22f2b1215f431002e01a14b00c36888f76eb5f762b10717c5cee492e3af11d11767973909f21ff apache-camel-quarkus-3.11.0-sbom.json
svn commit: r69468 [4/5] - in /release/camel/camel-quarkus: 3.10.0/ 3.11.0/
Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml Thu May 30 12:44:13 2024 @@ -0,0 +1,93725 @@ + +http://cyclonedx.org/schema/bom/1.5;> + + + +build + + + + +OWASP Foundation +CycloneDX Maven plugin +2.8.0 + + 76ffec6a7ddd46b2b24517411874eb99 + 5b0d5b41975b53be4799b9621b4af0cfc41d44b6 + 6852aa0f4e42a2db745bab80e384951a6a65b9215d041081d675780999027e81 + 417de20fcdcb11c9713bacbd57290d8e68037fdb4553fd31b8cb08bd760ad52dc65ea88ad4be15844ad3fd5a4d3e440d2f70326f2fe1e63ec78e059c9a883f8d + 5eb755c6492e7a7385fa9a1e1f4517875bcb834b2df437808a37a2d6f5285df428741762305980315a63fcef1406597d + 0fe16a47cf7aab0b22251dafcc39939b68e8f1778093309d8d2060b51a08df445a8b8ed5a9561669faf2e55f907c76d8 + 3e5a1eb5ab7d0797498862794709ff8eaaa071fe4cc9ec77f52db7e2f97ef487 + 59281a3e29e76270d7f44b40b5b9f05e55f1ae3ec716d80add806f360940809e3813998ac7c5758043b8e248aed73b86e37dc506cdb4cde03c16bb617d8e5a3a + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.11.0?type=pom + http://camel.apache.orghttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus + + + makeAggregateBom + compile,provided,runtime,system + enabled + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-poms + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-pomshttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bomhttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom-test + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom-test@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bom-testhttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom-test + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent + 3.11.0 + Maven plugins configuration + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-build-parenthttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-build-parent + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent-it + 3.11.0 + Maven plugins configuration for Integration Tests + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent-it@3.11.0?type=pom +
svn commit: r69468 [2/5] - in /release/camel/camel-quarkus: 3.10.0/ 3.11.0/
Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json Thu May 30 12:44:13 2024 @@ -0,0 +1,232646 @@ +{ + "bomFormat" : "CycloneDX", + "specVersion" : "1.5", + "serialNumber" : "urn:uuid:7934f5ca-a594-3274-9004-3e2253b730e0", + "version" : 1, + "metadata" : { +"lifecycles" : [ + { +"phase" : "build" + } +], +"tools" : [ + { +"vendor" : "OWASP Foundation", +"name" : "CycloneDX Maven plugin", +"version" : "2.8.0", +"hashes" : [ + { +"alg" : "MD5", +"content" : "76ffec6a7ddd46b2b24517411874eb99" + }, + { +"alg" : "SHA-1", +"content" : "5b0d5b41975b53be4799b9621b4af0cfc41d44b6" + }, + { +"alg" : "SHA-256", +"content" : "6852aa0f4e42a2db745bab80e384951a6a65b9215d041081d675780999027e81" + }, + { +"alg" : "SHA-512", +"content" : "417de20fcdcb11c9713bacbd57290d8e68037fdb4553fd31b8cb08bd760ad52dc65ea88ad4be15844ad3fd5a4d3e440d2f70326f2fe1e63ec78e059c9a883f8d" + }, + { +"alg" : "SHA-384", +"content" : "5eb755c6492e7a7385fa9a1e1f4517875bcb834b2df437808a37a2d6f5285df428741762305980315a63fcef1406597d" + }, + { +"alg" : "SHA3-384", +"content" : "0fe16a47cf7aab0b22251dafcc39939b68e8f1778093309d8d2060b51a08df445a8b8ed5a9561669faf2e55f907c76d8" + }, + { +"alg" : "SHA3-256", +"content" : "3e5a1eb5ab7d0797498862794709ff8eaaa071fe4cc9ec77f52db7e2f97ef487" + }, + { +"alg" : "SHA3-512", +"content" : "59281a3e29e76270d7f44b40b5b9f05e55f1ae3ec716d80add806f360940809e3813998ac7c5758043b8e248aed73b86e37dc506cdb4cde03c16bb617d8e5a3a" + } +] + } +], +"component" : { + "publisher" : "The Apache Software Foundation", + "group" : "org.apache.camel.quarkus", + "name" : "camel-quarkus", + "version" : "3.11.0", + "description" : "Apache Camel extensions for Quarkus", + "licenses" : [ +{ + "license" : { +"id" : "Apache-2.0", +"url" : "https://www.apache.org/licenses/LICENSE-2.0; + } +} + ], + "purl" : "pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.11.0?type=pom", + "externalReferences" : [ +{ + "type" : "website", + "url" : "http://camel.apache.org; +}, +{ + "type" : "distribution-intake", + "url" : "https://repository.apache.org/service/local/staging/deploy/maven2; +}, +{ + "type" : "issue-tracker", + "url" : "https://github.com/apache/camel-quarkus/issues; +}, +{ + "type" : "mailing-list", + "url" : "dev-subscr...@camel.apache.org" +}, +{ + "type" : "vcs", + "url" : "https://github.com/apache/camel-quarkus; +} + ], + "type" : "library", + "bom-ref" : "pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.11.0?type=pom" +}, +"properties" : [ + { +"name" : "maven.goal", +"value" : "makeAggregateBom" + }, + { +"name" : "maven.scopes", +"value" : "compile,provided,runtime,system" + }, + { +"name" : "cdx:reproducible", +"value" : "enabled" + } +] + }, + "components" : [ +{ + "publisher" : "The Apache Software Foundation", + "group" : "org.apache.camel.quarkus", + "name" : "camel-quarkus-poms", + "version" : "3.11.0", + "description" : "Apache Camel extensions for Quarkus", + "licenses" : [ +{ + "license" : { +"id" : "Apache-2.0", +"url" : "https://www.apache.org/licenses/LICENSE-2.0; + } +} + ], + "purl" : "pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.11.0?type=pom", + "externalReferences" : [ +{ + "type" : "website", + "url" : "http://camel.apache.org/camel-quarkus-poms; +}, +{ + "type" : "distribution-intake", + "url" : "https://repository.apache.org/service/local/staging/deploy/maven2; +}, +{ + "type" : "issue-tracker", + "url" : "https://github.com/apache/camel-quarkus/issues; +}, +{ + "type" : "mailing-list", + "url" : "dev-subscr...@camel.apache.org" +}, +{ + "type" : "vcs", + "url" : "https://github.com/apache/camel-quarkus/camel-quarkus-poms; +} + ], + "type" : "library",
svn commit: r69468 [5/5] - in /release/camel/camel-quarkus: 3.10.0/ 3.11.0/
Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc Thu May 30 12:44:13 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEELpIRMmP8McdMy6qyDpHC3kO3K7EFAmZQE5MACgkQDpHC3kO3 +K7GrTwf/eHng7n/SEOv78HUqkX21bMRmoC5VXTgSGlPkHEUxiMDsGOazFWsXJF5z +W+y/YMny8hvUxlJZFuw3oi46Suc8HdRVzVl6aJLrBj7VZ+c6VZgGKuemw5TNtgCs +RBiMuMILMeM+gww+vRO/lADicWuIcY78w2TPdbhQnGlHveL/iDvfelED7cS8EOQL +M4g0JcBDd+YrSrk9uvtpO3XZzvv78tujzK7+eXV3FTxIXLOZxmTgaaMWVi0aqKMi +DAvfukYBLJiAz0rZ0m5diqRKy2YSuTansktmLFLAm7pzsQSRIrq9x59iIuVShp4n +0HH1MAeHoMQUVxcB/b4b7SuU0zrhdw== +=8eR3 +-END PGP SIGNATURE- Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 Thu May 30 12:44:13 2024 @@ -0,0 +1 @@ +ec0c0b5f87d8d3266cb0f5315662c482b5926c9879baa2d44a99026a807925a2cd98e3cf0725ec08141545068e8dd1f40b3d596b3baee474e72a06c83141ef34 apache-camel-quarkus-3.11.0-sbom.xml Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip == Binary file - no diff available. Propchange: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip -- svn:mime-type = application/octet-stream Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc Thu May 30 12:44:13 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEELpIRMmP8McdMy6qyDpHC3kO3K7EFAmZQE5MACgkQDpHC3kO3 +K7EWHgf/WwEBO0cE8ShtNvxxgs7GLGnNcMhpb69EY8ket34M57mMylj5N+uW2muS +UW7AgLl6MGk4uveM2BZTefc/z1kIXvV41/DhTMtaqZ+yq1y8DjBd2O8cr7iT4RIT +4uTTIlgxwBvPKCFE1VEixxyIRVpq/VvNi5E3KF5UIWf8X7RT3+sHdZ7Td1oJeqAV +H4l3wjyMYO14TEhsle/+hKg6I0Vu98nP4chhvcIA7Yxn+I/EvHDD4I7obS3dv3bt +oBUeAP5lI9tTtUzBrRCFhoghNHv8aizKl/lUdHs0zegr09/fBjCl9VKoW2Lcvkfh +UjOUFcPyfhV0FB4FUH5za8TKXjsViQ== +=yfFz +-END PGP SIGNATURE- Added: release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 == --- release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 (added) +++ release/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 Thu May 30 12:44:13 2024 @@ -0,0 +1 @@ +9dcaf08d7a57721216ddd4b46963c9786c04bfb073a0a0abe0f88587530e4716cdf77958bc798ad6c18bbb256f99692855a5067a09df124e978dc901687d4b1a apache-camel-quarkus-3.11.0-src.zip
(camel-quarkus) branch main updated: Use more robust type check in test report action for test case names
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new abcb87176d Use more robust type check in test report action for test case names abcb87176d is described below commit abcb87176d08ad9becdbecc75044e35fb769daea Author: James Netherton AuthorDate: Wed May 29 13:53:01 2024 +0100 Use more robust type check in test report action for test case names --- .github/actions/test-summary-report/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test-summary-report/action.yaml b/.github/actions/test-summary-report/action.yaml index abf4a356d6..118fc3024c 100644 --- a/.github/actions/test-summary-report/action.yaml +++ b/.github/actions/test-summary-report/action.yaml @@ -69,7 +69,7 @@ runs: const details = `View\n${failure[0].inner}`; let testName = ""; -if (testCase.name !== undefined && testCase.name.trim().length > 0) { +if ((typeof testCase.name === 'string' || testCase.name instanceof String) && (testCase.name.trim().length > 0)) { testName = `${testCase.name}`; if (testCase.name.trim().length > 25) { testName = `View\n${testCase.name}`;
(camel-quarkus) branch main updated: Remove unused version properties
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new bf388f0c93 Remove unused version properties bf388f0c93 is described below commit bf388f0c93612f20432183d6705268e87efc5f2b Author: James Netherton AuthorDate: Wed May 29 07:48:37 2024 +0100 Remove unused version properties --- pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 70460ceac7..f2ca9cf979 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,6 @@ 2.12.3 ${angus-mail-version} -1.18 3.5.2 ${yetus-audience-annotations-version} 1.11.3 @@ -114,7 +113,6 @@ ${icu4j-version} 2.9.3 ${influx-java-driver-version} -2.17.1 ${jakarta-jms-api-version} ${json-patch-version} ${jodatime2-version} @@ -146,7 +144,6 @@ 3.6.0 0.31.0 0.26.0 -3.25.0 3.4.36 ${reactor-netty-version} 2.9.0 @@ -163,7 +160,6 @@ 1.6.0 2.7.2 ${web3j-version} ${web3j-quorum-version} @@ -199,7 +195,6 @@ 3.6.0 3.2.0 3.11.0 - 3.5.0 3.1.1 3.0.0-M3 3.1.0
(camel-quarkus-examples) branch dependabot/maven/message-bridge/camel-quarkus-main/org.assertj-assertj-core-3.26.0 deleted (was 61e074b)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/message-bridge/camel-quarkus-main/org.assertj-assertj-core-3.26.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 61e074b Bump org.assertj:assertj-core from 3.25.3 to 3.26.0 in /message-bridge The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/net.revelc.code-impsort-maven-plugin-1.10.0 deleted (was 0b73f19)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/net.revelc.code-impsort-maven-plugin-1.10.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 0b73f19 Bump net.revelc.code:impsort-maven-plugin in /aws-lambda The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch camel-quarkus-main updated: Bump the maven group across 21 directories with 4 updates
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new 4560887 Bump the maven group across 21 directories with 4 updates 4560887 is described below commit 45608874eab5ebb5209f9dd0eea8e2055f2aac1d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 27 19:52:16 2024 + Bump the maven group across 21 directories with 4 updates Bumps the maven group with 1 update in the /aws-lambda directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /cluster-leader-election directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /cxf-soap directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /file-bindy-ftp directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /file-split-log-xml directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /health directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /http-log directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jdbc-datasource directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jms-jpa directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jpa-idempotent-repository directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jta-jpa directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /kafka directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /kamelet-chucknorris directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 2 updates in the /message-bridge directory: net.revelc.code:impsort-maven-plugin and [org.assertj:assertj-core](https://github.com/assertj/assertj). Bumps the maven group with 1 update in the /observability directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /platform-http-security-keycloak directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /rest-json directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /timer-log directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 3 updates in the /timer-log-kotlin directory: net.revelc.code:impsort-maven-plugin, org.jetbrains.kotlin:kotlin-maven-allopen and org.jetbrains.kotlin:kotlin-maven-plugin. Bumps the maven group with 1 update in the /timer-log-main directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /vertx-websocket-chat directory: net.revelc.code:impsort-maven-plugin. Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `org.assertj:assertj-core` from 3.25.3 to 3.26.0 - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.0) Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 1.9.24 to 2.0.0 Updates `org.jetbrains.kotlin:kotlin
(camel-quarkus) 01/01: Upgrade Quarkus to 3.12.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f8276dba1afcfd753c54d8541134435ccc187d53 Author: James Netherton AuthorDate: Tue May 28 08:42:16 2024 +0100 Upgrade Quarkus to 3.12.0.CR1 --- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 70460ceac7..58ef7b271e 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 -1.63.0 +1.64.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -132,7 +132,7 @@ 2.5.0 3.7.0 ${kudu-version} -1.9.23 +2.0.0 2.24.0 ${langchain4j-version} ${mapstruct-version} diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 2c2663cceb..614c307168 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6986,17 +6986,17 @@ org.jetbrains.kotlin kotlin-script-util -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.jolokia diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 3e201f507a..34c0493979 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6926,12 +6926,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject 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 f356208543..a96b9de512 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6926,12 +6926,12 @@ org.jetbrains.kotlin kotlin-scripting-jvm -1.9.23 +2.0.0 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.9.23 +2.0.0 org.kiwiproject
(camel-quarkus) branch quarkus-main updated (ec7aae7700 -> f8276dba1a)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard ec7aae7700 Upgrade Quarkus to 3.12.0.CR1 add ae5a010870 --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... add 3ddfa549f3 Add contract first development section in rest-openapi doc (#6115) add 1de918f30a Kafka tests in fips add 07972593de Upgrade Quarkus to 3.11.0 add 21f2f49cf1 Add me.escoffier.certs:certificate-generator-junit5 to dependabot config add 96a758b666 Remove broken link that causes website to fail add 228ea1fec9 Fixup 3ddfa549f3 Add contract first development section in rest-openapi doc (#6115) add bce51ca301 Upgrade to Quarkus CXF 3.11.0 add a8f4527157 --- updated-dependencies: - dependency-name: me.escoffier.certs:certificate-generator-junit5 dependency-type: direct:production update-type: version-update:semver-minor ... add c134fe4e46 Remove broken link that causes website to fail add 825571eb93 Regen SBOM from commit c134fe4e4698e51c0b78876317079b1c8402f2ff (#6120) add 852f4a31a7 Fixup rest-openapi doc add c4ee52f1fb Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 (#6122) add 248e869ce1 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.15.0 to 2.16.0 add a5f192e43d Upgrade azure-core-http-vertx to 1.0.0-beta.18 add 3bb76199e6 Add com.azure:azure-core-http-vertx to Dependabot config add 9eddcf5ed9 Remove hard coded version from langchain4j-ollama new f8276dba1a Upgrade Quarkus to 3.12.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ec7aae7700) \ N -- N -- N refs/heads/quarkus-main (f8276dba1a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/dependabot.yml | 2 + camel-quarkus-sbom/camel-quarkus-sbom.json | 14441 +++ camel-quarkus-sbom/camel-quarkus-sbom.xml | 13331 + docs/antora.yml| 2 +- .../pages/reference/extensions/rest-openapi.adoc |51 + .../rest-openapi/runtime/src/main/doc/usage.adoc |52 +- .../cxf/way/TrustHelloServiceCxfWayImpl.java | 2 +- .../{kafka => certificate-generator}/pom.xml |20 +- .../TestCertificateGenerationExtension.java| 127 + .../support/certificate/TestCertificates.java} |38 +- integration-tests-support/kafka/pom.xml| 4 + .../test/support/kafka/KafkaTestResource.java |78 +- .../test/support/kafka/KafkaTestSupport.java |37 - .../kafka/src/main/resources/log4j.properties | 7 +- integration-tests-support/pom.xml | 1 + .../quarkus/test/DisabledIfFipsModeCondition.java | 2 +- .../quarkus/test/EnabledIfFipsModeCondition.java |29 +- ...dIfFipsModeCondition.java => FipsModeUtil.java} |40 +- integration-tests/kafka-sasl-ssl/pom.xml | 5 + .../camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 7 + .../kafka/sasl/KafkaSaslSslTestResource.java |76 +- .../test/resources/config/generate-certificates.sh |39 - .../src/test/resources/config/kafka-keystore.p12 | Bin 2451 -> 0 bytes .../src/test/resources/config/kafka-truststore.p12 | Bin 1010 -> 0 bytes .../test/resources/config/kafka_server_jaas.conf | 5 +- .../quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 + integration-tests/kafka-ssl/pom.xml| 5 + .../camel/quarkus/kafka/ssl/KafkaSslTest.java |10 + .../quarkus/kafka/ssl/KafkaSslTestResource.java|74 +- .../test/resources/config/generate-certificates.sh |39 - .../src/test/resources/config/kafka-keystore.p12 | Bin 2451 -> 0 bytes .../src/test/resources/config/kafka-truststore.p12 | Bin 1010 -> 0 bytes pom.xml|16 +- poms/bom-test/pom.xml
(camel-quarkus) branch main updated: Remove hard coded version from langchain4j-ollama
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 9eddcf5ed9 Remove hard coded version from langchain4j-ollama 9eddcf5ed9 is described below commit 9eddcf5ed944b6c5fb39fda65355681657087844 Author: James Netherton AuthorDate: Tue May 28 14:10:24 2024 +0100 Remove hard coded version from langchain4j-ollama --- pom.xml | 1 + poms/bom-test/pom.xml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 148f6e58c1..70460ceac7 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,7 @@ ${kudu-version} 1.9.23 2.24.0 +${langchain4j-version} ${mapstruct-version} 8.5.7 1.15.0 diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index 908cbe12a0..6f48231d54 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -73,8 +73,7 @@ dev.langchain4j langchain4j-ollama - -0.30.0 +${langchain4j.version} io.quarkiverse.micrometer.registry
(camel-quarkus) 01/02: Upgrade azure-core-http-vertx to 1.0.0-beta.18
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a5f192e43d0adbe01cf17fd95ee002bf127fa918 Author: James Netherton AuthorDate: Tue May 28 08:15:38 2024 +0100 Upgrade azure-core-http-vertx to 1.0.0-beta.18 --- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 13ca2c18b6..148f6e58c1 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ ${azure-sdk-bom-version} 1.48.0 1.12.0 - 1.0.0-beta.3 + 1.0.0-beta.18 3.7.1 1.78.1 1.78 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9788588ff2..2c2663cceb 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6315,7 +6315,7 @@ com.azure azure-core-http-vertx -1.0.0-beta.3 +1.0.0-beta.18 com.esotericsoftware.kryo diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index c4ba5dd14e..3e201f507a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6315,7 +6315,7 @@ com.azure azure-core-http-vertx -1.0.0-beta.3 +1.0.0-beta.18 com.esotericsoftware.kryo 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 169974e84a..f356208543 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6315,7 +6315,7 @@ com.azure azure-core-http-vertx -1.0.0-beta.3 +1.0.0-beta.18 com.esotericsoftware.kryo
(camel-quarkus) branch main updated (248e869ce1 -> 3bb76199e6)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 248e869ce1 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.15.0 to 2.16.0 new a5f192e43d Upgrade azure-core-http-vertx to 1.0.0-beta.18 new 3bb76199e6 Add com.azure:azure-core-http-vertx to Dependabot config The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/dependabot.yml| 1 + pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-)
(camel-quarkus) 02/02: Add com.azure:azure-core-http-vertx to Dependabot config
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3bb76199e6e02cf3b49679582117ff02475009c1 Author: James Netherton AuthorDate: Tue May 28 08:16:42 2024 +0100 Add com.azure:azure-core-http-vertx to Dependabot config --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9bfea29434..e6b67160ca 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -30,6 +30,7 @@ updates: # Quarkiverse extensions - dependency-name: "io.quarkiverse.*:*" # Other third party extensions + - dependency-name: "com.azure:azure-core-http-vertx" - dependency-name: "com.hazelcast:quarkus-hazelcast-client-bom" - dependency-name: "com.squareup.okhttp3:okhttp" - dependency-name: "org.amqphub.quarkus:quarkus-qpid-jms-bom"
(camel-quarkus) branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 deleted (was 220edb953a)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 220edb953a Auto generated changes for dependabot commit fc1a859c32c39a67f349f12bf8ac0860b177ef70 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated (1de918f30a -> 21f2f49cf1)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 1de918f30a Kafka tests in fips new 07972593de Upgrade Quarkus to 3.11.0 new 21f2f49cf1 Add me.escoffier.certs:certificate-generator-junit5 to dependabot config The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/dependabot.yml | 1 + docs/antora.yml| 2 +- pom.xml| 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
(camel-quarkus) 01/02: Upgrade Quarkus to 3.11.0
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 07972593de718395bf6bd01605c4da6cb97d25e9 Author: James Netherton AuthorDate: Wed May 22 13:53:41 2024 +0100 Upgrade Quarkus to 3.11.0 --- docs/antora.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index faac8bb45d..d1cc08d46e 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,7 +31,7 @@ asciidoc: camel-version: 4.6.0 # replace ${camel.version} camel-docs-version: next camel-quarkus-version: 3.11.0 # replace ${camel-quarkus.version} -quarkus-version: 3.11.0.CR1 # replace ${quarkus.version} +quarkus-version: 3.11.0 # replace ${quarkus.version} graalvm-version: 23.1.2 # replace ${graalvm.version} graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} diff --git a/pom.xml b/pom.xml index 4021aa4687..98a3f74c26 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0.CR1 +3.11.0 4.0.0 2.6.1
(camel-quarkus) 02/02: Add me.escoffier.certs:certificate-generator-junit5 to dependabot config
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 21f2f49cf1fb194e05bd6e531f5c097d73b8f05c Author: James Netherton AuthorDate: Wed May 22 13:55:02 2024 +0100 Add me.escoffier.certs:certificate-generator-junit5 to dependabot config --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 51a09d71f1..9bfea29434 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -37,6 +37,7 @@ updates: # Test dependencies - dependency-name: "com.github.tomakehurst:wiremock" - dependency-name: "com.unboundid:unboundid-ldapsdk" + - dependency-name: "me.escoffier.certs:certificate-generator-junit5" - dependency-name: "org.hamcrest:hamcrest" - dependency-name: "org.hamcrest:hamcrest-core" - dependency-name: "org.seleniumhq.selenium:htmlunit-driver"
(camel-quarkus) branch main updated: Kafka tests in fips
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 1de918f30a Kafka tests in fips 1de918f30a is described below commit 1de918f30a6a2f9e784b3face5c2956aa94ee02f Author: JiriOndrusek AuthorDate: Tue May 14 16:08:30 2024 +0200 Kafka tests in fips --- .../{kafka => certificate-generator}/pom.xml | 20 ++-- .../TestCertificateGenerationExtension.java| 127 + .../test/support/certificate/TestCertificates.java | 55 + integration-tests-support/kafka/pom.xml| 4 + .../test/support/kafka/KafkaTestResource.java | 78 - .../test/support/kafka/KafkaTestSupport.java | 37 -- .../kafka/src/main/resources/log4j.properties | 23 integration-tests-support/pom.xml | 1 + .../quarkus/test/DisabledIfFipsModeCondition.java | 2 +- .../quarkus/test/EnabledIfFipsModeCondition.java | 29 + ...dIfFipsModeCondition.java => FipsModeUtil.java} | 40 ++- integration-tests/kafka-sasl-ssl/pom.xml | 5 + .../camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 7 ++ .../kafka/sasl/KafkaSaslSslTestResource.java | 76 .../test/resources/config/generate-certificates.sh | 39 --- .../src/test/resources/config/kafka-keystore.p12 | Bin 2451 -> 0 bytes .../src/test/resources/config/kafka-truststore.p12 | Bin 1010 -> 0 bytes .../test/resources/config/kafka_server_jaas.conf | 5 +- .../quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 + integration-tests/kafka-ssl/pom.xml| 5 + .../camel/quarkus/kafka/ssl/KafkaSslTest.java | 10 ++ .../quarkus/kafka/ssl/KafkaSslTestResource.java| 74 +++- .../test/resources/config/generate-certificates.sh | 39 --- .../src/test/resources/config/kafka-keystore.p12 | Bin 2451 -> 0 bytes .../src/test/resources/config/kafka-truststore.p12 | Bin 1010 -> 0 bytes pom.xml| 1 + poms/bom-test/pom.xml | 10 ++ 27 files changed, 385 insertions(+), 304 deletions(-) diff --git a/integration-tests-support/kafka/pom.xml b/integration-tests-support/certificate-generator/pom.xml similarity index 86% copy from integration-tests-support/kafka/pom.xml copy to integration-tests-support/certificate-generator/pom.xml index 736a0e369b..0bcbf9f57d 100644 --- a/integration-tests-support/kafka/pom.xml +++ b/integration-tests-support/certificate-generator/pom.xml @@ -26,21 +26,25 @@ 4.0.0 -camel-quarkus-integration-tests-support-kafka -Camel Quarkus :: Integration Tests :: Support :: Kafka + camel-quarkus-integration-tests-support-certificate-generator +Camel Quarkus :: Integration Tests :: Support :: Certificate generator -io.quarkus -quarkus-kafka-client +me.escoffier.certs +certificate-generator-junit5 org.apache.camel.quarkus camel-quarkus-integration-test-support -io.strimzi -strimzi-test-container +io.quarkus +quarkus-junit4-mock + + +org.testcontainers +testcontainers junit @@ -48,10 +52,6 @@ - -io.quarkus -quarkus-junit4-mock - diff --git a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java new file mode 100644 index 00..c695fdcaab --- /dev/null +++ b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java @@ -0,0 +1,127 @@ +/* + * 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 Licen
(camel-quarkus-examples) branch dependabot/maven/timer-log-kotlin/camel-quarkus-main/maven-cf7ac0bfbe deleted (was 3326c21)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/timer-log-kotlin/camel-quarkus-main/maven-cf7ac0bfbe in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 3326c21 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-type: direct:production update-type: version-update:semver-major dependency-group: maven - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-major dependency-group: maven ... The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.15.0 deleted (was 08984ec422)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.15.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 08984ec422 Auto generated changes for dependabot commit 3cd71c65d264be5fdf3f83052a4632f1efeb0ead The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) 01/01: Handle DebuggerJmxConnectorService being present in the camel core
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d31ba7659d5b39db47ae239d74edb6d62b61110a Author: James Netherton AuthorDate: Tue May 21 14:45:47 2024 +0100 Handle DebuggerJmxConnectorService being present in the camel core --- .../core/deployment/CamelDebugProcessor.java | 46 +++ .../DebuggerJmxConnectorServiceSubstitutions.java | 67 ++ .../camel/quarkus/main/CoreMainResource.java | 31 ++ .../main/src/main/resources/application.properties | 2 + .../apache/camel/quarkus/main/CoreMainTest.java| 18 ++ .../quarkus/component/management/it/Routes.java| 2 + .../src/main/resources/application.properties | 3 + .../component/management/it/ManagementTest.java| 14 + 8 files changed, 183 insertions(+) diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java new file mode 100644 index 00..5ee593c439 --- /dev/null +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.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.core.deployment; + +import java.util.function.BooleanSupplier; +import java.util.stream.StreamSupport; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildSteps; +import io.quarkus.deployment.builditem.AllowJNDIBuildItem; +import org.eclipse.microprofile.config.ConfigProvider; + +/** + * Build steps relating to camel debugging support. This is primarily required due to camel-main + * having the capability to enable debugging features that live in the Camel core such as the + * DebuggerJmxConnectorService + */ +@BuildSteps(onlyIf = CamelDebugProcessor.CamelDebugConfigurationPresent.class) +public class CamelDebugProcessor { +@BuildStep +AllowJNDIBuildItem allowJNDI() { +return new AllowJNDIBuildItem(); +} + +static final class CamelDebugConfigurationPresent implements BooleanSupplier { +@Override +public boolean getAsBoolean() { +return StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false) +.anyMatch(key -> key.startsWith("camel.debug")); +} +} +} diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java new file mode 100644 index 00..866bcb7f89 --- /dev/null +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java @@ -0,0 +1,67 @@ +/* + * 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.core.graal; + +import java.io.IOException; +import java.util.function.BooleanSupplier; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.RecomputeFieldValue; +import com.oracl
(camel-quarkus) branch camel-main updated (8fb0586fe0 -> d31ba7659d)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 8fb0586fe0 Handle DebuggerJmxConnectorService being present in the camel core new d31ba7659d Handle DebuggerJmxConnectorService being present in the camel core This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8fb0586fe0) \ N -- N -- N refs/heads/camel-main (d31ba7659d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java | 2 +- .../main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(camel-quarkus) branch camel-main updated: Handle DebuggerJmxConnectorService being present in the camel core
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new 8fb0586fe0 Handle DebuggerJmxConnectorService being present in the camel core 8fb0586fe0 is described below commit 8fb0586fe0360ded19790a9c4e7661980efec62f Author: James Netherton AuthorDate: Tue May 21 14:45:47 2024 +0100 Handle DebuggerJmxConnectorService being present in the camel core --- .../core/deployment/CamelDebugProcessor.java | 46 +++ .../DebuggerJmxConnectorServiceSubstitutions.java | 67 ++ .../camel/quarkus/main/CoreMainResource.java | 31 ++ .../main/src/main/resources/application.properties | 2 + .../apache/camel/quarkus/main/CoreMainTest.java| 18 ++ .../quarkus/component/management/it/Routes.java| 2 + .../src/main/resources/application.properties | 3 + .../component/management/it/ManagementTest.java| 14 + 8 files changed, 183 insertions(+) diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java new file mode 100644 index 00..5ee593c439 --- /dev/null +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.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.core.deployment; + +import java.util.function.BooleanSupplier; +import java.util.stream.StreamSupport; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildSteps; +import io.quarkus.deployment.builditem.AllowJNDIBuildItem; +import org.eclipse.microprofile.config.ConfigProvider; + +/** + * Build steps relating to camel debugging support. This is primarily required due to camel-main + * having the capability to enable debugging features that live in the Camel core such as the + * DebuggerJmxConnectorService + */ +@BuildSteps(onlyIf = CamelDebugProcessor.CamelDebugConfigurationPresent.class) +public class CamelDebugProcessor { +@BuildStep +AllowJNDIBuildItem allowJNDI() { +return new AllowJNDIBuildItem(); +} + +static final class CamelDebugConfigurationPresent implements BooleanSupplier { +@Override +public boolean getAsBoolean() { +return StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false) +.anyMatch(key -> key.startsWith("camel.debug")); +} +} +} diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java new file mode 100644 index 00..866bcb7f89 --- /dev/null +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java @@ -0,0 +1,67 @@ +/* + * 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.core.graal; + +import java.io.IOException;
(camel-quarkus) branch main updated: Fix test report action handling of error & failure objects
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 0e2bf904a3 Fix test report action handling of error & failure objects 0e2bf904a3 is described below commit 0e2bf904a363549d15b5de4b61d0ce14a1ef2b91 Author: James Netherton AuthorDate: Tue May 21 09:12:12 2024 +0100 Fix test report action handling of error & failure objects --- .github/actions/test-summary-report/action.yaml | 34 ++--- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/.github/actions/test-summary-report/action.yaml b/.github/actions/test-summary-report/action.yaml index e387dd69de..abf4a356d6 100644 --- a/.github/actions/test-summary-report/action.yaml +++ b/.github/actions/test-summary-report/action.yaml @@ -46,9 +46,6 @@ runs: const junit = require('junit2json'); const testReportGlobPattern = "${{ inputs.test-report-xml-base-dir }}/${{ inputs.test-report-xml-includes }}".replace(/\.+\/+/g, "") const summaryData = []; - const log = function(message) { -console.log(message); - }; // Configure test summary table headers summaryData.push([ @@ -62,31 +59,31 @@ runs: const globber = await glob.create(testReportGlobPattern); for await (const reportFile of globber.globGenerator()) { const file = fs.readFileSync(reportFile); -log(`Found JUnit report: ${reportFile}`); const report = junit.parse(file).then((report) => { - log(`Report errors: ${report.errors}`); - log(`Report failures: ${report.failures}`); if (report.errors > 0 || report.failures > 0) { -log(`Test case count: ${report.testcase.length}`); report.testcase.forEach((testCase) => { - log(`Test case failure: ${testCase.failure}`); - if (testCase.failure !== undefined) { + const failure = testCase.failure !== undefined ? testCase.failure : testCase.error; + if (failure !== undefined) { const shortClassName = `${testCase.classname.substring(testCase.classname.lastIndexOf('.') + 1)}`; const className = `${shortClassName}\n${testCase.classname}`; -const details = `View\n${testCase.failure[0].inner}`; -let testName = `${testCase.name}`; -if (testCase.length > 25) { - testName = `View\n${testCase.name}`; +const details = `View\n${failure[0].inner}`; + +let testName = ""; +if (testCase.name !== undefined && testCase.name.trim().length > 0) { + testName = `${testCase.name}`; + if (testCase.name.trim().length > 25) { +testName = `View\n${testCase.name}`; + } +} else { + // Some JUnit extensions do odd things to the test name on failure, so it may be null or empty + testName = `Unknown`; } -let message = `${testCase.failure[0].message}`; +let message = `${failure[0].message}`; if (message.length > 50) { message = `View\n${message}`; } -log(`Pushing summary detail to summaryData array`); summaryData.push([className, testName, message, details]); - } else { -log(testCase); } }); } @@ -94,10 +91,7 @@ runs: } // Write the summary data if there were test failures - log(`summaryData array length: ${summaryData.length}`); if (summaryData.length > 1) { -log(`Writing summary`); -log(summaryData); await core.summary .addHeading("Test Failures", "3") .addTable(summaryData)
(camel-quarkus) branch main updated (83b7ab2004 -> e226c10ca6)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 83b7ab2004 Add support for openapi-contract-first development add e226c10ca6 Add tests for supervised routes with MicroProfile health No new revisions were added by this update. Summary of changes: integration-tests/microprofile-health/pom.xml | 5 ++ .../it/health/MicroProfileHealthRouteBuilder.java | 10 ...va => MicroProfileHealthSupervisedRouteIT.java} | 3 +- .../MicroProfileHealthSupervisedRouteTest.java | 59 ++ .../it/health/SupervisedRouteTestProfile.java} | 13 +++-- 5 files changed, 83 insertions(+), 7 deletions(-) copy integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/{MicroprofileHealthIT.java => MicroProfileHealthSupervisedRouteIT.java} (91%) create mode 100644 integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthSupervisedRouteTest.java copy integration-tests/{kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/KafkaHealthCheckProfile.java => microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/SupervisedRouteTestProfile.java} (64%)
(camel-quarkus) branch main updated: Upgrade jolokia to 2.0.2
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new c530f19242 Upgrade jolokia to 2.0.2 c530f19242 is described below commit c530f1924252e7a66a980f3b72c16c9cedc64907 Author: James Netherton AuthorDate: Mon May 20 13:47:53 2024 +0100 Upgrade jolokia to 2.0.2 --- pom.xml| 2 +- poms/bom/pom.xml | 5 +++-- poms/bom/src/main/generated/flattened-full-pom.xml | 7 --- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 19f9375483..4749057b98 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ ${jakarta-jms-api-version} ${json-patch-version} ${jodatime2-version} -1.7.2 +2.0.2 1.2.0 ${javassist-version} ${jetty-version} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 35c4d279d6..ac2cf8f9e6 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -7043,12 +7043,13 @@ org.jolokia -jolokia-jvm +jolokia-agent-jvm ${jolokia.version} +javaagent org.jolokia -jolokia-core +jolokia-server-core com.googlecode.json-simple diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 48c53d5a67..e65dfb0f1b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6964,12 +6964,13 @@ org.jolokia -jolokia-jvm -1.7.2 +jolokia-agent-jvm +2.0.2 +javaagent org.jolokia -jolokia-core +jolokia-server-core com.googlecode.json-simple
(camel-quarkus) branch main updated: Use a consistent release version for CompilationProvider
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new c86e750782 Use a consistent release version for CompilationProvider c86e750782 is described below commit c86e750782cd35426ed5072dffdbce9dddb54136 Author: James Netherton AuthorDate: Mon May 20 09:01:37 2024 +0100 Use a consistent release version for CompilationProvider Fixes #6103 --- .../org/apache/camel/quarkus/core/deployment/util/CamelSupport.java | 1 + .../camel/quarkus/component/csimple/deployment/CSimpleProcessor.java | 5 +++-- .../org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java index f40f463a24..53ae8efee8 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java @@ -39,6 +39,7 @@ import org.jboss.jandex.ClassInfo; public final class CamelSupport { public static final String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel"; public static final String CAMEL_ROOT_PACKAGE_DIRECTORY = "org/apache/camel"; +public static final String COMPILATION_JVM_TARGET = "17"; private CamelSupport() { } diff --git a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java index 49b43a7d5e..f92555f2ae 100644 --- a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java +++ b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java @@ -65,6 +65,7 @@ import org.apache.camel.quarkus.component.csimple.CSimpleLanguageRecorder; import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem; import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem; import org.apache.camel.quarkus.core.deployment.spi.CompiledCSimpleExpressionBuildItem; +import org.apache.camel.quarkus.core.deployment.util.CamelSupport; import org.apache.camel.quarkus.core.util.FileUtils; import org.apache.camel.quarkus.support.language.deployment.ExpressionBuildItem; import org.apache.camel.quarkus.support.language.deployment.ExpressionExtractionResultBuildItem; @@ -264,9 +265,9 @@ class CSimpleProcessor { csimpleClassesDir.toFile(), StandardCharsets.UTF_8.name(), Collections.emptyMap(), +CamelSupport.COMPILATION_JVM_TARGET, +null, null, -"11", -"11", Collections.emptyList(), Collections.emptyList(), null, diff --git a/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java b/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java index 060ee396c2..68cd912976 100644 --- a/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java +++ b/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java @@ -47,6 +47,7 @@ import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; import org.apache.camel.quarkus.core.deployment.main.CamelMainHelper; +import org.apache.camel.quarkus.core.deployment.util.CamelSupport; import org.apache.camel.quarkus.dsl.jsh.runtime.Configurer; import org.apache.camel.quarkus.support.dsl.deployment.DslGeneratedClassBuildItem; import org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor; @@ -132,7 +133,7 @@ class JshDslProcessor { classesDir.toFile(), StandardCharsets.UTF_8.name(), Collections.emptyMap(), -null, +CamelSupport.COMPILATION_JVM_TARGET, null, null, Collections.emptyList(),
(camel-quarkus) branch quarkus-main updated (1a576137fc -> fa306b6d3a)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 1a576137fc Upgrade Quarkus to 3.12.0.CR1 new fa306b6d3a Upgrade Quarkus to 3.12.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1a576137fc) \ N -- N -- N refs/heads/quarkus-main (fa306b6d3a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.12.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit fa306b6d3acfd073936e46d13df2cb2a2aacae1d Author: James Netherton AuthorDate: Fri May 17 07:22:14 2024 +0100 Upgrade Quarkus to 3.12.0.CR1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 19f9375483..f6fea0b949 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0.CR1 +999-SNAPSHOT 4.0.0 2.6.1 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 -1.63.0 +1.64.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version}
(camel-quarkus) branch 3.8.x updated: Use more correct convention with configuring datasource
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.8.x by this push: new 276e03e2e9 Use more correct convention with configuring datasource 276e03e2e9 is described below commit 276e03e2e9bac13d1c4738e73e1a561e2ca1b491 Author: Lukas Lowinger AuthorDate: Thu May 16 13:12:57 2024 +0200 Use more correct convention with configuring datasource --- .../apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java | 2 -- .../opentelemetry/src/main/resources/application.properties| 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java index 8a5b09e7bd..ead2d1db0d 100644 --- a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java +++ b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.sql.Statement; import io.agroal.api.AgroalDataSource; -import io.quarkus.agroal.DataSource; import io.quarkus.runtime.annotations.RegisterForReflection; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -33,7 +32,6 @@ import jakarta.inject.Singleton; @RegisterForReflection(fields = false) public class JdbcQueryBean { @Inject -@DataSource("postgres") AgroalDataSource dataSource; public long getNowTimestamp() { diff --git a/integration-tests/opentelemetry/src/main/resources/application.properties b/integration-tests/opentelemetry/src/main/resources/application.properties index 4b09058179..e9e91adead 100644 --- a/integration-tests/opentelemetry/src/main/resources/application.properties +++ b/integration-tests/opentelemetry/src/main/resources/application.properties @@ -22,5 +22,4 @@ quarkus.camel.opentelemetry.exclude-patterns = timer:filtered* quarkus.otel.bsp.schedule.delay=1 quarkus.otel.bsp.export.timeout=5s -quarkus.datasource."postgres".db-kind=postgresql -quarkus.datasource."postgres".jdbc.telemetry=true \ No newline at end of file +quarkus.datasource.jdbc.telemetry=true \ No newline at end of file
(camel-quarkus) branch quarkus-main updated (b47452b2e2 -> 1a576137fc)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard b47452b2e2 Upgrade Quarkus to 3.11.0.CR1 add f4e9d46a6a Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 add 112ff86cce Add test report object debugging to test-summary-report action add 917745414f Migrate from camel.main.debugging to camel.debug config prefix add 95b20582e7 Disabled Crypto tests in FIPS add 3313c0648d Split MicroProfile integration tests into separate modules add e4c3ee10e6 Auto label issues relating to FIPS add 33501630ed Upgrade Quarkus to 3.11.0.CR1 add 7c190913e3 Increase Xmx to 3500m for Validate PR workflow add 901e0beba9 Clean up leftovers from removed non-camel-main based runtime add ffc8c12d34 Use more correct convention with configuring datasource add e46046465c Pin test report action junit2json package version to 3.1.7 as later releases are currently broken new 1a576137fc Upgrade Quarkus to 3.12.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b47452b2e2) \ N -- N -- N refs/heads/quarkus-main (1a576137fc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/actions/test-summary-report/action.yaml| 4 +- .github/auto-label-configuration.yaml | 5 + .github/workflows/pr-validate.yml | 2 +- docs/antora.yml| 2 +- .../reference/extensions/file-cluster-service.adoc | 4 +- .../ROOT/pages/reference/extensions/grpc.adoc | 8 +- .../extensions/kubernetes-cluster-service.adoc | 4 +- .../ROOT/pages/reference/extensions/xslt.adoc | 4 +- .../camel/quarkus/core/CamelContextRecorder.java | 64 --- .../camel/quarkus/core/CamelContextRuntime.java| 80 - .../component/debug/deployment/DebugProcessor.java | 2 +- ...est.java => DebugEnabledFromCamelMainTest.java} | 14 +- .../foundation/core-fault-tolerance/pom.xml| 128 - .../it/CoreFaultToleranceResource.java | 70 .../it/CoreFaultToleranceRoutes.java | 38 .../src/main/resources/application.properties | 27 --- .../faulttolerance/it/CoreFaultToleranceIT.java| 23 --- integration-test-groups/foundation/pom.xml | 1 - integration-tests/crypto/pom.xml | 5 + .../quarkus/component/crypto/it/CryptoTest.java| 2 + .../pom.xml| 26 +-- .../it/faulttolerance/GreetingBean.java| 0 .../MicroProfileFaultToleranceHelper.java | 0 .../MicroProfileFaultToleranceRoutes.java | 11 ++ .../MicroprofileFaultToleranceProducers.java | 16 +- .../MicroprofileFaultToleranceResource.java| 38 ...MicroProfileFaultToleranceConfigurationIT.java} | 3 +- ...icroProfileFaultToleranceConfigurationTest.java | 14 +- ...fileFaultToleranceConfigurationTestProfile.java | 22 +-- .../MicroprofileFaultToleranceIT.java | 0 .../MicroprofileFaultToleranceTest.java| 0 .../microprofile-health}/pom.xml | 16 +- .../it/health/CustomHealthCheckRepository.java | 0 .../microprofile/it/health/FailingHealthCheck.java | 0 .../microprofile/it/health/LivenessCheck.java | 0 .../it/health/MicroProfileHealthResource.java | 0 .../it/health/MicroProfileHealthRouteBuilder.java | 0 .../microprofile/it/health/ReadinessCheck.java | 0 .../microprofile/it/health/SimpleHealthCheck.java | 0 .../src/main/resources/application.properties | 0 .../it/health/MicroProfileHealthTest.java | 0 .../it/health/MicroprofileHealthIT.java| 0 integration-tests/microprofile/pom.xml | 200 - .../component/opentelemetry/it/JdbcQueryBean.java | 2 - .../src/main/resources/application.properties | 3 +- integration-tests/pom.xml | 3 +- pom.xml| 2 +-
(camel-quarkus) 01/01: Upgrade Quarkus to 3.12.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1a576137fc7b2a5dd3fe36918ebc2c8784c50c36 Author: James Netherton AuthorDate: Fri May 17 07:22:14 2024 +0100 Upgrade Quarkus to 3.12.0.CR1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19f9375483..25be7505ea 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.2 2.4.0 2.0.2 -3.11.0.CR1 +999-SNAPSHOT 4.0.0 2.6.1
(camel-quarkus) branch main updated: Pin test report action junit2json package version to 3.1.7 as later releases are currently broken
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e46046465c Pin test report action junit2json package version to 3.1.7 as later releases are currently broken e46046465c is described below commit e46046465c80bbea8878cf3ee4b99a01f97a2a60 Author: James Netherton AuthorDate: Thu May 16 16:00:40 2024 +0100 Pin test report action junit2json package version to 3.1.7 as later releases are currently broken --- .github/actions/test-summary-report/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test-summary-report/action.yaml b/.github/actions/test-summary-report/action.yaml index fee604e6bb..e387dd69de 100644 --- a/.github/actions/test-summary-report/action.yaml +++ b/.github/actions/test-summary-report/action.yaml @@ -37,7 +37,7 @@ runs: - name: Install script dependencies shell: bash run: | -npm install junit2json +npm install junit2json@3.1.7 - name: Generate test summary uses: actions/github-script@v7 with:
(camel-quarkus) branch main updated: Use more correct convention with configuring datasource
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new ffc8c12d34 Use more correct convention with configuring datasource ffc8c12d34 is described below commit ffc8c12d34921136a6aed8b4682e831fecd388a7 Author: Lukas Lowinger AuthorDate: Thu May 16 13:12:57 2024 +0200 Use more correct convention with configuring datasource --- .../apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java | 2 -- .../opentelemetry/src/main/resources/application.properties| 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java index 8a5b09e7bd..ead2d1db0d 100644 --- a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java +++ b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/JdbcQueryBean.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.sql.Statement; import io.agroal.api.AgroalDataSource; -import io.quarkus.agroal.DataSource; import io.quarkus.runtime.annotations.RegisterForReflection; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -33,7 +32,6 @@ import jakarta.inject.Singleton; @RegisterForReflection(fields = false) public class JdbcQueryBean { @Inject -@DataSource("postgres") AgroalDataSource dataSource; public long getNowTimestamp() { diff --git a/integration-tests/opentelemetry/src/main/resources/application.properties b/integration-tests/opentelemetry/src/main/resources/application.properties index 4b09058179..e9e91adead 100644 --- a/integration-tests/opentelemetry/src/main/resources/application.properties +++ b/integration-tests/opentelemetry/src/main/resources/application.properties @@ -22,5 +22,4 @@ quarkus.camel.opentelemetry.exclude-patterns = timer:filtered* quarkus.otel.bsp.schedule.delay=1 quarkus.otel.bsp.export.timeout=5s -quarkus.datasource."postgres".db-kind=postgresql -quarkus.datasource."postgres".jdbc.telemetry=true \ No newline at end of file +quarkus.datasource.jdbc.telemetry=true \ No newline at end of file
(camel-quarkus) branch main updated: Clean up leftovers from removed non-camel-main based runtime
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 901e0beba9 Clean up leftovers from removed non-camel-main based runtime 901e0beba9 is described below commit 901e0beba9f6d10d656b0bff203be8cd92f2aa30 Author: James Netherton AuthorDate: Thu May 16 13:04:50 2024 +0100 Clean up leftovers from removed non-camel-main based runtime --- .../camel/quarkus/core/CamelContextRecorder.java | 64 - .../camel/quarkus/core/CamelContextRuntime.java| 80 -- 2 files changed, 144 deletions(-) diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java index 1536533051..6022249933 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.core; -import java.util.ArrayList; -import java.util.List; import java.util.Set; import io.quarkus.arc.runtime.BeanContainer; @@ -25,12 +23,6 @@ import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.annotations.Recorder; import org.apache.camel.CamelContext; import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.RouteConfigurationsBuilder; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.builder.LambdaRouteBuilder; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.builder.endpoint.LambdaEndpointRouteBuilder; import org.apache.camel.catalog.RuntimeCamelCatalog; import org.apache.camel.impl.engine.DefaultVariableRepositoryFactory; import org.apache.camel.spi.CamelContextCustomizer; @@ -98,15 +90,6 @@ public class CamelContextRecorder { contextCustomizer.getValue().configure(context.getValue()); } -public RuntimeValue createRuntime(BeanContainer beanContainer, RuntimeValue context) { -final CamelRuntime runtime = new CamelContextRuntime(context.getValue()); - -// register to the container -beanContainer.beanInstance(CamelProducers.class).setRuntime(runtime); - -return new RuntimeValue<>(runtime); -} - public RuntimeValue createNoShutdownStrategyCustomizer() { return new RuntimeValue<>(context -> context.setShutdownStrategy(new NoShutdownStrategy())); } @@ -115,53 +98,6 @@ public class CamelContextRecorder { return new RuntimeValue<>(context -> context.setSourceLocationEnabled(true)); } -public void addRoutes(RuntimeValue context, List nonCdiRoutesBuilderClassNames) { -List allRoutesBuilders = new ArrayList<>(); - -try { -for (String nonCdiRoutesBuilderClassName : nonCdiRoutesBuilderClassNames) { -Class nonCdiRoutesBuilderClass = context.getValue().getClassResolver() -.resolveClass(nonCdiRoutesBuilderClassName, RoutesBuilder.class); - allRoutesBuilders.add(context.getValue().getInjector().newInstance(nonCdiRoutesBuilderClass)); -} - -for (LambdaRouteBuilder builder : context.getValue().getRegistry().findByType(LambdaRouteBuilder.class)) { -allRoutesBuilders.add(new RouteBuilder() { -@Override -public void configure() throws Exception { -builder.accept(this); -} -}); -} - -for (LambdaEndpointRouteBuilder builder : context.getValue().getRegistry() -.findByType(LambdaEndpointRouteBuilder.class)) { -allRoutesBuilders.add(new EndpointRouteBuilder() { -@Override -public void configure() throws Exception { -builder.accept(this); -} -}); -} - - allRoutesBuilders.addAll(context.getValue().getRegistry().findByType(RoutesBuilder.class)); - -// Add RouteConfigurationsBuilders before RoutesBuilders -for (RoutesBuilder routesBuilder : allRoutesBuilders) { -if (routesBuilder instanceof RouteConfigurationsBuilder) { - context.getValue().addRoutesConfigurations((RouteConfigurationsBuilder) routesBuilder); -} -} -for (RoutesBuilder routesBuilder : allRoutesBuilders) { -if (!(routesBuilder instanceof RouteConfigurationsBuilder)) { -context.getV
(camel-quarkus) branch main updated: Increase Xmx to 3500m for Validate PR workflow
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 7c190913e3 Increase Xmx to 3500m for Validate PR workflow 7c190913e3 is described below commit 7c190913e3498d34a8cb7fdcfb9c03951227a023 Author: James Netherton AuthorDate: Thu May 16 07:18:01 2024 +0100 Increase Xmx to 3500m for Validate PR workflow --- .github/workflows/pr-validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml index 7b6f224c60..ec8ed005c7 100644 --- a/.github/workflows/pr-validate.yml +++ b/.github/workflows/pr-validate.yml @@ -39,7 +39,7 @@ concurrency: env: LANG: en_US - MAVEN_OPTS: -Xmx3000m + MAVEN_OPTS: -Xmx3500m CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120 jobs:
(camel-quarkus) branch main updated: Upgrade Quarkus to 3.11.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 33501630ed Upgrade Quarkus to 3.11.0.CR1 33501630ed is described below commit 33501630ed59670b4c46196ea93820357ac29c23 Author: James Netherton AuthorDate: Wed May 15 15:40:14 2024 +0100 Upgrade Quarkus to 3.11.0.CR1 --- docs/antora.yml | 2 +- .../ROOT/pages/reference/extensions/file-cluster-service.adoc | 4 ++-- docs/modules/ROOT/pages/reference/extensions/grpc.adoc| 8 .../pages/reference/extensions/kubernetes-cluster-service.adoc| 4 ++-- docs/modules/ROOT/pages/reference/extensions/xslt.adoc| 4 ++-- pom.xml | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 2c41e3d1ea..faac8bb45d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,7 +31,7 @@ asciidoc: camel-version: 4.6.0 # replace ${camel.version} camel-docs-version: next camel-quarkus-version: 3.11.0 # replace ${camel-quarkus.version} -quarkus-version: 3.10.0 # replace ${quarkus.version} +quarkus-version: 3.11.0.CR1 # replace ${quarkus.version} graalvm-version: 23.1.2 # replace ${graalvm.version} graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} diff --git a/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc b/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc index c700ca0686..b471f94b36 100644 --- a/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc @@ -101,10 +101,10 @@ The time to wait between attempts to try to acquire lock (defaults to 1ms). | `string` | -|icon:lock[title=Fixed at build time] [[quarkus.camel.cluster.file.attributes]]`link:#quarkus.camel.cluster.file.attributes[quarkus.camel.cluster.file.attributes]` +|icon:lock[title=Fixed at build time] [[quarkus.camel.cluster.file.attributes.-attributes]]`link:#quarkus.camel.cluster.file.attributes.-attributes[quarkus.camel.cluster.file.attributes."attributes"]` The custom attributes associated to the service (defaults to empty map). -| ``Map`` +| `java.lang.String` | |=== diff --git a/docs/modules/ROOT/pages/reference/extensions/grpc.adoc b/docs/modules/ROOT/pages/reference/extensions/grpc.adoc index f9f45ba2a3..374fb70ac4 100644 --- a/docs/modules/ROOT/pages/reference/extensions/grpc.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/grpc.adoc @@ -186,16 +186,16 @@ Camel Quarkus gRPC code generation can scan dependencies for .proto files that c | `string` | `com.google.protobuf:protobuf-java` -|icon:lock[title=Fixed at build time] [[quarkus.camel.grpc.codegen.scan-for-proto-includes]]`link:#quarkus.camel.grpc.codegen.scan-for-proto-includes[quarkus.camel.grpc.codegen.scan-for-proto-includes]` +|icon:lock[title=Fixed at build time] [[quarkus.camel.grpc.codegen.scan-for-proto-includes.-scan-for-proto-includes]]`link:#quarkus.camel.grpc.codegen.scan-for-proto-includes.-scan-for-proto-includes[quarkus.camel.grpc.codegen.scan-for-proto-includes."scan-for-proto-includes"]` Package path or file glob pattern includes per dependency containing .proto files to be considered for inclusion. -| ``Map>`` +| `java.util.List` | -|icon:lock[title=Fixed at build time] [[quarkus.camel.grpc.codegen.scan-for-proto-excludes]]`link:#quarkus.camel.grpc.codegen.scan-for-proto-excludes[quarkus.camel.grpc.codegen.scan-for-proto-excludes]` +|icon:lock[title=Fixed at build time] [[quarkus.camel.grpc.codegen.scan-for-proto-excludes.-scan-for-proto-excludes]]`link:#quarkus.camel.grpc.codegen.scan-for-proto-excludes.-scan-for-proto-excludes[quarkus.camel.grpc.codegen.scan-for-proto-excludes."scan-for-proto-excludes"]` Package path or file glob pattern includes per dependency containing .proto files to be considered for exclusion. -| ``Map>`` +| `java.util.List` | |=== diff --git a/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc b/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc index 5e16fe5891..244a77457d 100644 --- a/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc @@ -146,10 +146,10 @@ The lease resource type used in Kubernetes, either 'config-map' or 'lease' (defa | `org.apache.camel.component.kubernetes.cluster.LeaseResourceType` | -| [[quarkus.camel.cluster.kubernetes.labels]]`link:#qua
(camel-quarkus) branch main updated: Auto label issues relating to FIPS
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e4c3ee10e6 Auto label issues relating to FIPS e4c3ee10e6 is described below commit e4c3ee10e6e23fec4887817ca0552e85a7472a32 Author: James Netherton AuthorDate: Wed May 15 15:10:44 2024 +0100 Auto label issues relating to FIPS --- .github/auto-label-configuration.yaml | 5 + 1 file changed, 5 insertions(+) diff --git a/.github/auto-label-configuration.yaml b/.github/auto-label-configuration.yaml index 010071c246..beb5b42516 100644 --- a/.github/auto-label-configuration.yaml +++ b/.github/auto-label-configuration.yaml @@ -65,6 +65,11 @@ config: labels: ["area/examples", "example"] matchOn: "title" + - id: area-fips +regex: "\\bfips\\b" +labels: ["area/fips"] +matchOn: "title" + - id: area-housekeeping regex: "\\b(ban(ned)?|remove)\\b" labels: ["area/housekeeping", "housekeeping"]
(camel-quarkus) branch main updated (95b20582e7 -> 3313c0648d)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 95b20582e7 Disabled Crypto tests in FIPS add 3313c0648d Split MicroProfile integration tests into separate modules No new revisions were added by this update. Summary of changes: .../foundation/core-fault-tolerance/pom.xml| 128 - .../it/CoreFaultToleranceResource.java | 70 .../it/CoreFaultToleranceRoutes.java | 38 .../src/main/resources/application.properties | 27 --- .../faulttolerance/it/CoreFaultToleranceIT.java| 23 --- integration-test-groups/foundation/pom.xml | 1 - .../pom.xml| 26 +-- .../it/faulttolerance/GreetingBean.java| 0 .../MicroProfileFaultToleranceHelper.java | 0 .../MicroProfileFaultToleranceRoutes.java | 11 ++ .../MicroprofileFaultToleranceProducers.java | 16 +- .../MicroprofileFaultToleranceResource.java| 38 ...MicroProfileFaultToleranceConfigurationIT.java} | 3 +- ...icroProfileFaultToleranceConfigurationTest.java | 14 +- ...fileFaultToleranceConfigurationTestProfile.java | 22 +-- .../MicroprofileFaultToleranceIT.java | 0 .../MicroprofileFaultToleranceTest.java| 0 .../microprofile-health}/pom.xml | 16 +- .../it/health/CustomHealthCheckRepository.java | 0 .../microprofile/it/health/FailingHealthCheck.java | 0 .../microprofile/it/health/LivenessCheck.java | 0 .../it/health/MicroProfileHealthResource.java | 0 .../it/health/MicroProfileHealthRouteBuilder.java | 0 .../microprofile/it/health/ReadinessCheck.java | 0 .../microprofile/it/health/SimpleHealthCheck.java | 0 .../src/main/resources/application.properties | 0 .../it/health/MicroProfileHealthTest.java | 0 .../it/health/MicroprofileHealthIT.java| 0 integration-tests/microprofile/pom.xml | 200 - integration-tests/pom.xml | 3 +- tooling/scripts/test-categories.yaml | 3 +- 31 files changed, 101 insertions(+), 538 deletions(-) delete mode 100644 integration-test-groups/foundation/core-fault-tolerance/pom.xml delete mode 100644 integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceResource.java delete mode 100644 integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceRoutes.java delete mode 100644 integration-test-groups/foundation/core-fault-tolerance/src/main/resources/application.properties delete mode 100644 integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java copy integration-tests/{jsonpath => microprofile-fault-tolerance}/pom.xml (90%) rename integration-tests/{microprofile => microprofile-fault-tolerance}/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/GreetingBean.java (100%) rename integration-tests/{microprofile => microprofile-fault-tolerance}/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceHelper.java (100%) rename integration-tests/{microprofile => microprofile-fault-tolerance}/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceRoutes.java (91%) rename integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java => integration-tests/microprofile-fault-tolerance/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceProducers.java (84%) rename integration-tests/{microprofile => microprofile-fault-tolerance}/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceResource.java (57%) copy integration-tests/{microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java => microprofile-fault-tolerance/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceConfigurationIT.java} (90%) rename integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java => integration-tests/microprofile-fault-tolerance/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceConfigurationTest.java (77%) copy integration-test-groups/foundation/log/src/test/java/org/apache
(camel-quarkus) branch main updated (917745414f -> 95b20582e7)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 917745414f Migrate from camel.main.debugging to camel.debug config prefix add 95b20582e7 Disabled Crypto tests in FIPS No new revisions were added by this update. Summary of changes: integration-tests/crypto/pom.xml | 5 + .../org/apache/camel/quarkus/component/crypto/it/CryptoTest.java | 2 ++ 2 files changed, 7 insertions(+)
(camel-quarkus) branch main updated: Migrate from camel.main.debugging to camel.debug config prefix
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 917745414f Migrate from camel.main.debugging to camel.debug config prefix 917745414f is described below commit 917745414ff01b3617184603ea144190cae0d926 Author: James Netherton AuthorDate: Wed May 15 07:29:47 2024 +0100 Migrate from camel.main.debugging to camel.debug config prefix Fixes #6080 --- .../component/debug/deployment/DebugProcessor.java | 2 +- .../deployment/DebugEnabledFromCamelMainTest.java | 71 ++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java b/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java index f0cf41b548..d2d0a56c22 100644 --- a/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java +++ b/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java @@ -66,7 +66,7 @@ class DebugProcessor { @Override public boolean getAsBoolean() { return (launchMode.equals(LaunchMode.DEVELOPMENT)) || (config.enabled -|| ConfigProvider.getConfig().getOptionalValue("camel.main.debugging", boolean.class).orElse(false)); +|| ConfigProvider.getConfig().getOptionalValue("camel.debug.enabled", boolean.class).orElse(false)); } } } diff --git a/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugEnabledFromCamelMainTest.java b/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugEnabledFromCamelMainTest.java new file mode 100644 index 00..a1fe6a039e --- /dev/null +++ b/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugEnabledFromCamelMainTest.java @@ -0,0 +1,71 @@ +/* + * 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.component.debug.deployment; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Properties; + +import io.quarkus.test.QuarkusUnitTest; +import io.restassured.RestAssured; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.hamcrest.Matchers.is; + +public class DebugEnabledFromCamelMainTest { + +@RegisterExtension +static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() +.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) +.addClass(DebugResource.class) +.addAsResource(applicationProperties(), "application.properties")); + +@Test +public void camelDebuggingEnabled() throws IOException { +RestAssured.get("/debug/enabled") +.then() +.body(is("true")) +.statusCode(200); + +// TODO: This needs Camel 4.7 where camel-main has the capability to configure the JMX Connector +// https://github.com/apache/camel-quarkus/issues/6083 +//try (Socket socket = new Socket("localhost", 1099)) { +//Assertions.assertTrue(socket.isConnected()); +//} +} + +public static final Asset applicationProperties() { +Writer writer = new StringWriter(); + +Properties props = new Properties(); +props.setProperty("camel.debug.enabled", "true"); + +try { +props.store(writer, ""); +} catch (IOException e) { +throw new RuntimeException(e); +} + +return new StringAsset(writer.toString()); +} +}
(camel-quarkus) branch main updated: Add test report object debugging to test-summary-report action
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 112ff86cce Add test report object debugging to test-summary-report action 112ff86cce is described below commit 112ff86ccec3c18384c4e6958a8cdb9c877feeed Author: James Netherton AuthorDate: Wed May 15 08:28:17 2024 +0100 Add test report object debugging to test-summary-report action --- .github/actions/test-summary-report/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/test-summary-report/action.yaml b/.github/actions/test-summary-report/action.yaml index 3fc314bed1..fee604e6bb 100644 --- a/.github/actions/test-summary-report/action.yaml +++ b/.github/actions/test-summary-report/action.yaml @@ -85,6 +85,8 @@ runs: } log(`Pushing summary detail to summaryData array`); summaryData.push([className, testName, message, details]); + } else { +log(testCase); } }); }
(camel-quarkus) branch dependabot/maven/quarkiverse-pooled-jms.version-2.4.0 deleted (was d5b2678a5f)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.4.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was d5b2678a5f Auto generated changes for dependabot commit 8b30b3bf9faadb052568870bde1b1d8eb35ac692 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated (8952f9d0ea -> f4e9d46a6a)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 8952f9d0ea Add debugging to test-summary-report action add f4e9d46a6a Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.11.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit b47452b2e202bd3329baeab91c89f272cc4d7a78 Author: James Netherton AuthorDate: Wed Apr 24 16:02:20 2024 +0100 Upgrade Quarkus to 3.11.0.CR1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d26401f5fd..ccff9a5789 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.2 2.3.1 2.0.2 -3.10.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 -1.62.2 +1.63.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -114,7 +114,7 @@ ${icu4j-version} 2.9.3 ${influx-java-driver-version} -2.17.0 +2.17.1 ${jakarta-jms-api-version} ${json-patch-version} ${jodatime2-version}
(camel-quarkus) branch quarkus-main updated (3095a23a76 -> b47452b2e2)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 3095a23a76 Upgrade Quarkus to 3.11.0.CR1 add e51be75a61 Update license-maven-plugin to 4.5 add 55b35a6f58 Document available configuration methods for the Infinispan extension add 8952f9d0ea Add debugging to test-summary-report action new b47452b2e2 Upgrade Quarkus to 3.11.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3095a23a76) \ N -- N -- N refs/heads/quarkus-main (b47452b2e2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/actions/test-summary-report/action.yaml| 12 ++ .../pages/reference/extensions/infinispan.adoc | 57 ++-- .../runtime/src/main/doc/configuration.adoc| 28 .../infinispan/runtime/src/main/doc/usage.adoc | 63 integration-tests/main-xml-io/pom.xml | 12 ++ pom.xml| 160 +++-- 6 files changed, 218 insertions(+), 114 deletions(-) create mode 100644 extensions/infinispan/runtime/src/main/doc/usage.adoc
(camel-quarkus) branch main updated: Add debugging to test-summary-report action
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 8952f9d0ea Add debugging to test-summary-report action 8952f9d0ea is described below commit 8952f9d0ea4a50b6bdfd19304c2f800fa22703d5 Author: James Netherton AuthorDate: Tue May 14 11:00:17 2024 +0100 Add debugging to test-summary-report action --- .github/actions/test-summary-report/action.yaml | 12 1 file changed, 12 insertions(+) diff --git a/.github/actions/test-summary-report/action.yaml b/.github/actions/test-summary-report/action.yaml index 2b76bf99b0..3fc314bed1 100644 --- a/.github/actions/test-summary-report/action.yaml +++ b/.github/actions/test-summary-report/action.yaml @@ -46,6 +46,9 @@ runs: const junit = require('junit2json'); const testReportGlobPattern = "${{ inputs.test-report-xml-base-dir }}/${{ inputs.test-report-xml-includes }}".replace(/\.+\/+/g, "") const summaryData = []; + const log = function(message) { +console.log(message); + }; // Configure test summary table headers summaryData.push([ @@ -59,9 +62,14 @@ runs: const globber = await glob.create(testReportGlobPattern); for await (const reportFile of globber.globGenerator()) { const file = fs.readFileSync(reportFile); +log(`Found JUnit report: ${reportFile}`); const report = junit.parse(file).then((report) => { + log(`Report errors: ${report.errors}`); + log(`Report failures: ${report.failures}`); if (report.errors > 0 || report.failures > 0) { +log(`Test case count: ${report.testcase.length}`); report.testcase.forEach((testCase) => { + log(`Test case failure: ${testCase.failure}`); if (testCase.failure !== undefined) { const shortClassName = `${testCase.classname.substring(testCase.classname.lastIndexOf('.') + 1)}`; const className = `${shortClassName}\n${testCase.classname}`; @@ -75,6 +83,7 @@ runs: if (message.length > 50) { message = `View\n${message}`; } +log(`Pushing summary detail to summaryData array`); summaryData.push([className, testName, message, details]); } }); @@ -83,7 +92,10 @@ runs: } // Write the summary data if there were test failures + log(`summaryData array length: ${summaryData.length}`); if (summaryData.length > 1) { +log(`Writing summary`); +log(summaryData); await core.summary .addHeading("Test Failures", "3") .addTable(summaryData)
(camel-quarkus) branch main updated: Document available configuration methods for the Infinispan extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 55b35a6f58 Document available configuration methods for the Infinispan extension 55b35a6f58 is described below commit 55b35a6f58a52ffa4c1091c5355253acddb669c5 Author: James Netherton AuthorDate: Tue May 14 10:45:37 2024 +0100 Document available configuration methods for the Infinispan extension --- .../pages/reference/extensions/infinispan.adoc | 57 +--- .../runtime/src/main/doc/configuration.adoc| 28 -- .../infinispan/runtime/src/main/doc/usage.adoc | 63 ++ 3 files changed, 112 insertions(+), 36 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc b/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc index 15eeabc4a4..2073a7931c 100644 --- a/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc @@ -45,16 +45,55 @@ 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-infinispan-additional-camel-quarkus-configuration"] -== Additional Camel Quarkus configuration +[id="extensions-infinispan-usage"] +== Usage +[id="extensions-infinispan-usage-infinispan-client-configuration"] +=== Infinispan client configuration + +You can configure Camel Infinispan in one of two ways. + +1. Using the relevant Camel Infinispan xref:{cq-camel-components}::infinispan-component.adoc#_component_options[component & endpoint options] + +2. Using the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties]. + +More details about these two configuration methods is described below. + +[id="extensions-infinispan-usage-camel-infinispan-component-and-endpoint-configuration"] +=== Camel Infinispan component and endpoint configuration + +When using 'pure' Camel Infinispan component and endpoint configuration (I.e where's there's no `quarkus.infinispan-client` configuration set), you *must* disable generation of the default Quarkus Infinispan `RemoteCacheManager` bean by adding the following configuration to `application.properties`. + +[source,properties] + +quarkus.infinispan-client.devservices.create-default-client=false + + +If you wish to take advantage of https://quarkus.io/guides/infinispan-dev-services[Quarkus Dev Services for Infinispan], the Camel Infinispan component can be configured as follows in `application.properties`. + +[source,properties] + +# dev / test mode Quarkus Infinispan Dev services configuration +quarkus.infinispan-client.devservices.port=31222 +%dev,test.camel.component.infinispan.username=admin +%dev,test.camel.component.infinispan.password=password +%dev,test.camel.component.infinispan.secure=true +%dev,test.camel.component.infinispan.hosts=localhost:31222 + +# Example prod mode configuration +%prod.camel.component.infinispan.username=prod-user +%prod.camel.component.infinispan.password=prod-password +%prod.camel.component.infinispan.secure=true +%prod.camel.component.infinispan.hosts=infinispan.prod:11222 + -[id="extensions-infinispan-configuration-infinispan-client-configuration"] -=== Infinispan Client Configuration +[id="extensions-infinispan-usage-quarkus-infinispan-configuration"] +=== Quarkus Infinispan configuration -You can either configure the Infinispan client via the relevant Camel Infinispan component & endpoint options, or you -may use the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties]. +When using the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties], the Quarkus Infinispan extensions creates and manages a `RemoteCacheManager` bean. -Note that if you choose to use Quarkus Infinispan configuration properties, you *must* add an injection point for the `RemoteCacheManager` in order for it to be discoverable by the Camel Infinispan component. For example: +The bean will get automatically autowired into the Camel Infinispan component on application startup. + +Note that to materialize the `RemoteCacheManager` beans, you *must* add injection points for them. For example: [source,java] @@ -73,10 +112,12 @@ public class Routes extends RouteBuilder { // Route configuration here... } } - +[id="extensions-infinispan-additional-camel-quarkus-configuration"] +== Additional Camel Quarkus configuration + [id="extensions-infinispan-configuration-camel-infi
(camel-quarkus) branch dependabot/maven/com.mycila-license-maven-plugin-4.5 deleted (was 6b48cd14c9)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/com.mycila-license-maven-plugin-4.5 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 6b48cd14c9 Bump com.mycila:license-maven-plugin from 4.3 to 4.5 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-36235f1b87 deleted (was 6fbca04)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-36235f1b87 in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 6fbca04 Bump the maven group across 21 directories with 1 update The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus-examples) branch camel-quarkus-main updated: Update maven plugins and third party dependencies
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new 150c990 Update maven plugins and third party dependencies 150c990 is described below commit 150c9900eaec38cf0194d4164af68eae0726bf1c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 07:21:19 2024 +0100 Update maven plugins and third party dependencies Bumps the maven group with 1 update in the /aws-lambda directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /cluster-leader-election directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /cxf-soap directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /file-bindy-ftp directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /file-split-log-xml directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /health directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /http-log directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /jdbc-datasource directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /jms-jpa directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /jpa-idempotent-repository directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /jta-jpa directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /kafka directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /kamelet-chucknorris directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /message-bridge directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /observability directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /platform-http-security-keycloak directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /rest-json directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /timer-log directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /timer-log-kotlin directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /timer-log-main directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Bumps the maven group with 1 update in the /vertx-websocket-chat directory: [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin). Updates `com.mycila:license-maven-plugin` from 4.4 to 4.5 - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.4...license-maven-plugin-4.5) Updates `com.mycila:license-maven-plugin` from 4.4 to 4.5 - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.4...license-maven-plugin-4.5) Updates `com.mycila:license-maven-plugin` from 4.4 to 4.5 - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.4...license-maven-plugin-4.5) Updates `com.mycila:license-maven-plugin` from 4.4 to 4.5 - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.4...license-maven-plugin-4.5) Updates `com.mycila:license-maven-plugin` from 4.4 to 4.5 - [Commits](https://github.com/mathieu
(camel-quarkus) branch camel-main updated (5a6446c3e1 -> 337f09e6ee)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 5a6446c3e1 Upgrade Camel to 4.7.0 add 12076b1f12 Regen SBOM from commit a7b0865888162af41d1128525975dde5bcc9ac61 (#6079) new 337f09e6ee Upgrade Camel to 4.7.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5a6446c3e1) \ N -- N -- N refs/heads/camel-main (337f09e6ee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-quarkus-sbom/camel-quarkus-sbom.json | 21246 +-- camel-quarkus-sbom/camel-quarkus-sbom.xml | 17625 +++--- 2 files changed, 18514 insertions(+), 20357 deletions(-)
(camel-quarkus) branch camel-main updated (bd63b62ee2 -> 5a6446c3e1)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard bd63b62ee2 Upgrade Camel to 4.7.0 new 5a6446c3e1 Upgrade Camel to 4.7.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bd63b62ee2) \ N -- N -- N refs/heads/camel-main (5a6446c3e1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: extensions/management/deployment/pom.xml | 4 extensions/management/runtime/pom.xml| 4 2 files changed, 8 deletions(-)
(camel-quarkus) branch camel-main updated (c24a8df2d6 -> bd63b62ee2)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard c24a8df2d6 Rebased + generated discard 9072cc991b Fixed azure due to version update discard 50e056b235 Fixed dropboc due to version change discard c331a4103d Add cli-connector support for Camel JBang runtime=quarkus discard 0bfaa84e3c Revert "Disable microprofile-fault-tolerance testing due to #5995" discard 7b5870cb37 Upgrade Camel to 4.6.0 add af662f7dd2 Upgrade Camel to 4.6.0 add bc97634347 Revert "Disable microprofile-fault-tolerance testing due to #5995" add 65acc966ed Add cli-connector support for Camel JBang runtime=quarkus add 674c6c4c2b Align container image versions with Camel & Quarkus add a7b0865888 Add GitHub Action to report test failures in the workflow summary new bd63b62ee2 Upgrade Camel to 4.7.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c24a8df2d6) \ N -- N -- N refs/heads/camel-main (bd63b62ee2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/actions/test-summary-report/action.yaml| 91 +++ .github/workflows/camel-master-cron.yaml | 50 +- .github/workflows/ci-build.yaml| 50 +- .github/workflows/quarkus-master-cron.yaml | 50 +- docs/antora.yml| 2 +- .../paho/mqtt5/it/PahoMqtt5TestResource.java | 4 +- .../src/test/resources/mosquitto-no-auth.conf | 3 + pom.xml| 18 +- poms/bom/src/main/generated/flattened-full-pom.xml | 688 ++--- .../src/main/generated/flattened-reduced-pom.xml | 688 ++--- .../generated/flattened-reduced-verbose-pom.xml| 688 ++--- 11 files changed, 1286 insertions(+), 1046 deletions(-) create mode 100644 .github/actions/test-summary-report/action.yaml create mode 100644 integration-tests/paho-mqtt5/src/test/resources/mosquitto-no-auth.conf
(camel-quarkus) branch main updated: Add GitHub Action to report test failures in the workflow summary
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new a7b0865888 Add GitHub Action to report test failures in the workflow summary a7b0865888 is described below commit a7b0865888162af41d1128525975dde5bcc9ac61 Author: James Netherton AuthorDate: Wed May 8 07:34:46 2024 +0100 Add GitHub Action to report test failures in the workflow summary --- .github/actions/test-summary-report/action.yaml | 91 + .github/workflows/camel-master-cron.yaml| 50 +- .github/workflows/ci-build.yaml | 50 +- .github/workflows/quarkus-master-cron.yaml | 50 +- 4 files changed, 238 insertions(+), 3 deletions(-) diff --git a/.github/actions/test-summary-report/action.yaml b/.github/actions/test-summary-report/action.yaml new file mode 100644 index 00..2b76bf99b0 --- /dev/null +++ b/.github/actions/test-summary-report/action.yaml @@ -0,0 +1,91 @@ +# +# 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. +# + +name: 'Test Summary Report' +description: 'Parses JUnit test reports and publishes them to the GitHub workflow summary' +inputs: + test-report-xml-base-dir: +description: 'The base directory from which to search for JUnit XML reports' +required: true +default: '.' + test-report-xml-includes: +description: 'The path glob for files to examine when generating the test report summary' +required: true +default: '**/target/*-reports/TEST-*.xml' + +runs: + using: "composite" + steps: +- name: Setup Node + uses: actions/setup-node@v4 + with: +node-version: 20 +- name: Install script dependencies + shell: bash + run: | +npm install junit2json +- name: Generate test summary + uses: actions/github-script@v7 + with: +script: | + const fs = require('fs'); + const junit = require('junit2json'); + const testReportGlobPattern = "${{ inputs.test-report-xml-base-dir }}/${{ inputs.test-report-xml-includes }}".replace(/\.+\/+/g, "") + const summaryData = []; + + // Configure test summary table headers + summaryData.push([ +{data: 'Test Class', header: true}, +{data: 'Test Name', header: true}, +{data: 'Failure', header: true}, +{data: 'Details', header: true} + ]); + + // Iterate and parse surefire / failsafe reports and use the info to build the summary + const globber = await glob.create(testReportGlobPattern); + for await (const reportFile of globber.globGenerator()) { +const file = fs.readFileSync(reportFile); +const report = junit.parse(file).then((report) => { + if (report.errors > 0 || report.failures > 0) { +report.testcase.forEach((testCase) => { + if (testCase.failure !== undefined) { +const shortClassName = `${testCase.classname.substring(testCase.classname.lastIndexOf('.') + 1)}`; +const className = `${shortClassName}\n${testCase.classname}`; +const details = `View\n${testCase.failure[0].inner}`; +let testName = `${testCase.name}`; +if (testCase.length > 25) { + testName = `View\n${testCase.name}`; +} + +let message = `${testCase.failure[0].message}`; +if (message.length > 50) { + message = `View\n${message}`; +} +summaryData.push([className, testName, message, details]); + } +}); + } +}); + } + + // Write the summary data if there were test failures + if (summaryData.length > 1) { +await core.summary + .addHeading("Test Failures", "3") +
(camel-quarkus) branch main updated (65acc966ed -> 674c6c4c2b)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 65acc966ed Add cli-connector support for Camel JBang runtime=quarkus add 674c6c4c2b Align container image versions with Camel & Quarkus No new revisions were added by this update. Summary of changes: .../component/paho/mqtt5/it/PahoMqtt5TestResource.java | 4 +++- .../paho-mqtt5/src/test/resources/mosquitto-no-auth.conf | 3 +++ pom.xml| 14 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 integration-tests/paho-mqtt5/src/test/resources/mosquitto-no-auth.conf
(camel-quarkus) 03/03: Add cli-connector support for Camel JBang runtime=quarkus
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 65acc966edf863c91bffd896ffc58fff01f16284 Author: James Netherton AuthorDate: Wed May 1 14:30:03 2024 +0100 Add cli-connector support for Camel JBang runtime=quarkus --- .../pages/reference/extensions/cli-connector.adoc | 19 ++ extensions-jvm/cli-connector/deployment/pom.xml| 6 +++ .../deployment/CliConnectorProcessor.java | 25 .../deployment/CliConnectorDisabledTest.java | 43 + .../deployment/CliConnectorEnabledTest.java| 44 ++ .../cli/connector/CamelCliConnectorConfig.java | 30 +++ .../cli/connector/CamelCliConnectorRecorder.java | 32 .../cli/connector/QuarkusCliConnectorFactory.java | 27 + .../cli/connector/QuarkusLocalCliConnector.java| 38 +++ 9 files changed, 264 insertions(+) diff --git a/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc b/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc index 536be15ea0..61c3634c42 100644 --- a/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc @@ -39,3 +39,22 @@ Please refer to the above link for usage and configuration details. 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-cli-connector-additional-camel-quarkus-configuration"] +== Additional Camel Quarkus configuration + +[width="100%",cols="80,5,15",options="header"] +|=== +| Configuration property | Type | Default + + +|icon:lock[title=Fixed at build time] [[quarkus.camel.cli.enabled]]`link:#quarkus.camel.cli.enabled[quarkus.camel.cli.enabled]` + +Sets whether to enable Camel CLI Connector support. +| `boolean` +| `true` +|=== + +[.configuration-legend] +{doc-link-icon-lock}[title=Fixed at build time] Configuration property fixed at build time. All other configuration properties are overridable at runtime. + diff --git a/extensions-jvm/cli-connector/deployment/pom.xml b/extensions-jvm/cli-connector/deployment/pom.xml index 37c9ba9e97..dfb39cb1eb 100644 --- a/extensions-jvm/cli-connector/deployment/pom.xml +++ b/extensions-jvm/cli-connector/deployment/pom.xml @@ -46,6 +46,12 @@ org.apache.camel.quarkus camel-quarkus-cli-connector + + +io.quarkus +quarkus-junit5-internal +test + diff --git a/extensions-jvm/cli-connector/deployment/src/main/java/org/apache/camel/quarkus/component/cli/connector/deployment/CliConnectorProcessor.java b/extensions-jvm/cli-connector/deployment/src/main/java/org/apache/camel/quarkus/component/cli/connector/deployment/CliConnectorProcessor.java index 0edcf224df..dcad85e99d 100644 --- a/extensions-jvm/cli-connector/deployment/src/main/java/org/apache/camel/quarkus/component/cli/connector/deployment/CliConnectorProcessor.java +++ b/extensions-jvm/cli-connector/deployment/src/main/java/org/apache/camel/quarkus/component/cli/connector/deployment/CliConnectorProcessor.java @@ -16,14 +16,23 @@ */ package org.apache.camel.quarkus.component.cli.connector.deployment; +import java.util.function.BooleanSupplier; + +import io.quarkus.builder.Version; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildSteps; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; +import org.apache.camel.quarkus.component.cli.connector.CamelCliConnectorConfig; +import org.apache.camel.quarkus.component.cli.connector.CamelCliConnectorRecorder; import org.apache.camel.quarkus.core.JvmOnlyRecorder; +import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem; +import org.apache.camel.spi.CliConnectorFactory; import org.jboss.logging.Logger; +@BuildSteps(onlyIf = CliConnectorProcessor.CliConnectorEnabled.class) class CliConnectorProcessor { private static final Logger LOG = Logger.getLogger(CliConnectorProcessor.class); @@ -34,6 +43,14 @@ class CliConnectorProcessor { return new FeatureBuildItem(FEATURE); } +@BuildStep +@Record(value = ExecutionTime.STATIC_INIT) +CamelBeanBuildItem camelBeanBuildItem(CamelCliConnectorRecorder recorder) { +return new CamelBeanBuildItem("quarkusCliConnectorFactory", +CliConnectorFactory.class.getName(), +recorder.createCliConnectorFactory(Version.getVersion())); +} + /** * Remove this onc
(camel-quarkus) 02/03: Revert "Disable microprofile-fault-tolerance testing due to #5995"
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit bc9763434794119ff7628af6facbad7d160a31eb Author: James Netherton AuthorDate: Wed Apr 17 12:57:18 2024 +0100 Revert "Disable microprofile-fault-tolerance testing due to #5995" This reverts commit 17a559652d5eca26974e6d89f8af567c5e85a16f. --- .../foundation/core-fault-tolerance/pom.xml| 2 -- .../faulttolerance/it/CoreFaultToleranceIT.java| 2 -- .../faulttolerance/it/CoreFaultToleranceTest.java | 2 -- integration-tests/foundation-grouped/pom.xml | 17 ++--- integration-tests/microprofile/pom.xml | 40 +++--- .../MicroprofileFaultToleranceIT.java | 2 -- .../MicroprofileFaultToleranceTest.java| 2 -- pom.xml| 2 -- 8 files changed, 26 insertions(+), 43 deletions(-) diff --git a/integration-test-groups/foundation/core-fault-tolerance/pom.xml b/integration-test-groups/foundation/core-fault-tolerance/pom.xml index fbdc601265..2e116bcd35 100644 --- a/integration-test-groups/foundation/core-fault-tolerance/pom.xml +++ b/integration-test-groups/foundation/core-fault-tolerance/pom.xml @@ -59,7 +59,6 @@ - virtualDependencies diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java index a05c81faf2..76f553a17b 100644 --- a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java +++ b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.core.faulttolerance.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/5995;) @QuarkusIntegrationTest public class CoreFaultToleranceIT extends CoreFaultToleranceTest { } diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java index 6ccdcf4364..6aaa60aaf1 100644 --- a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java +++ b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java @@ -17,13 +17,11 @@ package org.apache.camel.quarkus.core.faulttolerance.it; import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.is; -@Disabled("https://github.com/apache/camel-quarkus/issues/5995;) @QuarkusTest public class CoreFaultToleranceTest { diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml index 01e5bf6155..f4c7cecd45 100644 --- a/integration-tests/foundation-grouped/pom.xml +++ b/integration-tests/foundation-grouped/pom.xml @@ -112,12 +112,10 @@ org.apache.camel.quarkus camel-quarkus-log - org.apache.camel.quarkus camel-quarkus-mock @@ -214,8 +212,6 @@ ${maven.multiModuleProjectDirectory}/integration-test-groups/foundation ${project.basedir} src/main/resources/application.properties - - core-fault-tolerance @@ -456,6 +452,19 @@ + +org.apache.camel.quarkus + camel-quarkus-microprofile-fault-tolerance-deployment +${project.version} +pom +test + + +* +* + + + org.apache.camel.quarkus camel-quarkus-mock-deployment diff --git a/integration-tests/mic
(camel-quarkus) branch main updated (60a66d89ff -> 65acc966ed)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 60a66d89ff Increase Xmx to 4600m for initial-mvn-install job new af662f7dd2 Upgrade Camel to 4.6.0 new bc97634347 Revert "Disable microprofile-fault-tolerance testing due to #5995" new 65acc966ed Add cli-connector support for Camel JBang runtime=quarkus The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: catalog/pom.xml|4 +- docs/antora.yml|2 +- .../{langchain-chat.yml => langchain4j-chat.yml} |6 +- ...n-embeddings.yml => langchain4j-embeddings.yml} |6 +- docs/modules/ROOT/examples/components/log.yml |4 +- docs/modules/ROOT/examples/others/js-dsl.yml |2 +- docs/modules/ROOT/examples/others/jsh-dsl.yml |2 +- docs/modules/ROOT/nav.adoc |4 +- .../pages/reference/extensions/cli-connector.adoc | 19 + .../ROOT/pages/reference/extensions/js-dsl.adoc|6 +- .../ROOT/pages/reference/extensions/jsh-dsl.adoc |6 +- .../{langchain-chat.adoc => langchain4j-chat.adoc} | 12 +- ...embeddings.adoc => langchain4j-embeddings.adoc} | 12 +- .../ROOT/pages/reference/extensions/log.adoc |6 +- extensions-jvm/cli-connector/deployment/pom.xml|6 + .../deployment/CliConnectorProcessor.java | 25 + .../deployment/CliConnectorDisabledTest.java | 41 +- .../deployment/CliConnectorEnabledTest.java| 44 + .../cli/connector/CamelCliConnectorConfig.java | 17 +- .../cli/connector/CamelCliConnectorRecorder.java | 26 +- .../cli/connector/QuarkusCliConnectorFactory.java | 17 +- .../cli/connector/QuarkusLocalCliConnector.java| 42 +- .../deployment/pom.xml |6 +- .../chat/deployment/LangchainChatProcessor.java|2 +- .../{langchain-chat => langchain4j-chat}/pom.xml |2 +- .../runtime/pom.xml|6 +- .../main/resources/META-INF/quarkus-extension.yaml |2 +- .../deployment/pom.xml |6 +- .../deployment/LangchainEmbeddingsProcessor.java |2 +- .../pom.xml|2 +- .../runtime/pom.xml|6 +- .../main/resources/META-INF/quarkus-extension.yaml |2 +- extensions-jvm/pom.xml |4 +- .../deployment/AzureCoreSupportProcessor.java | 14 +- extensions-support/azure-core/runtime/pom.xml |5 - ...AbstractClientApplicationBaseSubstitutions.java | 73 - .../runtime/graal/SwaggerSubstitutions.java| 44 + extensions/arangodb/deployment/pom.xml |4 + .../arangodb/deployment/ArangodbProcessor.java |6 + extensions/arangodb/runtime/pom.xml|4 + .../dropbox/deployment/DropboxProcessor.java |9 +- .../main/resources/META-INF/quarkus-extension.yaml |1 + .../main/resources/META-INF/quarkus-extension.yaml |1 + .../main/resources/META-INF/quarkus-extension.yaml |2 +- .../component/qute/QuteComponentConfigurer.java|2 + .../component/qute/QuteEndpointConfigurer.java |2 + .../component/qute/QuteEndpointUriFactory.java |2 + .../openapi/deployment/RestOpenapiProcessor.java | 66 - extensions/rest-openapi/runtime/pom.xml|5 - .../LoadingMessageSourceProviderSubstitutions.java | 34 - .../foundation/core-fault-tolerance/pom.xml|2 - .../faulttolerance/it/CoreFaultToleranceIT.java|2 - .../faulttolerance/it/CoreFaultToleranceTest.java |2 - .../README.adoc|0 .../{langchain-chat => langchain4j-chat}/pom.xml |6 +- .../langchain/chat/it/LangchainChatResource.java |6 +- .../component/langchain/chat/it/OllamaRoute.java |6 +- .../langchain/chat/it/LangchainChatTest.java |6 +- .../langchain/chat/it/OllamaTestResource.java |0 .../test/resources/mappings/multipleMessages.json |0 .../src/test/resources/mappings/promptMessage.json |0 .../src/test/resources/mappings/simpleMessage.json |0 .../pom.xml|6 +- .../embeddings/it/LangchainEmbeddingsResource.java |6 +- .../embeddings/it/LangchainEmbeddingsTest.java |2 +- integration-tests-jvm/pom.xml |4 +- ...portCustomTypeConverterBulkConverterLoader.java |5 +- .../converters/MyLoaderConverterLoader.java|6 +- .../quarkus/component/as2/it/As2Resource.jav
(camel-quarkus) branch main updated (12aabbb84b -> 60a66d89ff)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 12aabbb84b Fix support-swagger class name typo SupporSwaggerProcessor -> SupporSwaggerProcessor add 60a66d89ff Increase Xmx to 4600m for initial-mvn-install job No new revisions were added by this update. Summary of changes: .github/workflows/camel-master-cron.yaml | 2 +- .github/workflows/ci-build.yaml| 2 +- .github/workflows/quarkus-master-cron.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(camel-quarkus-examples) branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-146909a2ed deleted (was 7c2f2e6)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-146909a2ed in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git was 7c2f2e6 Bump the maven group across 21 directories with 3 updates The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.