Skip to content

Commit 34d7840

Browse files
FabianWilmsFabianWilms
committed
Merge branch 'main' into MUXDBS-104-move-tasks
# Conflicts: # personalization-webcomponents/package-lock.json # personalization-webcomponents/package.json
2 parents 9c99db8 + a05debb commit 34d7840

File tree

63 files changed

+1347
-669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1347
-669
lines changed

‎.github/labeler.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
- head-branch: [ '^feat', '-feature-' ]
33
"Type: Bug":
44
- head-branch: [ '^bug', '-bug-' ]
5-
"Template: personalization-service":
5+
"Component: personalization-service":
66
- changed-files:
77
- any-glob-to-any-file: [ 'personalization-service/**' ]
8+
"Component: personalization-webcomponents":
9+
- changed-files:
10+
- any-glob-to-any-file: [ 'personalization-webcomponents/**' ]
811
"Component: ticketing-eai":
912
- changed-files:
1013
- any-glob-to-any-file: [ 'ticketing-eai/**' ]

‎.github/workflows/pr-checklist.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎bruno/DBS-P13N/APIGW Create Checklist.bru‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
meta {
2+
name: APIGW Create Checklist
3+
type: http
4+
seq: 5
5+
}
6+
7+
post {
8+
url: http://localhost:8083/clients/api/p13n-backend/checklist
9+
body: json
10+
auth: none
11+
}
12+
13+
headers {
14+
Authorization: Bearer
15+
}
16+
17+
body:json {
18+
{
19+
"title": "Test",
20+
"checklistItems": []
21+
}
22+
}

‎bruno/DBS-P13N/Get Checklist with ID.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
get {
8-
url: http://localhost:39146/checklist/d484de4c-2d58-435c-8210-bdb9e00d38f9
8+
url: http://localhost:39146/checklist/123e4567-e89b-12d3-a456-426614174002
99
body: none
1010
auth: inherit
1111
}

‎bruno/DBS-P13N/Get Checklists.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ get {
1111
}
1212

