Skip to content

Commit cd83485

Browse files
author
Dominik Grenz
committed
Merge branch 'main' into MUXDBS-101-adjustments
2 parents c9eeb82 + 5829aa1 commit cd83485

File tree

16 files changed

+1621
-78
lines changed

16 files changed

+1621
-78
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
build-image: false
2424
- app-path: ticketing-eventing/eventing-service
2525
build-image: true
26+
- app-path: ticketing-eventing/handler-core
27+
build-image: false
2628

2729
steps:
2830
- uses: it-at-m/lhm_actions/action-templates/actions/action-checkout@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20

.github/workflows/maven-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
- personalization-service
2020
- ticketing-eai/api-client-internal
2121
- ticketing-eventing/eventing-service
22+
- ticketing-eventing/handler-core
2223

2324
jobs:
2425
release-maven:
@@ -42,7 +43,7 @@ jobs:
4243
GPG_PRIVATE_KEY: ${{ secrets.gpg_private_key }}
4344

4445
build-image:
45-
if: inputs.app-path != 'ticketing-eai/api-client-internal'
46+
if: ${{ !contains('ticketing-eai/api-client-internal, ticketing-eventing/handler-core', github.event.inputs.app-path) }}
4647
runs-on: ubuntu-latest
4748
needs: release-maven
4849
steps:
@@ -67,3 +68,4 @@ jobs:
6768
artifact-name: ${{ needs.release-maven.outputs.ARTIFACT_NAME }}
6869
tag-name: ${{ inputs.app-path }}-${{ github.event.inputs.releaseVersion }}
6970
artifact-path: ${{ github.event.inputs.app-path }}/target/*.jar
71+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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.2.0-SNAPSHOT</version>
15+
<version>0.4.0-SNAPSHOT</version>
1616
<url>https://github.com/it-at-m/dbs</url>
1717
<licenses>
1818
<license>

ticketing-eai/api-client-internal/src/main/java/de/muenchen/oss/dbs/ticketing/eai/client/ApiClientAutoConfiguration.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package de.muenchen.oss.dbs.ticketing.eai.client;
22

33
import de.muenchen.oss.dbs.ticketing.eai.client.api.ArticlesApi;
4+
import de.muenchen.oss.dbs.ticketing.eai.client.api.AttachmentsApi;
45
import de.muenchen.oss.dbs.ticketing.eai.client.api.OrganizationsApi;
56
import de.muenchen.oss.dbs.ticketing.eai.client.api.TicketsApi;
67
import de.muenchen.oss.dbs.ticketing.eai.client.api.UsersApi;
@@ -46,6 +47,12 @@ public ArticlesApi articlesApi(final ApiClient apiClient) {
4647
return new ArticlesApi(apiClient);
4748
}
4849

50+
@Bean
51+
@ConditionalOnMissingBean
52+
public AttachmentsApi attachmentsApi(final ApiClient apiClient) {
53+
return new AttachmentsApi(apiClient);
54+
}
55+
4956
@Bean
5057
@ConditionalOnMissingBean
5158
public OrganizationsApi organizationsApi(final ApiClient apiClient) {

0 commit comments

Comments
 (0)