diff --git a/apps/studio-client/apps/main/form-editor-studio-plugin/package.json b/apps/studio-client/apps/main/form-editor-studio-plugin/package.json index ded118e7..37a2a360 100644 --- a/apps/studio-client/apps/main/form-editor-studio-plugin/package.json +++ b/apps/studio-client/apps/main/form-editor-studio-plugin/package.json @@ -5,23 +5,23 @@ "dependencies": { "@coremedia-blueprint/studio-client.form-editor": "1.0.0-SNAPSHOT", "@coremedia-blueprint/studio-client.main.blueprint-forms": "1.0.0-SNAPSHOT", - "@coremedia/studio-client.base-models": "2210.1.0", - "@coremedia/studio-client.cap-base-models": "2210.1.0", - "@coremedia/studio-client.cap-rest-client": "2210.1.0", - "@coremedia/studio-client.client-core": "2210.1.0", - "@coremedia/studio-client.core-icons": "2210.1.0", - "@coremedia/studio-client.ext.errors-validation-components": "2210.1.0", - "@coremedia/studio-client.ext.ui-components": "2210.1.0", - "@coremedia/studio-client.main.bpbase-studio-dynamic-query-list": "2210.1.0", - "@coremedia/studio-client.main.editor-components": "2210.1.0", + "@coremedia/studio-client.base-models": "2301.1", + "@coremedia/studio-client.cap-base-models": "2301.1", + "@coremedia/studio-client.cap-rest-client": "2301.1", + "@coremedia/studio-client.client-core": "2301.1", + "@coremedia/studio-client.core-icons": "2301.1", + "@coremedia/studio-client.ext.errors-validation-components": "2301.1", + "@coremedia/studio-client.ext.ui-components": "2301.1", + "@coremedia/studio-client.main.bpbase-studio-dynamic-query-list": "2301.1", + "@coremedia/studio-client.main.editor-components": "2301.1", "@jangaroo/ext-ts": "^1.0.3", - "@jangaroo/runtime": "^1.2.1" + "@jangaroo/runtime": "^1.4.1" }, "devDependencies": { - "@jangaroo/build": "^1.3.0", - "@jangaroo/core": "^1.3.0", - "@jangaroo/eslint-config": "^1.3.0", - "@jangaroo/publish": "^1.3.0", + "@jangaroo/build": "^1.4.1", + "@jangaroo/core": "^1.4.1", + "@jangaroo/eslint-config": "^1.4.1", + "@jangaroo/publish": "^1.4.1", "eslint": "^7.32.0", "rimraf": "^3.0.2" }, diff --git a/apps/studio-client/apps/workflow/form-editor-workflow-plugin/package.json b/apps/studio-client/apps/workflow/form-editor-workflow-plugin/package.json index 4efe3d4b..bc8910ea 100644 --- a/apps/studio-client/apps/workflow/form-editor-workflow-plugin/package.json +++ b/apps/studio-client/apps/workflow/form-editor-workflow-plugin/package.json @@ -6,10 +6,10 @@ "@coremedia-blueprint/studio-client.form-editor": "1.0.0-SNAPSHOT" }, "devDependencies": { - "@jangaroo/build": "^1.3.0", - "@jangaroo/core": "^1.3.0", - "@jangaroo/eslint-config": "^1.3.0", - "@jangaroo/publish": "^1.3.0", + "@jangaroo/build": "^1.4.1", + "@jangaroo/core": "^1.4.1", + "@jangaroo/eslint-config": "^1.4.1", + "@jangaroo/publish": "^1.4.1", "eslint": "^7.32.0", "rimraf": "^3.0.2" }, diff --git a/apps/studio-client/shared/js/form-editor/package.json b/apps/studio-client/shared/js/form-editor/package.json index 297feccf..27eff247 100644 --- a/apps/studio-client/shared/js/form-editor/package.json +++ b/apps/studio-client/shared/js/form-editor/package.json @@ -2,14 +2,14 @@ "name": "@coremedia-blueprint/studio-client.form-editor", "version": "1.0.0-SNAPSHOT", "dependencies": { - "@coremedia/studio-client.cap-base-models": "2210.1.0", - "@jangaroo/runtime": "^1.2.1" + "@coremedia/studio-client.cap-base-models": "2301.1", + "@jangaroo/runtime": "^1.4.1" }, "devDependencies": { - "@jangaroo/build": "^1.3.0", - "@jangaroo/core": "^1.3.0", - "@jangaroo/eslint-config": "^1.3.0", - "@jangaroo/publish": "^1.3.0", + "@jangaroo/build": "^1.4.1", + "@jangaroo/core": "^1.4.1", + "@jangaroo/eslint-config": "^1.4.1", + "@jangaroo/publish": "^1.4.1", "eslint": "^7.32.0", "rimraf": "^3.0.2" }, diff --git a/form-editor-cae/pom.xml b/form-editor-cae/pom.xml index fe4e17d9..7c98539a 100644 --- a/form-editor-cae/pom.xml +++ b/form-editor-cae/pom.xml @@ -223,12 +223,24 @@ org.skyscreamer jsonassert test + 1.2.1 commons-io commons-io test + + com.coremedia.cms + cap-multisite + test + + + ${project.groupId} + content-services + ${project.version} + test + diff --git a/form-editor-cae/src/test/java/com/tallence/formeditor/cae/mocks/ResourceBundleFactoryMock.java b/form-editor-cae/src/test/java/com/tallence/formeditor/cae/mocks/ResourceBundleFactoryMock.java index f713e3ea..d363b906 100644 --- a/form-editor-cae/src/test/java/com/tallence/formeditor/cae/mocks/ResourceBundleFactoryMock.java +++ b/form-editor-cae/src/test/java/com/tallence/formeditor/cae/mocks/ResourceBundleFactoryMock.java @@ -1,8 +1,11 @@ package com.tallence.formeditor.cae.mocks; import com.coremedia.blueprint.cae.web.i18n.LinklistPageResourceBundleFactory; +import com.coremedia.blueprint.coderesources.ThemeService; import com.coremedia.blueprint.common.contentbeans.Page; import com.coremedia.blueprint.common.navigation.Navigation; +import com.coremedia.blueprint.localization.LocalizationService; +import com.coremedia.cap.multisite.SitesService; import com.coremedia.cap.user.User; import edu.umd.cs.findbugs.annotations.Nullable; @@ -12,6 +15,12 @@ public class ResourceBundleFactoryMock extends LinklistPageResourceBundleFactory { + public ResourceBundleFactoryMock(SitesService sitesService, LocalizationService localizationService, ThemeService themeService) { + setLocalizationService(localizationService); + setSitesService(sitesService); + setThemeService(themeService); + } + @Override public ResourceBundle resourceBundle(Page page, @Nullable User developer) { return resourceBundle(page.getNavigation(), developer); diff --git a/form-editor-shared/pom.xml b/form-editor-shared/pom.xml index 3158a25c..1151300b 100644 --- a/form-editor-shared/pom.xml +++ b/form-editor-shared/pom.xml @@ -159,6 +159,7 @@ org.skyscreamer jsonassert test + 1.2.1 commons-io