diff --git a/digiwf-apps/lerna.json b/digiwf-apps/lerna.json index f134c51cc9..41eb478126 100644 --- a/digiwf-apps/lerna.json +++ b/digiwf-apps/lerna.json @@ -10,5 +10,5 @@ "packages/apps/digiwf-forms-example", "packages/apps/digiwf-tasklist" ], - "version": "1.1.0" + "version": "1.1.3" } diff --git a/digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json b/digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json index 395643dabf..8e29d09fa4 100644 --- a/digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json +++ b/digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-forms-example", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-forms-example", - "version": "1.1.0", + "version": "1.1.3", "dependencies": { "@muenchen/vjsf": "^2.21.7", "vue": "^2.7.10", diff --git a/digiwf-apps/packages/apps/digiwf-forms-example/package.json b/digiwf-apps/packages/apps/digiwf-forms-example/package.json index 3401a5cf93..fd1fa30da7 100644 --- a/digiwf-apps/packages/apps/digiwf-forms-example/package.json +++ b/digiwf-apps/packages/apps/digiwf-forms-example/package.json @@ -2,17 +2,17 @@ "name": "@muenchen/digiwf-forms-example", "description": "DigiWF Forms", "private": true, - "version": "1.1.0", + "version": "1.1.3", "scripts": { "dev": "vite --host localhost", "build": "vite build" }, "dependencies": { - "@muenchen/digiwf-date-input": "^1.1.0", - "@muenchen/digiwf-form-builder": "^1.1.0", - "@muenchen/digiwf-form-builder-settings": "^1.1.0", - "@muenchen/digiwf-form-renderer": "^1.1.0", - "@muenchen/digiwf-multi-file-input": "^1.1.0", + "@muenchen/digiwf-date-input": "^1.1.3", + "@muenchen/digiwf-form-builder": "^1.1.3", + "@muenchen/digiwf-form-builder-settings": "^1.1.3", + "@muenchen/digiwf-form-renderer": "^1.1.3", + "@muenchen/digiwf-multi-file-input": "^1.1.3", "@muenchen/vjsf": "^2.21.7", "vue": "^2.7.10", "vuetify": "^2.6.9" diff --git a/digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json b/digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json index 5b02984a4b..6cdb8bbc31 100644 --- a/digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json +++ b/digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-tasklist", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-tasklist", - "version": "1.1.0", + "version": "1.1.3", "dependencies": { "@muenchen/vjsf": "^2.21.7", "@tanstack/vue-query": "^4.19.1", diff --git a/digiwf-apps/packages/apps/digiwf-tasklist/package.json b/digiwf-apps/packages/apps/digiwf-tasklist/package.json index 96085756b0..676dcfd200 100644 --- a/digiwf-apps/packages/apps/digiwf-tasklist/package.json +++ b/digiwf-apps/packages/apps/digiwf-tasklist/package.json @@ -1,6 +1,6 @@ { "name": "@muenchen/digiwf-tasklist", - "version": "1.1.0", + "version": "1.1.3", "private": true, "scripts": { "dev": "vite", @@ -8,11 +8,11 @@ "test": "jest src --coverage" }, "dependencies": { - "@muenchen/digiwf-date-input": "^1.1.0", - "@muenchen/digiwf-engine-api-internal": "^1.1.0", - "@muenchen/digiwf-form-renderer": "^1.1.0", - "@muenchen/digiwf-multi-file-input": "^1.1.0", - "@muenchen/digiwf-task-api-internal": "^1.1.0", + "@muenchen/digiwf-date-input": "^1.1.3", + "@muenchen/digiwf-engine-api-internal": "^1.1.3", + "@muenchen/digiwf-form-renderer": "^1.1.3", + "@muenchen/digiwf-multi-file-input": "^1.1.3", + "@muenchen/digiwf-task-api-internal": "^1.1.3", "@muenchen/vjsf": "^2.21.7", "@tanstack/vue-query": "^4.19.1", "core-js": "^3.8.3", diff --git a/digiwf-apps/packages/apps/digiwf-tasklist/src/middleware/processInstances/processInstancesMiddleware.ts b/digiwf-apps/packages/apps/digiwf-tasklist/src/middleware/processInstances/processInstancesMiddleware.ts index 2ae609456c..7df84860fd 100644 --- a/digiwf-apps/packages/apps/digiwf-tasklist/src/middleware/processInstances/processInstancesMiddleware.ts +++ b/digiwf-apps/packages/apps/digiwf-tasklist/src/middleware/processInstances/processInstancesMiddleware.ts @@ -32,6 +32,7 @@ export const useGetProcessInstances = (page: Ref, size: Ref, que description: it.description, startTime: it.startTime ? DateTime.fromISO(it.startTime).toLocaleString(DateTime.DATETIME_SHORT) : "-", endTime: it.endTime, + status: it.status, })) ?? []; return Promise.resolve>({ diff --git a/digiwf-apps/packages/components/digiwf-date-input/package-lock.json b/digiwf-apps/packages/components/digiwf-date-input/package-lock.json index 5df203c6f2..118a6e167e 100644 --- a/digiwf-apps/packages/components/digiwf-date-input/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-date-input/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-date-input", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-date-input", - "version": "1.1.0", + "version": "1.1.3", "devDependencies": { "@types/jest": "^27.5.2", "@types/luxon": "^1.25.0", diff --git a/digiwf-apps/packages/components/digiwf-date-input/package.json b/digiwf-apps/packages/components/digiwf-date-input/package.json index e7fc3cdfdb..c96cfce12b 100644 --- a/digiwf-apps/packages/components/digiwf-date-input/package.json +++ b/digiwf-apps/packages/components/digiwf-date-input/package.json @@ -1,7 +1,7 @@ { "name": "@muenchen/digiwf-date-input", "description": "Customized component with possibility to enter date with keyboard", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-date-input.mjs", "scripts": { "build": "vite build", diff --git a/digiwf-apps/packages/components/digiwf-engine-api-internal/package-lock.json b/digiwf-apps/packages/components/digiwf-engine-api-internal/package-lock.json index a245efedda..cbf8a21a2f 100644 --- a/digiwf-apps/packages/components/digiwf-engine-api-internal/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-engine-api-internal/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-engine-api-internal", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-engine-api-internal", - "version": "1.1.0", + "version": "1.1.3", "dependencies": { "typescript": "^4.8.2" }, diff --git a/digiwf-apps/packages/components/digiwf-engine-api-internal/package.json b/digiwf-apps/packages/components/digiwf-engine-api-internal/package.json index 0c2b6187ce..cf80c8f41a 100644 --- a/digiwf-apps/packages/components/digiwf-engine-api-internal/package.json +++ b/digiwf-apps/packages/components/digiwf-engine-api-internal/package.json @@ -1,7 +1,7 @@ { "name": "@muenchen/digiwf-engine-api-internal", "description": "Internal digiWF engine api", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-engine-api-internal.mjs", "scripts": { "build": "vite build && tsc --emitDeclarationOnly", diff --git a/digiwf-apps/packages/components/digiwf-form-builder-settings/package-lock.json b/digiwf-apps/packages/components/digiwf-form-builder-settings/package-lock.json index 64d3e68732..745dced0bb 100644 --- a/digiwf-apps/packages/components/digiwf-form-builder-settings/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-form-builder-settings/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-form-builder-settings", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-form-builder-settings", - "version": "1.1.0", + "version": "1.1.3", "devDependencies": { "@types/jest": "^29.2.5", "jest": "29.3.1", diff --git a/digiwf-apps/packages/components/digiwf-form-builder-settings/package.json b/digiwf-apps/packages/components/digiwf-form-builder-settings/package.json index c2358c82d7..cabc8f57fd 100644 --- a/digiwf-apps/packages/components/digiwf-form-builder-settings/package.json +++ b/digiwf-apps/packages/components/digiwf-form-builder-settings/package.json @@ -1,7 +1,7 @@ { "name": "@muenchen/digiwf-form-builder-settings", "description": "Form Builder Settings", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-form-builder-settings.mjs", "scripts": { "build": "vite build", diff --git a/digiwf-apps/packages/components/digiwf-form-builder/package-lock.json b/digiwf-apps/packages/components/digiwf-form-builder/package-lock.json index 339bea36e9..5134f187fb 100644 --- a/digiwf-apps/packages/components/digiwf-form-builder/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-form-builder/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-form-builder", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-form-builder", - "version": "1.1.0", + "version": "1.1.3", "devDependencies": { "deepmerge": "^4.2.2" }, diff --git a/digiwf-apps/packages/components/digiwf-form-builder/package.json b/digiwf-apps/packages/components/digiwf-form-builder/package.json index 5047597c8b..da69d1b5b8 100644 --- a/digiwf-apps/packages/components/digiwf-form-builder/package.json +++ b/digiwf-apps/packages/components/digiwf-form-builder/package.json @@ -1,15 +1,15 @@ { "name": "@muenchen/digiwf-form-builder", "description": "Form Builder", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-form-builder.mjs", "scripts": { "build": "vite build", "watch": "vite build --watch" }, "dependencies": { - "@muenchen/digiwf-form-builder-settings": "^1.1.0", - "@muenchen/digiwf-form-renderer": "^1.1.0" + "@muenchen/digiwf-form-builder-settings": "^1.1.3", + "@muenchen/digiwf-form-renderer": "^1.1.3" }, "peerDependencies": { "vue": "^2.7.0", diff --git a/digiwf-apps/packages/components/digiwf-form-renderer/package-lock.json b/digiwf-apps/packages/components/digiwf-form-renderer/package-lock.json index a4e8a1d169..1879d47a00 100644 --- a/digiwf-apps/packages/components/digiwf-form-renderer/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-form-renderer/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-form-renderer", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-form-renderer", - "version": "1.1.0", + "version": "1.1.3", "devDependencies": { "deepmerge": "^4.2.2" }, diff --git a/digiwf-apps/packages/components/digiwf-form-renderer/package.json b/digiwf-apps/packages/components/digiwf-form-renderer/package.json index 46bef6f04c..f864ec4f0b 100644 --- a/digiwf-apps/packages/components/digiwf-form-renderer/package.json +++ b/digiwf-apps/packages/components/digiwf-form-renderer/package.json @@ -1,7 +1,7 @@ { "name": "@muenchen/digiwf-form-renderer", "description": "Form renderer", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-form-renderer.mjs", "scripts": { "build": "vite build", diff --git a/digiwf-apps/packages/components/digiwf-multi-file-input/package-lock.json b/digiwf-apps/packages/components/digiwf-multi-file-input/package-lock.json index 4e7257036d..4f3ed93777 100644 --- a/digiwf-apps/packages/components/digiwf-multi-file-input/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-multi-file-input/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-multi-file-input", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-multi-file-input", - "version": "1.1.0", + "version": "1.1.3", "devDependencies": { "@types/mime": "^2.0.3", "axios": "^0.26.0", diff --git a/digiwf-apps/packages/components/digiwf-multi-file-input/package.json b/digiwf-apps/packages/components/digiwf-multi-file-input/package.json index f013d76b5b..55e8ad0996 100644 --- a/digiwf-apps/packages/components/digiwf-multi-file-input/package.json +++ b/digiwf-apps/packages/components/digiwf-multi-file-input/package.json @@ -1,15 +1,15 @@ { "name": "@muenchen/digiwf-multi-file-input", "description": "Form renderer", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-multi-file-input.mjs", "scripts": { "build": "vite build", "watch": "vite build --watch" }, "dependencies": { - "@muenchen/digiwf-engine-api-internal": "^1.1.0", - "@muenchen/digiwf-task-api-internal": "^1.1.0" + "@muenchen/digiwf-engine-api-internal": "^1.1.3", + "@muenchen/digiwf-task-api-internal": "^1.1.3" }, "peerDependencies": { "vue": "^2.7.0", diff --git a/digiwf-apps/packages/components/digiwf-task-api-internal/package-lock.json b/digiwf-apps/packages/components/digiwf-task-api-internal/package-lock.json index 35322e92d9..b7ca2305e1 100644 --- a/digiwf-apps/packages/components/digiwf-task-api-internal/package-lock.json +++ b/digiwf-apps/packages/components/digiwf-task-api-internal/package-lock.json @@ -1,12 +1,12 @@ { "name": "@muenchen/digiwf-task-api-internal", - "version": "1.1.0", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@muenchen/digiwf-task-api-internal", - "version": "1.1.0", + "version": "1.1.3", "dependencies": { "typescript": "^4.8.2" }, diff --git a/digiwf-apps/packages/components/digiwf-task-api-internal/package.json b/digiwf-apps/packages/components/digiwf-task-api-internal/package.json index 460615bef4..5e6bc8050f 100644 --- a/digiwf-apps/packages/components/digiwf-task-api-internal/package.json +++ b/digiwf-apps/packages/components/digiwf-task-api-internal/package.json @@ -1,7 +1,7 @@ { "name": "@muenchen/digiwf-task-api-internal", "description": "Internal digiWF tasklist api", - "version": "1.1.0", + "version": "1.1.3", "module": "dist/digiwf-task-api-internal.mjs", "scripts": { "build": "vite build && tsc --emitDeclarationOnly", diff --git a/digiwf-apps/pom.xml b/digiwf-apps/pom.xml index 82cdce7eac..031e442b00 100644 --- a/digiwf-apps/pom.xml +++ b/digiwf-apps/pom.xml @@ -7,7 +7,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.2-SNAPSHOT digiwf-apps diff --git a/digiwf-connector/digiwf-camunda-connector-service/pom.xml b/digiwf-connector/digiwf-camunda-connector-service/pom.xml index c26b872680..8c175ebd20 100644 --- a/digiwf-connector/digiwf-camunda-connector-service/pom.xml +++ b/digiwf-connector/digiwf-camunda-connector-service/pom.xml @@ -12,7 +12,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/digiwf-camunda-connector-starter/pom.xml b/digiwf-connector/digiwf-camunda-connector-starter/pom.xml index 0aae218233..db751f3448 100644 --- a/digiwf-connector/digiwf-camunda-connector-starter/pom.xml +++ b/digiwf-connector/digiwf-camunda-connector-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/digiwf-camunda-connector/pom.xml b/digiwf-connector/digiwf-camunda-connector/pom.xml index 3c40b648c4..bbeada398b 100644 --- a/digiwf-connector/digiwf-camunda-connector/pom.xml +++ b/digiwf-connector/digiwf-camunda-connector/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-api/pom.xml b/digiwf-connector/digiwf-connector-api/pom.xml index 43a3591e2c..c1dc984c90 100644 --- a/digiwf-connector/digiwf-connector-api/pom.xml +++ b/digiwf-connector/digiwf-connector-api/pom.xml @@ -8,7 +8,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-core/pom.xml b/digiwf-connector/digiwf-connector-core/pom.xml index 070a0996f1..7e18c29471 100644 --- a/digiwf-connector/digiwf-connector-core/pom.xml +++ b/digiwf-connector/digiwf-connector-core/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-starter-rest/pom.xml b/digiwf-connector/digiwf-connector-starter-rest/pom.xml index 73079e2fb5..bb698f9366 100644 --- a/digiwf-connector/digiwf-connector-starter-rest/pom.xml +++ b/digiwf-connector/digiwf-connector-starter-rest/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-starter/pom.xml b/digiwf-connector/digiwf-connector-starter/pom.xml index 699ce0c27e..22f3b96ce6 100644 --- a/digiwf-connector/digiwf-connector-starter/pom.xml +++ b/digiwf-connector/digiwf-connector-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-connector - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-connector/pom.xml b/digiwf-connector/pom.xml index cdb52a47d2..0e742b446c 100644 --- a/digiwf-connector/pom.xml +++ b/digiwf-connector/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-coverage/pom.xml b/digiwf-coverage/pom.xml index 6258272b70..ddbef21f4e 100644 --- a/digiwf-coverage/pom.xml +++ b/digiwf-coverage/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-engine/digiwf-engine-cockpit/pom.xml b/digiwf-engine/digiwf-engine-cockpit/pom.xml index 89c8d94cc7..a61b568199 100644 --- a/digiwf-engine/digiwf-engine-cockpit/pom.xml +++ b/digiwf-engine/digiwf-engine-cockpit/pom.xml @@ -5,7 +5,7 @@ de.muenchen.oss.digiwf digiwf-engine - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-engine-cockpit diff --git a/digiwf-engine/digiwf-engine-service/pom.xml b/digiwf-engine/digiwf-engine-service/pom.xml index 30dcc0a66d..d05eb948ec 100644 --- a/digiwf-engine/digiwf-engine-service/pom.xml +++ b/digiwf-engine/digiwf-engine-service/pom.xml @@ -9,7 +9,7 @@ de.muenchen.oss.digiwf digiwf-engine - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/legacy/user/external/client/LhmLdapClient.java b/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/legacy/user/external/client/LhmLdapClient.java index 9a87beaabd..00000c2431 100644 --- a/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/legacy/user/external/client/LhmLdapClient.java +++ b/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/legacy/user/external/client/LhmLdapClient.java @@ -50,6 +50,7 @@ public class LhmLdapClient extends LdapTemplate implements UserRepository { private static final String LDAP_TYPE_OU = "ou"; private static final String LHM_OBJECT_PATH = "lhmObjectPath"; private static final String LHM_OU_SHORTNAME = "lhmOUShortname"; + private static final String LHM_OU_LONGNAME = "lhmOULongname"; private static final String ATTRIBUTE_OBJECT_CLASS = "objectClass"; private static final String LHM_ORGANIZATIONAL_UNIT = "lhmOrganizationalUnit"; @@ -156,26 +157,8 @@ public List findByNamesLike(final String firstExpression, final String sec @Cacheable(CACHE_OUTREE) public List findOuTree(final String userid) { LOG.debug("Get LDAP ou tree for user {}.", userid); - final LdapQuery query = ldapQueryFactory.createPersonByIdQuery(userid); - - // Get the users OU to search for the OUs outree - List ouShortCodes = super.search(query, (AttributesMapper) attrs -> { - if (null != attrs.get(LDAP_TYPE_OU)) { - return (String) attrs.get(LDAP_TYPE_OU).get(); - } - return null; - }); - ouShortCodes = ouShortCodes.stream().filter(Objects::nonNull).collect(Collectors.toList()); - if (ouShortCodes.isEmpty()) { - log.debug("Found no ou tree"); - return new ArrayList<>(); - } - final String ouShortCode = ouShortCodes.get(0); - - final LdapQuery ouQuery = ldapQueryFactory.createOuTreeByShortcodeQuery(ouShortCode); - - return this.findOuTree(ouQuery).orElse(new ArrayList<>()); + return this.findOuTree(query).orElse(new ArrayList<>()); } /** @@ -223,24 +206,75 @@ private Optional> findOuTree(final LdapQuery query) { log.debug("Found no ou tree"); return Optional.empty(); } + final LdapName ldapName = ldapNames.get(0); - // ou tree always starts with LHM final List ouTree = new ArrayList<>(List.of("LHM")); - // iterate through ou tree and search for ou short codes - String parentBase = this.serviceAuthLdapProperties.getOuSearchBase(); + // Query both the user ldap tree and ou ldap tree to find the ou by its longname + // Note: The ou longnames may differ between the lhmObjectPath, the user ldap tree and the ou ldap tree. + // Therefore, we have to check both trees for the ou to get the shortcode + String parentUserBase = this.serviceAuthLdapProperties.getPersonSearchBase(); + String parentOuBase = this.serviceAuthLdapProperties.getOuSearchBase(); for (int i = 0; i < ldapName.getRdns().size(); i++) { // ignore all rdn's except ou if (!ldapName.getRdn(i).getType().equals(LDAP_TYPE_OU)) { continue; } final String ouLongName = ldapName.getRdn(i).getValue().toString(); - ouTree.addAll(this.findOUShortCodeForOULongName(ouLongName, parentBase)); + List ouShortnames = new ArrayList<>(); + + // try getting the ou shortcode from either the user ldap tree or the ou ldap tree + // 1. check the user ldap tree if the ou exists + try { + log.debug("Searching for ou='{} & objectClass='{}' in subtree '{}' ...", ouLongName, LHM_ORGANIZATIONAL_UNIT, parentUserBase); + final LdapQuery ouObjectReferenceQuery = query() + .searchScope(SearchScope.SUBTREE) + .base(parentUserBase) + .countLimit(1) + .where(LHM_OU_LONGNAME).is(ouLongName); + ouShortnames = super.search(ouObjectReferenceQuery, (AttributesMapper) attrs -> { + if (null != attrs.get(LDAP_TYPE_OU)) { + return (String) attrs.get(LDAP_TYPE_OU).get(); + } + return null; + }); + ouShortnames.stream().filter(Objects::nonNull).collect(Collectors.toList()); + } catch (final NameNotFoundException ex) { + log.warn("No shortCode found for ou {} in basePath {}. Query failed with {} exception", ouLongName, parentUserBase, ex.getClass().getName()); + } + // 2. if the ou does not exist in user ldap tree check the ou ldap tree + try { + if (ouShortnames.isEmpty()) { + final Filter createOuNameFilter = new AndFilter() + .and(new EqualsFilter(LDAP_TYPE_OU, ouLongName)) + .and(new EqualsFilter(ATTRIBUTE_OBJECT_CLASS, LHM_ORGANIZATIONAL_UNIT)); + + log.debug("Searching for ou='{} & objectClass='{}' in subtree '{}' ...", ouLongName, LHM_ORGANIZATIONAL_UNIT, parentOuBase); + final LdapQuery ouObjectReferenceQuery = query() + .searchScope(SearchScope.SUBTREE) + .base(parentOuBase) + .countLimit(1) + .filter(createOuNameFilter); + ouShortnames = super.search(ouObjectReferenceQuery, (AttributesMapper) attrs -> { + if (null != attrs.get(LHM_OU_SHORTNAME)) { + return (String) attrs.get(LHM_OU_SHORTNAME).get(); + } + return null; + }); + ouShortnames.stream().filter(Objects::nonNull).collect(Collectors.toList()); + } + } catch (final NameNotFoundException ex) { + log.warn("No shortCode found for ou {} in basePath {}. Query failed with {} exception", ouLongName, parentOuBase, ex.getClass().getName()); + } + + ouTree.addAll(ouShortnames); // update parent base by adding the current ou to the base path - parentBase = ldapName.get(i) + "," + parentBase; + parentUserBase = ldapName.get(i) + "," + parentUserBase; + parentOuBase = ldapName.get(i) + "," + parentOuBase; } + return Optional.of(ouTree); } diff --git a/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/process/definition/domain/service/ServiceDefinitionDataService.java b/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/process/definition/domain/service/ServiceDefinitionDataService.java index 90b863ffe1..47b30fb622 100644 --- a/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/process/definition/domain/service/ServiceDefinitionDataService.java +++ b/digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/process/definition/domain/service/ServiceDefinitionDataService.java @@ -67,8 +67,11 @@ private Map initalizeData(final ServiceDefinitionDetail definiti //3. simulate previous data for merging and removing JSON.null values final JSONObject previousData = this.serializationService.initialize(new JSONObject(definition.getJsonSchema()).toString()); final Map clearedData = this.serializationService.merge(filteredData, previousData); + //4. merge with default values + final JSONObject defaultValue = this.serializationService.initialize(new JSONObject(definition.getJsonSchema()).toString()); + final Map serializedData = this.serializationService.merge(new JSONObject(clearedData), defaultValue); //5. map to engine data and return - return this.engineDataMapper.mapObjectsToVariables(clearedData); + return this.engineDataMapper.mapObjectsToVariables(serializedData); } } diff --git a/digiwf-engine/pom.xml b/digiwf-engine/pom.xml index 07e81bfaad..57a44829cb 100644 --- a/digiwf-engine/pom.xml +++ b/digiwf-engine/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-gateway/pom.xml b/digiwf-gateway/pom.xml index e8d4f52422..305c64d64b 100644 --- a/digiwf-gateway/pom.xml +++ b/digiwf-gateway/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml index 31dcc5455e..a95b8bde43 100644 --- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml @@ -7,7 +7,7 @@ de.muenchen.oss.digiwf digiwf-alw-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-alw-integration-core diff --git a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/pom.xml b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/pom.xml index 08c16de570..af15f9bfc2 100644 --- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/pom.xml @@ -7,7 +7,7 @@ de.muenchen.oss.digiwf digiwf-alw-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-alw-integration-service diff --git a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml index bf12d0de17..57efaf4f60 100644 --- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml @@ -7,7 +7,7 @@ de.muenchen.oss.digiwf digiwf-alw-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-alw-integration-starter diff --git a/digiwf-integrations/digiwf-alw-integration/pom.xml b/digiwf-integrations/digiwf-alw-integration/pom.xml index a953cd35a9..6d9146ebb5 100644 --- a/digiwf-integrations/digiwf-alw-integration/pom.xml +++ b/digiwf-integrations/digiwf-alw-integration/pom.xml @@ -7,7 +7,7 @@ de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-alw-integration diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-client/pom.xml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-client/pom.xml index 96e2801cde..b87595ed1e 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-client/pom.xml +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-client/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-cosys-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml index f43816c38d..5c709b0081 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml @@ -9,7 +9,7 @@ digiwf-cosys-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-example/pom.xml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-example/pom.xml index 05870ad563..2b3ff26927 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-example/pom.xml +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-example/pom.xml @@ -9,7 +9,7 @@ digiwf-cosys-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/pom.xml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/pom.xml index f671fca1a4..354d2b81b2 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/pom.xml @@ -8,7 +8,7 @@ digiwf-cosys-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-starter/pom.xml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-starter/pom.xml index ede785e929..6d5b8823ef 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-starter/pom.xml @@ -9,7 +9,7 @@ digiwf-cosys-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-cosys-integration/pom.xml b/digiwf-integrations/digiwf-cosys-integration/pom.xml index 33e524d543..80bff3ce39 100644 --- a/digiwf-integrations/digiwf-cosys-integration/pom.xml +++ b/digiwf-integrations/digiwf-cosys-integration/pom.xml @@ -6,14 +6,14 @@ digiwf-cosys-integration pom - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-cosys-integration CoSys integration used by DigiWF de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-core/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-core/pom.xml index a225e5ceed..a5bb833d07 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-core/pom.xml @@ -6,7 +6,7 @@ digiwf-dms-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-dms-integration-core diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-api/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-api/pom.xml index ea85b900c6..ecdf86ecd3 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-api/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-api/pom.xml @@ -6,7 +6,7 @@ digiwf-dms-integration-fabasoft de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-dms-integration-fabasoft-api diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock-service/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock-service/pom.xml index 4cdec84e44..d5d6147b35 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock-service/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock-service/pom.xml @@ -6,7 +6,7 @@ digiwf-dms-integration-fabasoft de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-dms-integration-fabasoft-mock-service diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock/pom.xml index 98f7f047e8..6b9bc98c3b 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/digiwf-dms-integration-fabasoft-mock/pom.xml @@ -6,7 +6,7 @@ digiwf-dms-integration-fabasoft de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-dms-integration-fabasoft-mock diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/pom.xml index b2bda450c5..90440167c3 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-fabasoft/pom.xml @@ -9,7 +9,7 @@ digiwf-dms-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT 3.3.6 diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/pom.xml index 0da3586873..475c4aed5d 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/pom.xml @@ -5,7 +5,7 @@ digiwf-dms-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0 diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-starter/pom.xml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-starter/pom.xml index 4835029644..d6398dc7df 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-starter/pom.xml @@ -6,7 +6,7 @@ digiwf-dms-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-dms-integration-starter diff --git a/digiwf-integrations/digiwf-dms-integration/pom.xml b/digiwf-integrations/digiwf-dms-integration/pom.xml index 11525735f2..e7a5c22551 100644 --- a/digiwf-integrations/digiwf-dms-integration/pom.xml +++ b/digiwf-integrations/digiwf-dms-integration/pom.xml @@ -6,14 +6,14 @@ digiwf-dms-integration digiwf-dms-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT DMS integration used by DigiWF pom de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml index 4a2f68ae3d..13c7b78729 100644 --- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml @@ -6,7 +6,7 @@ digiwf-email-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-email-integration-core diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-example/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-example/pom.xml index 58528e9e7f..732a3cd295 100644 --- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-example/pom.xml +++ b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-example/pom.xml @@ -6,7 +6,7 @@ digiwf-email-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-email-integration-example diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml index 295a0b9f46..e830675f8a 100644 --- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml @@ -5,7 +5,7 @@ digiwf-email-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0 diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-starter/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-starter/pom.xml index 9dbb0e02a6..de3126612a 100644 --- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-starter/pom.xml @@ -6,7 +6,7 @@ digiwf-email-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-email-integration-starter diff --git a/digiwf-integrations/digiwf-email-integration/pom.xml b/digiwf-integrations/digiwf-email-integration/pom.xml index 80970e51f8..a71a46eb1c 100644 --- a/digiwf-integrations/digiwf-email-integration/pom.xml +++ b/digiwf-integrations/digiwf-email-integration/pom.xml @@ -6,14 +6,14 @@ digiwf-email-integration digiwf-email-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT E-Mail integration used by DigiWF pom de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml index 2f732de20b..d6ae530704 100644 --- a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-example-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-example-integration-core diff --git a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-example/pom.xml b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-example/pom.xml index 0d3ec6b521..8e0e8a088b 100644 --- a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-example/pom.xml +++ b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-example/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-example-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-example-integration-example diff --git a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-service/pom.xml b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-service/pom.xml index 1c5c173a91..b58eb4d8ef 100644 --- a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-service/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-example-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-example-integration-service diff --git a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-starter/pom.xml b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-starter/pom.xml index 336fe033c3..1d8c224459 100644 --- a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-starter/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-example-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-example-integration-starter diff --git a/digiwf-integrations/digiwf-example-integration/pom.xml b/digiwf-integrations/digiwf-example-integration/pom.xml index 5824b0a163..6583101002 100644 --- a/digiwf-integrations/digiwf-example-integration/pom.xml +++ b/digiwf-integrations/digiwf-example-integration/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-example-integration diff --git a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-core/pom.xml b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-core/pom.xml index 460956ca01..2725668bfd 100644 --- a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-core/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-okewo-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/pom.xml b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/pom.xml index e54d1b9d46..f13bcf5bf8 100644 --- a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-okewo-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-starter/pom.xml b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-starter/pom.xml index d17d624280..bd176427c1 100644 --- a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-okewo-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-okewo-integration/pom.xml b/digiwf-integrations/digiwf-okewo-integration/pom.xml index 918bedb28f..33605c5261 100644 --- a/digiwf-integrations/digiwf-okewo-integration/pom.xml +++ b/digiwf-integrations/digiwf-okewo-integration/pom.xml @@ -6,14 +6,14 @@ digiwf-okewo-integration digiwf-okewo-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT OK.EWO integration used by DigiWF pom de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml index 459e1e6b75..8019d9543f 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml @@ -13,7 +13,7 @@ de.muenchen.oss.digiwf digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-starter/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-starter/pom.xml index f9e10833a6..6fa1f1b8a3 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-starter/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client/pom.xml index 7c47be6642..2580274e4c 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml index 9c5af7a1a5..2a7801ae2b 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml @@ -5,7 +5,7 @@ de.muenchen.oss.digiwf digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-s3-integration-core diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml index def10b61f6..e53621f17f 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-starter/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-starter/pom.xml index f0003a562d..e0e433cb41 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-s3-integration/pom.xml b/digiwf-integrations/digiwf-s3-integration/pom.xml index 97994814bc..2b12f94d65 100644 --- a/digiwf-integrations/digiwf-s3-integration/pom.xml +++ b/digiwf-integrations/digiwf-s3-integration/pom.xml @@ -5,7 +5,7 @@ 4.0.0 digiwf-s3-integration - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-s3-integration pom S3 integration used by DigiWF @@ -13,7 +13,7 @@ de.muenchen.oss.digiwf digiwf-integrations - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml index e7afecc99c..7b7e14d766 100644 --- a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml +++ b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml @@ -8,7 +8,7 @@ digiwf-verification-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-service/pom.xml b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-service/pom.xml index 639fc76a3d..664e9cd33f 100644 --- a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-service/pom.xml +++ b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-service/pom.xml @@ -5,7 +5,7 @@ digiwf-verification-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0 diff --git a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml index 11486a98e7..b025ddc67e 100644 --- a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml +++ b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml @@ -6,7 +6,7 @@ digiwf-verification-integration de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-verification-integration-starter diff --git a/digiwf-integrations/digiwf-verification-integration/pom.xml b/digiwf-integrations/digiwf-verification-integration/pom.xml index f26ed725b6..1f66561062 100644 --- a/digiwf-integrations/digiwf-verification-integration/pom.xml +++ b/digiwf-integrations/digiwf-verification-integration/pom.xml @@ -6,14 +6,14 @@ digiwf-verification-integration pom - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-verification-integration Verification Integration digiwf-integrations de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-integrations/pom.xml b/digiwf-integrations/pom.xml index d5d02edd9e..0e82859189 100644 --- a/digiwf-integrations/pom.xml +++ b/digiwf-integrations/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml index dfe9ec0859..c8e4d6e1f9 100644 --- a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml +++ b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-camunda-prometheus - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml index f2118f2288..725b006f2b 100644 --- a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml +++ b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml @@ -8,7 +8,7 @@ digiwf-camunda-prometheus de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml index 85e05b3f63..28d33747e4 100644 --- a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml +++ b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml @@ -8,7 +8,7 @@ digiwf-camunda-prometheus de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-camunda-prometheus/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/pom.xml index 8378c14ac8..ae28b53a05 100644 --- a/digiwf-libs/digiwf-camunda-prometheus/pom.xml +++ b/digiwf-libs/digiwf-camunda-prometheus/pom.xml @@ -9,7 +9,7 @@ digiwf-libs de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml index 263eeafe72..6b6a839c9e 100644 --- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-json-serialization - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml index ea113b7358..becd0167a5 100644 --- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-json-serialization - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml b/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml index 1dca9af892..68241c5f28 100644 --- a/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml @@ -9,7 +9,7 @@ de.muenchen.oss.digiwf digiwf-json-serialization - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/pom.xml b/digiwf-libs/digiwf-json-serialization/pom.xml index e3ef020e3a..d864a0314d 100644 --- a/digiwf-libs/digiwf-json-serialization/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-libs - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml b/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml index 6ef4634d10..5f23bb3e79 100644 --- a/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml +++ b/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml @@ -8,7 +8,7 @@ de.muenchen.oss.digiwf digiwf-message - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml b/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml index 2d6b8086dc..a2e6284792 100644 --- a/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml +++ b/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml @@ -8,7 +8,7 @@ de.muenchen.oss.digiwf digiwf-message - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml b/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml index c201f878d1..551664b2c0 100644 --- a/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml +++ b/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml @@ -9,7 +9,7 @@ de.muenchen.oss.digiwf digiwf-message - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-message/pom.xml b/digiwf-libs/digiwf-message/pom.xml index 38c0f62b83..6d5fec8241 100644 --- a/digiwf-libs/digiwf-message/pom.xml +++ b/digiwf-libs/digiwf-message/pom.xml @@ -9,7 +9,7 @@ de.muenchen.oss.digiwf digiwf-libs - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml index dbe496e5b2..2f50ead2ce 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml @@ -8,7 +8,7 @@ digiwf-spring-cloudstream-utils de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml index 7d68915186..e2f59bda24 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml @@ -10,7 +10,7 @@ digiwf-spring-cloudstream-utils de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml index 01e417bca7..6890b4d378 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml @@ -9,7 +9,7 @@ digiwf-spring-cloudstream-utils de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml index 9c01282252..8c6d0f4329 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml @@ -5,14 +5,14 @@ 4.0.0 digiwf-spring-cloudstream-utils pom - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-spring-cloudstream-utils Cloudstream Utils used by DigiWF de.muenchen.oss.digiwf digiwf-libs - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml index 5a8bc1a953..737d51bdbc 100644 --- a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml +++ b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-spring-security - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-spring-security-core diff --git a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml index c832fd86b9..f6a2081b26 100644 --- a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml +++ b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-spring-security - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-spring-security-starter diff --git a/digiwf-libs/digiwf-spring-security/pom.xml b/digiwf-libs/digiwf-spring-security/pom.xml index 81336fe7fa..602de5b124 100644 --- a/digiwf-libs/digiwf-spring-security/pom.xml +++ b/digiwf-libs/digiwf-spring-security/pom.xml @@ -6,12 +6,12 @@ de.muenchen.oss.digiwf digiwf-libs - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-spring-security pom - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-spring-security Spring Security Configuration used by DigiWF diff --git a/digiwf-libs/pom.xml b/digiwf-libs/pom.xml index 931ce2247f..40c3cf3b2c 100644 --- a/digiwf-libs/pom.xml +++ b/digiwf-libs/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-process/digiwf-process-api/pom.xml b/digiwf-process/digiwf-process-api/pom.xml index 1a05379e46..35dd51851c 100644 --- a/digiwf-process/digiwf-process-api/pom.xml +++ b/digiwf-process/digiwf-process-api/pom.xml @@ -8,7 +8,7 @@ digiwf-process de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-process/digiwf-process-example/pom.xml b/digiwf-process/digiwf-process-example/pom.xml index 5f4dd8991e..21b02546e8 100644 --- a/digiwf-process/digiwf-process-example/pom.xml +++ b/digiwf-process/digiwf-process-example/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-process - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-process-example diff --git a/digiwf-process/digiwf-process-starter/pom.xml b/digiwf-process/digiwf-process-starter/pom.xml index bc65cd9d5e..c73e6afac3 100644 --- a/digiwf-process/digiwf-process-starter/pom.xml +++ b/digiwf-process/digiwf-process-starter/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-process - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-process-starter diff --git a/digiwf-process/pom.xml b/digiwf-process/pom.xml index 47056a5d4f..78f3df2a4f 100644 --- a/digiwf-process/pom.xml +++ b/digiwf-process/pom.xml @@ -11,7 +11,7 @@ digiwf-core de.muenchen.oss.digiwf - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml index 1c13206a47..19a9dad79a 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml @@ -13,7 +13,7 @@ de.muenchen.oss.digiwf digiwf-schema-registry - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml index 8f8851d92b..01e321a565 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-schema-registry - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml index 357218d9ad..b2e7570b37 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-schema-registry - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml index 2488eb1e5d..89e0f5d9a0 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml @@ -10,7 +10,7 @@ de.muenchen.oss.digiwf digiwf-schema-registry - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-schema-registry/pom.xml b/digiwf-schema-registry/pom.xml index e871b708df..9fe43b32b8 100644 --- a/digiwf-schema-registry/pom.xml +++ b/digiwf-schema-registry/pom.xml @@ -11,7 +11,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/digiwf-task/digiwf-polyflow-connector-starter/pom.xml b/digiwf-task/digiwf-polyflow-connector-starter/pom.xml index c8d621357e..c1164b2abb 100644 --- a/digiwf-task/digiwf-polyflow-connector-starter/pom.xml +++ b/digiwf-task/digiwf-polyflow-connector-starter/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-task - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-polyflow-connector-starter diff --git a/digiwf-task/digiwf-task-api/pom.xml b/digiwf-task/digiwf-task-api/pom.xml index 340e442788..b6510cc0ff 100644 --- a/digiwf-task/digiwf-task-api/pom.xml +++ b/digiwf-task/digiwf-task-api/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-task - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-task-api diff --git a/digiwf-task/digiwf-task-itest/pom.xml b/digiwf-task/digiwf-task-itest/pom.xml index 402232a868..bf184557aa 100644 --- a/digiwf-task/digiwf-task-itest/pom.xml +++ b/digiwf-task/digiwf-task-itest/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-task - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-task-itest diff --git a/digiwf-task/digiwf-tasklist-service/pom.xml b/digiwf-task/digiwf-tasklist-service/pom.xml index 3bb728bff1..1f10d1862f 100644 --- a/digiwf-task/digiwf-tasklist-service/pom.xml +++ b/digiwf-task/digiwf-tasklist-service/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-task - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-tasklist-service diff --git a/digiwf-task/digiwf-tasklist-service/src/main/java/de/muenchen/oss/digiwf/task/service/adapter/out/schema/JsonSchemaValidationAdapter.java b/digiwf-task/digiwf-tasklist-service/src/main/java/de/muenchen/oss/digiwf/task/service/adapter/out/schema/JsonSchemaValidationAdapter.java index b23eaf8ca5..1b993bb126 100644 --- a/digiwf-task/digiwf-tasklist-service/src/main/java/de/muenchen/oss/digiwf/task/service/adapter/out/schema/JsonSchemaValidationAdapter.java +++ b/digiwf-task/digiwf-tasklist-service/src/main/java/de/muenchen/oss/digiwf/task/service/adapter/out/schema/JsonSchemaValidationAdapter.java @@ -30,8 +30,10 @@ public Map validateAndSerialize(JsonSchema schema, Task task, Ma val taskData = this.engineDataMapper.mapToData(task.getPayload()); val targetData = this.serializationService.deserializeData(schema.asMap(), taskData); val serializedData = this.serializationService.merge(filteredData, new JSONObject(targetData)); + val defaultValue = this.serializationService.initialize(new JSONObject(schema.getSchema()).toString()); + val serializedDataWithDefaultValues = this.serializationService.merge(new JSONObject(serializedData), defaultValue); - return this.engineDataMapper.mapObjectsToVariables(serializedData); + return this.engineDataMapper.mapObjectsToVariables(serializedDataWithDefaultValues); } @Override diff --git a/digiwf-task/pom.xml b/digiwf-task/pom.xml index 19c458bc96..df98a8c6ef 100644 --- a/digiwf-task/pom.xml +++ b/digiwf-task/pom.xml @@ -6,7 +6,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 2d98d4ec0b..bb3d367560 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-apps diff --git a/pom.xml b/pom.xml index 64155902ee..c5925919de 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 de.muenchen.oss.digiwf digiwf-core - 1.1.0-SNAPSHOT + 1.1.3-SNAPSHOT digiwf-core pom DigiWF Core Services