Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/maven/com.github.dasniko-testc…
Browse files Browse the repository at this point in the history
…ontainers-keycloak-3.4.0
  • Loading branch information
eromano authored Aug 5, 2024
2 parents 75c827f + 9af81d7 commit 0d1c35d
Show file tree
Hide file tree
Showing 177 changed files with 1,503 additions and 313 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand Down Expand Up @@ -98,6 +98,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/create-github-prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
- run: touch release.yaml

- uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
release-descriptor: release.yaml
project: activiti
tag: ${{ steps.resolve-versions.outputs.activiti-tag }}

- uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
release-descriptor: release.yaml
project: activitiCloud
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
- name: Check dependabot build
uses: Activiti/Activiti/.github/actions/check-ext-build@4db084fcbb13a288f3b66ac08fc50a5ab7f144ed # 8.0.0-alpha.10
- name: pre-commit
uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
skip_checkout: true
- name: Ensure SHA pinned actions
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@ba37328d4ea95eaf8b3bd6c6cef308f709a5f2ec # v3.0.3
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@b88cd0aad2c36a63e42c71f81cb1958fed95ac87 # v3.0.10

build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
GITHUB_PR_NUMBER=PR-${{ github.event.pull_request.number }}
echo "version=0.0.1-${GITHUB_PR_NUMBER}-SNAPSHOT" >> $GITHUB_OUTPUT
- uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
id: update-pom-to-next-version
with:
version: ${{ steps.resolve-override-version.outputs.version }}
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
run: find . -name TEST-*.xml -exec grep -h testcase {} \; | awk -F '"' '{printf("%s#%s() - %.3fms\n", $4, $2, $6); }' | sort -n -k 3 | tail -20

- name: Login to DockerHub
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
version: v3.5.2

- name: Set up rancher
uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
url: ${{ secrets.RANCHER2_URL }}
access-key: ${{ secrets.RANCHER2_ACCESS_KEY }}
Expand Down Expand Up @@ -353,7 +353,7 @@ jobs:
MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}

- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
username: ${{ secrets.BOT_GITHUB_USERNAME }}
add-options: -u
Expand All @@ -376,7 +376,7 @@ jobs:
DEVELOPMENT_BRANCH: ${{ github.ref_name }}
steps:
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
- uses: Alfresco/alfresco-build-tools/.github/actions/jx-updatebot-pr@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/jx-updatebot-pr@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
version: ${{ needs.build.outputs.version }}
auto-merge: 'true'
Expand Down Expand Up @@ -413,12 +413,12 @@ jobs:
yq -i e '.activiti-cloud-connector.image.tag = env(VERSION)' values.yaml
yq -i e '.activiti-cloud-identity-adapter.image.tag = env(VERSION)' values.yaml
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
- name: Update helm docs
working-directory: ${{ env.FULL_CHART_DIR}}
run: helm-docs

- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
username: ${{ secrets.BOT_GITHUB_USERNAME }}
add-options: -u
Expand All @@ -441,7 +441,7 @@ jobs:
if: always() && failure() && github.event_name == 'push'
steps:
- name: Slack Notification
uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
channel-id: 'eng-hxp-studio-activiti-gh-notifs'
token: ${{ secrets.SLACK_NOTIFICATION_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/pr-closed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
version: v1.19.6

- name: Set up rancher
uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
url: ${{ secrets.RANCHER2_URL }}
access-key: ${{ secrets.RANCHER2_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/versions-propagation-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
versions-propagation-auto-merge:
runs-on: ubuntu-latest
steps:
- uses: Alfresco/alfresco-build-tools/.github/actions/automate-propagation@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
- uses: Alfresco/alfresco-build-tools/.github/actions/automate-propagation@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0
with:
auto-merge-token: ${{ secrets.BOT_GITHUB_TOKEN }}
approval-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .jx/updatebot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: UpdateConfig
spec:
rules:
- urls:
- https://github.com/Alfresco/alfresco-process
- https://github.com/Alfresco/hxp-process-services
- https://github.com/Alfresco/alfresco-process-sdk
reusePullRequest: true
changes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>identity-adapter-acceptance-tests</artifactId>
<name>Activiti Cloud :: Acceptance Scenarios Identity Adapter</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>multiple-runtime-acceptance-tests</artifactId>
<name>Activiti Cloud :: Acceptance Scenarios Multi-Runtime</name>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-acceptance-scenarios/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-build</relativePath>
</parent>
<artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>runtime-acceptance-tests</artifactId>
<name>Activiti Cloud :: Acceptance Scenarios Runtime</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>security-policies-acceptance-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-tests-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-acceptance-tests-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-acceptance-tests-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-tests-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-acceptance-tests-dependencies</artifactId>
<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-acceptance-tests-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-acceptance-tests-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-acceptance-tests-shared</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-acceptance-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-build</relativePath>
</parent>
<artifactId>activiti-cloud-acceptance-tests-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-api/activiti-cloud-api-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-api/activiti-cloud-api-events/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-events</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-model-shared-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-api/activiti-cloud-api-model-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-model-shared</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-process-model-impl</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-process-model</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-task-model-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-api/activiti-cloud-api-task-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-api-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-api-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-api-task-model</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions activiti-cloud-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-build</relativePath>
</parent>
<artifactId>activiti-cloud-api</artifactId>
<name>Activiti Cloud :: Runtime API Parent</name>
<packaging>pom</packaging>
<properties>
<activiti.version>8.6.0-alpha.2</activiti.version>
<activiti.version>8.7.0-alpha.11</activiti.version>
</properties>
<modules>
<module>activiti-cloud-api-dependencies</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-audit-service-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-audit-dependencies</artifactId>
<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-audit-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-audit-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-services-audit-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-audit-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-audit-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-services-audit-jpa</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-audit-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-audit-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-services-audit-liquibase</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-audit-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-audit-dependencies</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-audit-dependencies</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-audit-dependencies</relativePath>
</parent>
<artifactId>activiti-cloud-starter-audit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-audit-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
<relativePath>../activiti-cloud-build</relativePath>
</parent>
<artifactId>activiti-cloud-audit-service-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>8.6.0-SNAPSHOT</version>
<version>8.7.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-build-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>Activiti Cloud :: Dependencies Parent</name>
<properties>
<spring-cloud.version>2023.0.0</spring-cloud.version>
<testcontainers.version>1.19.1</testcontainers.version>
<testcontainers.version>1.20.1</testcontainers.version>
<h2.version>2.2.224</h2.version>
<graphql-java.version>21.3</graphql-java.version>
<postgresql.version>42.7.2</postgresql.version>
Expand Down
Loading

0 comments on commit 0d1c35d

Please sign in to comment.