Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/github_actions/azure/setup-kub…
Browse files Browse the repository at this point in the history
…ectl-4
  • Loading branch information
eromano authored Jun 18, 2024
2 parents 996c529 + e615391 commit 6317786
Show file tree
Hide file tree
Showing 151 changed files with 2,503 additions and 443 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@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
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@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
with:
release-descriptor: release.yaml
project: activitiCloud
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ 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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
with:
skip_checkout: true
- name: Ensure SHA pinned actions
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
id: update-pom-to-next-version
with:
version: ${{ steps.resolve-override-version.outputs.version }}
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
- 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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
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@692f336894abea26ff555cdef6e098f415c47286 # v5.28.3
with:
auto-merge-token: ${{ secrets.BOT_GITHUB_TOKEN }}
approval-token: ${{ secrets.GITHUB_TOKEN }}
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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-alpha.1</activiti.version>
<activiti.version>8.6.0-alpha.5</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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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
@@ -0,0 +1,3 @@
CREATE INDEX CONCURRENTLY IF NOT EXISTS audit_event_process_instance_id_idx ON audit_event (process_instance_id);
CREATE INDEX CONCURRENTLY IF NOT EXISTS audit_event_app_name_idx ON audit_event (app_name);
CREATE INDEX CONCURRENTLY IF NOT EXISTS audit_event_event_type_idx ON audit_event (event_type);
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,12 @@
splitStatements="true"
stripComments="true"/>
</changeSet>
<changeSet author="activiti-audit" runInTransaction="false" id="alter12-schema-7.17.0" dbms="postgresql">
<sqlFile dbms="postgresql"
encoding="utf8"
path="changelog/12-alter.pg.schema.7.17.0.sql"
relativeToChangelogFile="true"
splitStatements="true"
stripComments="true"/>
</changeSet>
</databaseChangeLog>
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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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.5.0-SNAPSHOT</version>
<version>8.6.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,7 +6,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>8.5.0-SNAPSHOT</version>
<version>8.6.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-build-dependencies-parent</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-build/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-mono-aggregator</artifactId>
<version>8.5.0-SNAPSHOT</version>
<version>8.6.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-build-parent</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-connectors-parent</artifactId>
<version>8.5.0-SNAPSHOT</version>
<version>8.6.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-cloud-connectors-dependencies</artifactId>
<packaging>pom</packaging>
Expand Down
Loading

0 comments on commit 6317786

Please sign in to comment.