1313
headers {
14-
Authorization: bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJCNV9OZHBVMzlfZl9ZX3pJYnF4WWc2SnhiZDlZazFXSkItUHFrWUpuRFowIn0.eyJleHAiOjE3NTI1NTg2NDYsImlhdCI6MTc1MjU1ODM0NiwiYXV0aF90aW1lIjoxNzUyNTU4MDQ1LCJqdGkiOiI2NGY5Y2IzMi01Njk3LTQwZjEtYjBkMC05ZjQ0OTgxMDYxY2QiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgxMDAvYXV0aC9yZWFsbXMvbG9jYWxfcmVhbG0iLCJhdWQiOlsibG9jYWwiLCJhY2NvdW50Il0sInN1YiI6IjIyMjQxMDJmLWFlMDgtNDNhZi04M2FjLTNkMjA3MjhmNWRhOCIsInR5cCI6IkJlYXJlciIsImF6cCI6ImxvY2FsIiwic2lkIjoiZmY3M2NiYWUtMzAwMi00ODhiLWI3NTEtYzgwNGMwMWQ4ZTJmIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIqIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJkZWZhdWx0LXJvbGVzLWxvY2FsX3JlYWxtIiwib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfSwibG9jYWwiOnsicm9sZXMiOlsid3JpdGVyIl19fSwic2NvcGUiOiJlbWFpbCBsb2NhbF9hdWRpZW5jZSBwcm9maWxlIG9wZW5pZCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoid3JpdGVyIHdyaXRlciIsInByZWZlcnJlZF91c2VybmFtZSI6IndyaXRlciIsImdpdmVuX25hbWUiOiJ3cml0ZXIiLCJmYW1pbHlfbmFtZSI6IndyaXRlciIsImVtYWlsIjoid3JpdGVyQHdyaXRlci5jb20iLCJhdXRob3JpdGllcyI6WyJST0xFX3dyaXRlciJdfQ.FizcVAGEJhkHTy8LPvUD7DA-E_4lsXovFvkesOBFb-sF1AIHsWAgyiziBuGfCOsxJaB-A_q6N1OF5g4In56o5Q8fMILUrzbxD1nXZVOr6Ro1DX35Utuv2bCp7yJJ5PM5WNH4MX4t4XD_4iTikTs-8l87tnd3vfExPFbvKR9aP3GLmE4wDbIP-ghXgAW5JOaXOSGqcAB2xoBaTFxBTtJ_kkfy7wLwVh4gwE9H7zkpVZm3fZum5kuPuJhBZjqWhbGAkwHiENahp6Rs3amMye_S8XOOAgWH3sOjynrtbXr-bbswmPXj4Q9DsVtBZkXH3XxUEGX4ZmxLxW_eBddh7xJaow
14+
Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnS1VSVUdSekxUdGZBRFdQYXdyejhtTE5Jcklqa0hEMFN5ZkYxMkQwQWNFIn0.eyJleHAiOjE3NTc5MjY1NjksImlhdCI6MTc1NzkyNjI2OSwianRpIjoiZGU3Y2ViMDctNmUxZS00NGExLTk2N2QtMGUwNmY3NWY5OTY3IiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MTAwL2F1dGgvcmVhbG1zL2xvY2FsX3JlYWxtIiwiYXVkIjpbImxvY2FsIiwiYWNjb3VudCJdLCJzdWIiOiJjZDk4MDk0MS1lMDcxLTRhODktOGQ5NC1kYTIxMGMwMDgwYzIiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJsb2NhbCIsInNpZCI6IjNmMmNmYzlmLTU4M2YtNGNjNi1iZjZkLWZjY2Y1NzgyY2M4OSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1sb2NhbF9yZWFsbSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX0sImxvY2FsIjp7InJvbGVzIjpbIndyaXRlciJdfX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUgbG9jYWxfYXVkaWVuY2UiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6IndyaXRlciB3cml0ZXIiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ3cml0ZXIiLCJnaXZlbl9uYW1lIjoid3JpdGVyIiwiZmFtaWx5X25hbWUiOiJ3cml0ZXIiLCJlbWFpbCI6IndyaXRlckB3cml0ZXIuY29tIiwiYXV0aG9yaXRpZXMiOlsiUk9MRV93cml0ZXIiXX0.aizX_MHrW3gtVuNOOsiCIUdo51z3af1ov5-5nBM9vjLlYYTjVnjP9qWkI56h9uKZ7eDzzeR6MX8QJ1buAxQ6RipbVWAcvn4XjrAXhGS1UZ8-zHZ9o18mLCj9KUzi6roR7P4If3lNZU5XSi1LWnH_lpkgErTrOm2anTb5tHKS7dgb4Kol1lDc97Epl2RwH7eJ_T5f2oa0tt39QXj2yesqGw9tuNIjMgV7Cc_gYfMS5tKQSDINv44jekYw6--xnvpc5OutdWmBvpTSG7tvHWa6mvw36MB-Fx2iVQfEhu4Gq8dEjZIUB1kCugq62iYlqsj-QkYbu9sP51aDE9hjgbg8tA
1515
}

