Merge pull request #105 from tallence/2301-upgrade

2301 upgrade
tallence · Feb 21, 2023 · a1b0dea · a1b0dea
2 parents 6af7012 + 5b15f69
commit a1b0dea
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 24 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -223,12 +223,24 @@
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
       <scope>test</scope>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.coremedia.cms</groupId>
+      <artifactId>cap-multisite</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>content-services</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>

diff --git a/...editor-cae/src/test/java/com/tallence/formeditor/cae/mocks/ResourceBundleFactoryMock.java b/...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
@@ -159,6 +159,7 @@
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
       <scope>test</scope>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>