Solve merge conflict

Author: Dominik Grenz

docs/package-lock.json

@@ -15,7 +15,7 @@
   "devDependencies": {
     "@muenchen/prettier-codeformat": "1.0.2",
     "markdownlint-cli": "0.45.0",
-    "mermaid": "11.10.1",
+    "mermaid": "11.11.0",
     "vitepress": "1.6.4",
     "vitepress-plugin-mermaid": "2.0.17"
   }

docs/package.json

@@ -1,5 +1,5 @@
 # For documentation see https://jboss-container-images.github.io/openjdk/
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.22-1.1753981256@sha256:06d60e73be11d96b4cedc4bd1807e503a6196e9b01be9e4405b6b6d3b816202d
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.23-6.1756793420@sha256:381e4f75c654b4e60b6a39147e803480f85bd3af7db291c0c522811c94f31848
 
 # Copy runnable jar to deployments
 COPY target/*.jar /deployments/application.jar

personalization-service/Dockerfile

@@ -33,7 +33,7 @@
         <spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
         <itm-java-codeformat.version>1.0.10</itm-java-codeformat.version>
         <pmd-maven-plugin.version>3.27.0</pmd-maven-plugin.version>
-        <spotbugs-maven-plugin.version>4.9.4.0</spotbugs-maven-plugin.version>
+        <spotbugs-maven-plugin.version>4.9.4.2</spotbugs-maven-plugin.version>
         <spotbugs-annotations.version>4.9.4</spotbugs-annotations.version> <!-- must match the patch version of spotbugs-maven-plugin -->
         <findsecbugs-plugin.version>1.14.0</findsecbugs-plugin.version>
 
@@ -53,7 +53,7 @@
 
         <!-- Additional required dependencies -->
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version> <!-- Needed to make MapStruct and Lombok work together -->
-        <springdoc-openapi-starter-webmvc-ui.version>2.8.11</springdoc-openapi-starter-webmvc-ui.version>
+        <springdoc-openapi-starter-webmvc-ui.version>2.8.13</springdoc-openapi-starter-webmvc-ui.version>
         <springdoc-openapi-maven-plugin.version>1.5</springdoc-openapi-maven-plugin.version>
         <therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
 

personalization-service/pom.xml

@@ -30,7 +30,7 @@
 
     <!-- built files will be auto injected -->
     <script
-      src="src/checklist-detail-webcomponent.ts"
+      src="src/ChecklistDetailWebcomponent.ts"
       type="module"
     ></script>
   </head>