diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index aeb0e75a46f8..6d984bb02f63 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -61,7 +61,7 @@ env: jobs: pre-build-checks: - if: github.repository == 'apache/camel-quarkus' + if: github.repository == 'jamesnetherton/camel-quarkus' runs-on: ubuntu-latest outputs: continue-build: ${{ steps.pre-build-checks.outputs.continue-build }} @@ -166,10 +166,6 @@ jobs: - name: Sync Maven properties run: | ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N - - name: Fail if there are uncommitted changes - shell: bash - run: | - [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; } - name: Tar Maven Repo shell: bash run: | @@ -271,6 +267,10 @@ jobs: IFS=, if [[ ${JVM_MODULES[@]} ]]; then + echo "=====" + eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} dependency:tree -pl "${JVM_MODULES[*]}" | grep jackson + echo "=====" + eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \ -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ -Pdocker,ci \ @@ -278,6 +278,10 @@ jobs: fi if [[ ${NATIVE_MODULES[@]} ]]; then + echo "=====" + eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} dependency:tree -pl "${NATIVE_MODULES[*]}" | grep jackson + echo "=====" + eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \ -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ -Dquarkus.native.builder-image.pull=missing \ @@ -285,10 +289,6 @@ jobs: --fail-at-end \ -pl "${NATIVE_MODULES[*]}" fi - - name: Fail if there are uncommitted changes - shell: bash - run: | - [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; git diff; exit 1; } functional-extension-tests: runs-on: ubuntu-latest diff --git a/catalog/pom.xml b/catalog/pom.xml index 522e39830c2d..3acf8ea5411a 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -32,6 +32,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml index cfbf9e9bde85..54193314f912 100644 --- a/extensions-core/pom.xml +++ b/extensions-core/pom.xml @@ -47,6 +47,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index e762d9eae544..a48d90a232e0 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -108,6 +108,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml index 5b3824b220e7..3c5e3dfbd342 100644 --- a/extensions-support/pom.xml +++ b/extensions-support/pom.xml @@ -63,6 +63,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/extensions/pom.xml b/extensions/pom.xml index 9f4712f1fdc8..28a3fa00c89b 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -256,6 +256,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml index 3860e58fb3ed..77003d3df154 100644 --- a/integration-tests-support/pom.xml +++ b/integration-tests-support/pom.xml @@ -60,6 +60,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/pom.xml b/pom.xml index 69914c18e7d6..48b0fc90b28a 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ ${icu4j-version} 2.9.3 ${influx-java-driver-version} - 2.15.3 + 2.16.0 ${jakarta-jms-api-version} ${json-patch-version} ${jodatime2-version} diff --git a/poms/build-parent-it/pom.xml b/poms/build-parent-it/pom.xml index 4fe5a54f4cde..09c0179da6db 100644 --- a/poms/build-parent-it/pom.xml +++ b/poms/build-parent-it/pom.xml @@ -49,6 +49,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + ${quarkus.platform.group-id} ${quarkus.platform.artifact-id} diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml index 1b83d653c188..bd9d2016abef 100644 --- a/poms/build-parent/pom.xml +++ b/poms/build-parent/pom.xml @@ -49,6 +49,13 @@ org.eclipse.transformer ${eclipse-transformer.version} + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + diff --git a/test-framework/pom.xml b/test-framework/pom.xml index 237f2e397f89..d05e0d862fd0 100644 --- a/test-framework/pom.xml +++ b/test-framework/pom.xml @@ -39,6 +39,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + io.quarkus quarkus-bom diff --git a/tooling/pom.xml b/tooling/pom.xml index 81d712996a06..dd4ebabcecc8 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -42,6 +42,13 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + com.google.code.gson gson