Skip to content

Commit 1631a45

Browse files
committed
Merge branch 'feat/eventing-handler-core' into feat/eventing-mail-handler
# Conflicts: # .github/labeler.yml # .github/workflows/maven-node-build.yml # .github/workflows/maven-release.yml
2 parents 7b4b995 + e65a3e1 commit 1631a45

File tree

9 files changed

+73
-71
lines changed

9 files changed

+73
-71
lines changed

.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"Component: ticketing-eai":
99
- changed-files:
1010
- any-glob-to-any-file: [ 'ticketing-eai/**' ]
11-
1211
"Component: ticketing-eventing":
1312
- changed-files:
1413
- any-glob-to-any-file: [ 'ticketing-eventing/**' ]

.github/workflows/maven-node-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ jobs:
1616
matrix:
1717
include:
1818
- app-path: personalization-service
19+
build-image: true
1920
- app-path: personalization-webcomponents
21+
build-image: true
2022
- app-path: ticketing-eai/api-client-internal
2123
build-image: false
2224
- app-path: ticketing-eventing/eventing-service
25+
build-image: true
2326
- app-path: ticketing-eventing/handler-core
2427
build-image: false
2528

@@ -35,7 +38,7 @@ jobs:
3538
uses: it-at-m/lhm_actions/action-templates/actions/action-maven-build@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20
3639
with:
3740
app-path: ${{ matrix.app-path }}
38-
- if: github.ref == 'refs/heads/main' && matrix.build-image != 'false'
41+
- if: github.ref == 'refs/heads/main' && matrix.build-image
3942
uses: it-at-m/lhm_actions/action-templates/actions/action-build-image@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20
4043
with:
4144
path: ${{ matrix.app-path }}

.github/workflows/maven-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
GPG_PRIVATE_KEY: ${{ secrets.gpg_private_key }}
4444

4545
build-image:
46-
if: ${{ !contains('ticketing-eai/api-client-internal,ticketing-eventing/handler-core', github.event.inputs.app-path) }}
46+
if: ${{ !contains('ticketing-eai/api-client-internal, ticketing-eventing/handler-core', github.event.inputs.app-path) }}
4747
runs-on: ubuntu-latest
4848
needs: release-maven
4949
steps:

docs/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"@muenchen/prettier-codeformat": "1.0.2",
1717
"markdownlint-cli": "0.45.0",
18-
"mermaid": "11.10.0",
18+
"mermaid": "11.10.1",
1919
"vitepress": "1.6.4",
2020
"vitepress-plugin-mermaid": "2.0.17"
2121
}

personalization-webcomponents/package-lock.json

Lines changed: 59 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

personalization-webcomponents/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dependencies": {
2020
"@muenchen/muc-patternlab-vue": "5.6.2",
2121
"@vueuse/core": "13.6.0",
22-
"vue": "3.5.19",
22+
"vue": "3.5.20",
2323
"sortablejs": "1.15.6",
2424
"sortablejs-vue3": "1.3.0"
2525
},
@@ -39,7 +39,7 @@
3939
"prettier": "3.6.2",
4040
"typescript": "5.9.2",
4141
"vite": "7.1.3",
42-
"vite-plugin-vue-devtools": "8.0.0",
42+
"vite-plugin-vue-devtools": "8.0.1",
4343
"vitest": "3.2.4",
4444
"vue-tsc": "3.0.6"
4545
}

ticketing-eai/api-client-internal/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
77
<version>3.5.4</version>
8-
<relativePath/>
8+
<relativePath />
99
</parent>
1010

1111
<groupId>de.muenchen.oss.dbs.ticketing.eai</groupId>
1212
<artifactId>api-client-internal</artifactId>
1313
<name>api-client-internal</name>
1414
<description>API client for dbs-ticketing-eai internal endpoints</description>
15-
<version>0.1.0-SNAPSHOT</version>
15+
<version>0.2.0-SNAPSHOT</version>
1616
<url>https://github.com/it-at-m/dbs</url>
1717
<licenses>
1818
<license>

ticketing-eventing/handler-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
<!-- Additional required dependencies -->
6969
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version> <!-- Needed to make MapStruct and Lombok work together -->
70-
<ticketing-eai-api-client-internal.version>0.1.0-SNAPSHOT</ticketing-eai-api-client-internal.version>
70+
<ticketing-eai-api-client-internal.version>0.1.0</ticketing-eai-api-client-internal.version>
7171

7272
<!-- Spotless P2 Mirror configuration (e.g. required when using company internal registry -->
7373
<p2.username /> <!-- must be empty, override via Maven settings.xml if needed -->

0 commit comments

Comments
 (0)