Skip to content

Commit 2bb3c00

Browse files
committed
Merge branch 'axon-kotlin-4.11.x'
2 parents d69cca0 + 18a6b96 commit 2bb3c00

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

.github/dependabot.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ updates:
1010
labels:
1111
- "Type: Dependency Upgrade"
1212
- "Priority 1: Must"
13-
milestone: 9
13+
milestone: 10
1414
reviewers:
1515
- "AxonFramework/framework-developers"
1616
groups:
@@ -29,7 +29,7 @@ updates:
2929
labels:
3030
- "Type: Dependency Upgrade"
3131
- "Priority 1: Must"
32-
milestone: 9
32+
milestone: 10
3333
reviewers:
3434
- "AxonFramework/framework-developers"
3535
groups:

.github/workflows/dependabot-automation.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424
PR_URL: ${{github.event.pull_request.html_url}}
2525
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2626

27-
# dependabot-auto-merge:
28-
# runs-on: ubuntu-latest
29-
# if: ${{ github.actor == 'dependabot[bot]' }}
30-
# steps:
31-
# - name: Retrieve Dependabot metadata
32-
# id: metadata
33-
# uses: dependabot/fetch-metadata@v2
34-
# with:
35-
# github-token: "${{ secrets.GITHUB_TOKEN }}"
36-
#
37-
# - name: Auto-merge Pull Request
38-
# if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
39-
# run: gh pr merge --auto --merge "$PR_URL"
40-
# env:
41-
# PR_URL: ${{github.event.pull_request.html_url}}
42-
# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
27+
dependabot-auto-merge:
28+
runs-on: ubuntu-latest
29+
if: ${{ github.actor == 'dependabot[bot]' }}
30+
steps:
31+
- name: Retrieve Dependabot metadata
32+
id: metadata
33+
uses: dependabot/fetch-metadata@v2
34+
with:
35+
github-token: "${{ secrets.GITHUB_TOKEN }}"
36+
37+
- name: Auto-merge Pull Request
38+
if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
39+
run: gh pr merge --auto --merge "$PR_URL"
40+
env:
41+
PR_URL: ${{github.event.pull_request.html_url}}
42+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

coverage-report/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.axonframework.extensions.kotlin</groupId>
2323
<artifactId>axon-kotlin-parent</artifactId>
24-
<version>4.11.1-SNAPSHOT</version>
24+
<version>4.11.2-SNAPSHOT</version>
2525
</parent>
2626

2727
<artifactId>axon-coverage-report</artifactId>

kotlin-test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<artifactId>axon-kotlin-parent</artifactId>
2626
<groupId>org.axonframework.extensions.kotlin</groupId>
27-
<version>4.11.1-SNAPSHOT</version>
27+
<version>4.11.2-SNAPSHOT</version>
2828
</parent>
2929

3030
<artifactId>axon-kotlin-test</artifactId>

kotlin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.axonframework.extensions.kotlin</groupId>
2626
<artifactId>axon-kotlin-parent</artifactId>
27-
<version>4.11.1-SNAPSHOT</version>
27+
<version>4.11.2-SNAPSHOT</version>
2828
</parent>
2929

3030
<artifactId>axon-kotlin</artifactId>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<groupId>org.axonframework.extensions.kotlin</groupId>
2424
<artifactId>axon-kotlin-parent</artifactId>
25-
<version>4.11.1-SNAPSHOT</version>
25+
<version>4.11.2-SNAPSHOT</version>
2626
<packaging>pom</packaging>
2727

2828
<modules>

0 commit comments

Comments
 (0)