‎bruno/DBS-P13N/Get UserInfo.bru‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
meta {
2+
name: Get UserInfo
3+
type: http
4+
seq: 5
5+
}
6+
7+
get {
8+
url: http://localhost:8100/auth/realms/local_realm/protocol/openid-connect/userinfo
9+
body: none
10+
auth: inherit
11+
}
12+
13+
headers {
14+
Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnS1VSVUdSekxUdGZBRFdQYXdyejhtTE5Jcklqa0hEMFN5ZkYxMkQwQWNFIn0.eyJleHAiOjE3NTc5MjM3NDAsImlhdCI6MTc1NzkyMzQ0MCwianRpIjoiOTI0ZmQ1YjItNDg1My00NWFkLThmM2MtMTFkOWJkNDYzMmRjIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MTAwL2F1dGgvcmVhbG1zL2xvY2FsX3JlYWxtIiwiYXVkIjpbImxvY2FsIiwiYWNjb3VudCJdLCJzdWIiOiJjZDk4MDk0MS1lMDcxLTRhODktOGQ5NC1kYTIxMGMwMDgwYzIiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJsb2NhbCIsInNpZCI6ImIzMDE3MDIxLTJmMjktNDk3MS05MzBjLWY1MzQyNDg5MTFhMSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1sb2NhbF9yZWFsbSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX0sImxvY2FsIjp7InJvbGVzIjpbIndyaXRlciJdfX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUgbG9jYWxfYXVkaWVuY2UiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6IndyaXRlciB3cml0ZXIiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ3cml0ZXIiLCJnaXZlbl9uYW1lIjoid3JpdGVyIiwiZmFtaWx5X25hbWUiOiJ3cml0ZXIiLCJlbWFpbCI6IndyaXRlckB3cml0ZXIuY29tIiwiYXV0aG9yaXRpZXMiOlsiUk9MRV93cml0ZXIiXX0.Ci27HaA5q8uzdf5jNvdDWdmfvXodeP0vygiz54W11QLvilOkia26NX8zH5pQD2beAkNKU22Iv9H2o2Bg_n5akW6t2RrYnRRfEnsPCcfyaaVQEZWDbHuZDH3VyE9oHuT28UmijMh6pL1gFh96opHFZkpZh3F7vUHiLsz3mABdZV7V-lPTtES8izAvED3GG0wFMrSfH9OuOw3buZ35uGyo-fsFSs9EHuEhAyO-2-_yIRe5Fnkb87Wo1sFaF2OEIzgqFdCgMu6xXV6qCtqBW6sLpFVnJjxyQ8-bolON7qIgDV-kOB0_9P4hGaWgWlVtxUUKiWP4DQ2sRePMj-unQpCawg
15+
}

‎docs/package-lock.json‎

Lines changed: 9 additions & 9 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.11.0",
18+
"mermaid": "11.12.0",
1919
"vitepress": "1.6.4",
2020
"vitepress-plugin-mermaid": "2.0.17"
2121
}

‎personalization-service/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# For documentation see https://jboss-container-images.github.io/openjdk/
2-
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.23-6.1756793420@sha256:381e4f75c654b4e60b6a39147e803480f85bd3af7db291c0c522811c94f31848
2+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.23-6.1758133907@sha256:26acabfda6160ef348ceebba38e6616c43bf98a18800bf6afc20913556389c06
33

44
# Copy runnable jar to deployments
55
COPY target/*.jar /deployments/application.jar

‎personalization-service/pom.xml‎

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

1212
<groupId>de.muenchen.dbs.personalization</groupId>
1313
<artifactId>personalization-service</artifactId>
14-
<version>0.1.1-SNAPSHOT</version>
14+
<version>0.3.0-SNAPSHOT</version>
1515
<name>personalization_service</name>
1616
<description>Personalization service for the digital citizen service of the City of Munich</description>
1717
<url>https://github.com/it-at-m/dbs</url>
@@ -33,8 +33,8 @@
3333
<spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
3434
<itm-java-codeformat.version>1.0.10</itm-java-codeformat.version>
3535
<pmd-maven-plugin.version>3.27.0</pmd-maven-plugin.version>
36-
<spotbugs-maven-plugin.version>4.9.4.2</spotbugs-maven-plugin.version>
37-
<spotbugs-annotations.version>4.9.4</spotbugs-annotations.version> <!-- must match the patch version of spotbugs-maven-plugin -->
36+
<spotbugs-maven-plugin.version>4.9.6.0</spotbugs-maven-plugin.version>
37+
<spotbugs-annotations.version>4.9.6</spotbugs-annotations.version> <!-- must match the patch version of spotbugs-maven-plugin -->
3838
<findsecbugs-plugin.version>1.14.0</findsecbugs-plugin.version>
3939

4040
<!-- Testing -->

0 commit comments

Comments
 (0)