Skip to content

Commit b2da28e

Browse files
committed
Merge branch 'main' into bug/checking-item-freeze
# Conflicts: # personalization-webcomponents/package-lock.json # personalization-webcomponents/package.json # personalization-webcomponents/src/components/ChecklistList.vue
2 parents 08633a3 + 46db145 commit b2da28e

File tree

6 files changed

+16
-35
lines changed

6 files changed

+16
-35
lines changed

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.9.0",
18+
"mermaid": "11.10.0",
1919
"vitepress": "1.6.4",
2020
"vitepress-plugin-mermaid": "2.0.17"
2121
}

personalization-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
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.3.2</spotbugs-maven-plugin.version>
36+
<spotbugs-maven-plugin.version>4.9.4.0</spotbugs-maven-plugin.version>
3737
<spotbugs-annotations.version>4.9.4</spotbugs-annotations.version> <!-- must match the patch version of spotbugs-maven-plugin -->
3838
<findsecbugs-plugin.version>1.14.0</findsecbugs-plugin.version>
3939

personalization-webcomponents/package-lock.json

Lines changed: 7 additions & 26 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"@muenchen/muc-patternlab-vue": "5.6.0",
2121
"@vueuse/core": "13.6.0",
2222
"vue": "3.5.18",
23-
"sortablejs": "^1.15.6",
24-
"sortablejs-vue3": "^1.3.0"
23+
"sortablejs": "1.15.6",
24+
"sortablejs-vue3": "1.3.0"
2525
},
2626
"devDependencies": {
2727
"@cyclonedx/cyclonedx-npm": "4.0.0",
@@ -38,7 +38,7 @@
3838
"jsdom": "26.1.0",
3939
"prettier": "3.6.2",
4040
"typescript": "5.9.2",
41-
"vite": "7.1.2",
41+
"vite": "7.1.3",
4242
"vite-plugin-vue-devtools": "8.0.0",
4343
"vitest": "3.2.4",
4444
"vue-tsc": "3.0.5"

personalization-webcomponents/src/components/ChecklistList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
import type DummyChecklistItem from "@/api/dummyservice/DummyChecklistItem.ts";
6666
6767
import { MucIcon } from "@muenchen/muc-patternlab-vue";
68-
import { defineEmits, ref, watch } from "vue";
6968
import { Sortable } from "sortablejs-vue3";
69+
import { defineEmits, ref, watch } from "vue";
7070
7171
const props = withDefaults(
7272
defineProps<{

0 commit comments

Comments
 (0)