Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-maschmann committed Nov 10, 2023
2 parents 5d01a1c + 6bdb2b8 commit 76b19d9
Show file tree
Hide file tree
Showing 19 changed files with 32 additions and 43 deletions.
23 changes: 6 additions & 17 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,16 @@ jobs:
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9
cache: 'pip'

- name: Upgrade pip
run: |
# install pip=>20.1 to use "pip cache dir"
python3 -m pip install --upgrade pip
- name: Get pip cache dir
id: pip-cache
run: echo "::set-output name=dir::$(pip cache dir)"

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('./docs/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Install dependencies
run: python3 -m pip install -r ./docs/requirements.txt

Expand All @@ -48,7 +37,7 @@ jobs:
GH_USERNAME: ${{ github.actor }}

- name: Pre-fetch the gh-pages branch
run: git fetch
run: git fetch origin gh-pages --depth=1

- name: Build docs with MkDocs
run: mkdocs build
Expand All @@ -61,13 +50,13 @@ jobs:
# This is for a tagged version
- name: Create a new version of documentation and push to GH pages.
if: startsWith(github.ref, 'refs/tags/')
run: mike deploy ${{ steps.get_tag_name.outputs.TAG_NAME }} stable --push --rebase --update-aliases
run: mike deploy ${{ steps.get_tag_name.outputs.TAG_NAME }} stable --push --update-aliases

- name: Make stable to default.
if: startsWith(github.ref, 'refs/tags/')
run: mike set-default stable --push --rebase
run: mike set-default stable --push

# This is for develop
- name: Deploy latest develop snapshot docs to GH pages.
if: github.ref == 'refs/heads/develop'
run: mike deploy snapshot --push --rebase --update-aliases
run: mike deploy snapshot --push --update-aliases
2 changes: 1 addition & 1 deletion bom/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-root</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions bom/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-root</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -14,10 +14,10 @@
<name>POM / Parent</name>

<properties>
<spring-boot.version>2.7.12</spring-boot.version>
<camunda-7.version>7.18.0</camunda-7.version>
<spring-boot.version>2.7.17</spring-boot.version>
<camunda-7.version>7.19.0</camunda-7.version>
<camunda-bpm-data.version>1.2.8</camunda-bpm-data.version>
<shedlock.version>4.38.0</shedlock.version>
<shedlock.version>4.46.0</shedlock.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion example/axon/flight-axon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/axon/hotel-axon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/axon/reservation-axon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<!-- It is ok to use the extension parent, there is only Kotlin and some managed deps defined there -->
<relativePath>../bom/parent/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion example/spring-cloud/flight-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/spring-cloud/hotel-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/spring-cloud/reservation-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-example-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extension/axon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
12 changes: 6 additions & 6 deletions extension/cockpit-plugin/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extension/cockpit-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extension/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extension/spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extension/spring-cloud-stream/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-parent</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.holunda</groupId>
<artifactId>camunda-bpm-correlate-root</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<url>https://github.com/holunda-io/camunda-bpm-correlate/</url>
Expand Down

0 comments on commit 76b19d9

Please sign in to comment.