diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index aeb0e75a46f8..7e1a365a7d56 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: | @@ -285,10 +281,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/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 +