Upgrade to Jmix 2.3.0

jmix-framework · Jun 27, 2024 · 7056493 · 7056493
1 parent a3ad14b
commit 7056493
Show file tree

Hide file tree

Showing 16 changed files with 146 additions and 136 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.jmix' version '2.2.2'
+    id 'io.jmix' version '2.3.0'
     id 'java'
     id 'com.github.fhermansson.assertj-generator' version '1.1.5'
 }
@@ -8,7 +8,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'com.vaadin'
 
 jmix {
-    bomVersion = '2.2.2'
+    bomVersion = '2.3.0'
     projectId = 'bookstore'
 }
 

diff --git a/frontend/themes/jmix-bookstore/theme.json b/frontend/themes/jmix-bookstore/theme.json
@@ -1 +1,10 @@
-{"parent": "jmix-lumo"}
+{
+ "parent": "jmix-lumo",
+ "lumoImports": [
+  "typography",
+  "color",
+  "spacing",
+  "badge",
+  "utility"
+ ]
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/package.json b/package.json
@@ -4,69 +4,69 @@
   "vaadin": {
     "dependencies": {
       "@polymer/polymer": "3.5.1",
-      "@vaadin/a11y-base": "24.3.10",
-      "@vaadin/accordion": "24.3.10",
-      "@vaadin/app-layout": "24.3.10",
-      "@vaadin/avatar": "24.3.10",
-      "@vaadin/avatar-group": "24.3.10",
-      "@vaadin/bundles": "24.3.10",
-      "@vaadin/button": "24.3.10",
-      "@vaadin/checkbox": "24.3.10",
-      "@vaadin/checkbox-group": "24.3.10",
-      "@vaadin/combo-box": "24.3.10",
+      "@vaadin/a11y-base": "24.3.13",
+      "@vaadin/accordion": "24.3.13",
+      "@vaadin/app-layout": "24.3.13",
+      "@vaadin/avatar": "24.3.13",
+      "@vaadin/avatar-group": "24.3.13",
+      "@vaadin/bundles": "24.3.13",
+      "@vaadin/button": "24.3.13",
+      "@vaadin/checkbox": "24.3.13",
+      "@vaadin/checkbox-group": "24.3.13",
+      "@vaadin/combo-box": "24.3.13",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/component-base": "24.3.10",
-      "@vaadin/confirm-dialog": "24.3.10",
-      "@vaadin/context-menu": "24.3.10",
-      "@vaadin/custom-field": "24.3.10",
-      "@vaadin/date-picker": "24.3.10",
-      "@vaadin/date-time-picker": "24.3.10",
-      "@vaadin/details": "24.3.10",
-      "@vaadin/dialog": "24.3.10",
-      "@vaadin/email-field": "24.3.10",
-      "@vaadin/field-base": "24.3.10",
-      "@vaadin/field-highlighter": "24.3.10",
-      "@vaadin/form-layout": "24.3.10",
-      "@vaadin/grid": "24.3.10",
-      "@vaadin/horizontal-layout": "24.3.10",
-      "@vaadin/icon": "24.3.10",
-      "@vaadin/icons": "24.3.10",
-      "@vaadin/input-container": "24.3.10",
-      "@vaadin/integer-field": "24.3.10",
-      "@vaadin/item": "24.3.10",
-      "@vaadin/list-box": "24.3.10",
-      "@vaadin/lit-renderer": "24.3.10",
-      "@vaadin/login": "24.3.10",
-      "@vaadin/menu-bar": "24.3.10",
-      "@vaadin/message-input": "24.3.10",
-      "@vaadin/message-list": "24.3.10",
-      "@vaadin/multi-select-combo-box": "24.3.10",
-      "@vaadin/notification": "24.3.10",
-      "@vaadin/number-field": "24.3.10",
-      "@vaadin/overlay": "24.3.10",
-      "@vaadin/password-field": "24.3.10",
-      "@vaadin/polymer-legacy-adapter": "24.3.10",
-      "@vaadin/progress-bar": "24.3.10",
-      "@vaadin/radio-group": "24.3.10",
+      "@vaadin/component-base": "24.3.13",
+      "@vaadin/confirm-dialog": "24.3.13",
+      "@vaadin/context-menu": "24.3.13",
+      "@vaadin/custom-field": "24.3.13",
+      "@vaadin/date-picker": "24.3.13",
+      "@vaadin/date-time-picker": "24.3.13",
+      "@vaadin/details": "24.3.13",
+      "@vaadin/dialog": "24.3.13",
+      "@vaadin/email-field": "24.3.13",
+      "@vaadin/field-base": "24.3.13",
+      "@vaadin/field-highlighter": "24.3.13",
+      "@vaadin/form-layout": "24.3.13",
+      "@vaadin/grid": "24.3.13",
+      "@vaadin/horizontal-layout": "24.3.13",
+      "@vaadin/icon": "24.3.13",
+      "@vaadin/icons": "24.3.13",
+      "@vaadin/input-container": "24.3.13",
+      "@vaadin/integer-field": "24.3.13",
+      "@vaadin/item": "24.3.13",
+      "@vaadin/list-box": "24.3.13",
+      "@vaadin/lit-renderer": "24.3.13",
+      "@vaadin/login": "24.3.13",
+      "@vaadin/menu-bar": "24.3.13",
+      "@vaadin/message-input": "24.3.13",
+      "@vaadin/message-list": "24.3.13",
+      "@vaadin/multi-select-combo-box": "24.3.13",
+      "@vaadin/notification": "24.3.13",
+      "@vaadin/number-field": "24.3.13",
+      "@vaadin/overlay": "24.3.13",
+      "@vaadin/password-field": "24.3.13",
+      "@vaadin/polymer-legacy-adapter": "24.3.13",
+      "@vaadin/progress-bar": "24.3.13",
+      "@vaadin/radio-group": "24.3.13",
       "@vaadin/router": "1.7.5",
-      "@vaadin/scroller": "24.3.10",
-      "@vaadin/select": "24.3.10",
-      "@vaadin/side-nav": "24.3.10",
-      "@vaadin/split-layout": "24.3.10",
-      "@vaadin/tabs": "24.3.10",
-      "@vaadin/tabsheet": "24.3.10",
-      "@vaadin/text-area": "24.3.10",
-      "@vaadin/text-field": "24.3.10",
-      "@vaadin/time-picker": "24.3.10",
-      "@vaadin/tooltip": "24.3.10",
-      "@vaadin/upload": "24.3.10",
-      "@vaadin/vaadin-development-mode-detector": "2.0.6",
-      "@vaadin/vaadin-lumo-styles": "24.3.10",
-      "@vaadin/vaadin-material-styles": "24.3.10",
-      "@vaadin/vaadin-themable-mixin": "24.3.10",
+      "@vaadin/scroller": "24.3.13",
+      "@vaadin/select": "24.3.13",
+      "@vaadin/side-nav": "24.3.13",
+      "@vaadin/split-layout": "24.3.13",
+      "@vaadin/tabs": "24.3.13",
+      "@vaadin/tabsheet": "24.3.13",
+      "@vaadin/text-area": "24.3.13",
+      "@vaadin/text-field": "24.3.13",
+      "@vaadin/time-picker": "24.3.13",
+      "@vaadin/tooltip": "24.3.13",
+      "@vaadin/upload": "24.3.13",
+      "@vaadin/vaadin-development-mode-detector": "2.0.7",
+      "@vaadin/vaadin-lumo-styles": "24.3.13",
+      "@vaadin/vaadin-material-styles": "24.3.13",
+      "@vaadin/vaadin-themable-mixin": "24.3.13",
       "@vaadin/vaadin-usage-statistics": "2.1.2",
-      "@vaadin/vertical-layout": "24.3.10",
-      "@vaadin/virtual-list": "24.3.10",
+      "@vaadin/vertical-layout": "24.3.13",
+      "@vaadin/virtual-list": "24.3.13",
       "ace-builds": "1.18.0",
       "bpmn-js": "12.1.0",
       "construct-style-sheets-polyfill": "3.1.0",
@@ -93,86 +93,86 @@
       "workbox-core": "7.0.0",
       "workbox-precaching": "7.0.0"
     },
-    "hash": "fa3bab28f2813a5f1cb06dbfa2e0219d843d7bc2deb1d1d1f511339386a5e919"
+    "hash": "b7942c56889575dab6112ede1d14540214b0dea1f023291c3d031cc345a6f8d0"
   },
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@vaadin/a11y-base": "24.3.10",
-    "@vaadin/accordion": "24.3.10",
-    "@vaadin/app-layout": "24.3.10",
-    "@vaadin/avatar": "24.3.10",
-    "@vaadin/avatar-group": "24.3.10",
+    "@vaadin/a11y-base": "24.3.13",
+    "@vaadin/accordion": "24.3.13",
+    "@vaadin/app-layout": "24.3.13",
+    "@vaadin/avatar": "24.3.13",
+    "@vaadin/avatar-group": "24.3.13",
     "@vaadin/board": "23.3.0",
-    "@vaadin/bundles": "24.3.10",
-    "@vaadin/button": "24.3.10",
+    "@vaadin/bundles": "24.3.13",
+    "@vaadin/button": "24.3.13",
     "@vaadin/charts": "23.3.0",
-    "@vaadin/checkbox": "24.3.10",
-    "@vaadin/checkbox-group": "24.3.10",
-    "@vaadin/combo-box": "24.3.10",
+    "@vaadin/checkbox": "24.3.13",
+    "@vaadin/checkbox-group": "24.3.13",
+    "@vaadin/combo-box": "24.3.13",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/component-base": "24.3.10",
-    "@vaadin/confirm-dialog": "24.3.10",
-    "@vaadin/context-menu": "24.3.10",
+    "@vaadin/component-base": "24.3.13",
+    "@vaadin/confirm-dialog": "24.3.13",
+    "@vaadin/context-menu": "24.3.13",
     "@vaadin/cookie-consent": "23.3.0",
     "@vaadin/crud": "23.3.0",
-    "@vaadin/custom-field": "24.3.10",
-    "@vaadin/date-picker": "24.3.10",
-    "@vaadin/date-time-picker": "24.3.10",
-    "@vaadin/details": "24.3.10",
-    "@vaadin/dialog": "24.3.10",
-    "@vaadin/email-field": "24.3.10",
-    "@vaadin/field-base": "24.3.10",
-    "@vaadin/field-highlighter": "24.3.10",
-    "@vaadin/form-layout": "24.3.10",
-    "@vaadin/grid": "24.3.10",
+    "@vaadin/custom-field": "24.3.13",
+    "@vaadin/date-picker": "24.3.13",
+    "@vaadin/date-time-picker": "24.3.13",
+    "@vaadin/details": "24.3.13",
+    "@vaadin/dialog": "24.3.13",
+    "@vaadin/email-field": "24.3.13",
+    "@vaadin/field-base": "24.3.13",
+    "@vaadin/field-highlighter": "24.3.13",
+    "@vaadin/form-layout": "24.3.13",
+    "@vaadin/grid": "24.3.13",
     "@vaadin/grid-pro": "23.3.0",
-    "@vaadin/horizontal-layout": "24.3.10",
-    "@vaadin/icon": "24.3.10",
-    "@vaadin/icons": "24.3.10",
-    "@vaadin/input-container": "24.3.10",
-    "@vaadin/integer-field": "24.3.10",
-    "@vaadin/item": "24.3.10",
-    "@vaadin/list-box": "24.3.10",
-    "@vaadin/lit-renderer": "24.3.10",
-    "@vaadin/login": "24.3.10",
+    "@vaadin/horizontal-layout": "24.3.13",
+    "@vaadin/icon": "24.3.13",
+    "@vaadin/icons": "24.3.13",
+    "@vaadin/input-container": "24.3.13",
+    "@vaadin/integer-field": "24.3.13",
+    "@vaadin/item": "24.3.13",
+    "@vaadin/list-box": "24.3.13",
+    "@vaadin/lit-renderer": "24.3.13",
+    "@vaadin/login": "24.3.13",
     "@vaadin/map": "23.3.0",
-    "@vaadin/menu-bar": "24.3.10",
-    "@vaadin/message-input": "24.3.10",
-    "@vaadin/message-list": "24.3.10",
-    "@vaadin/multi-select-combo-box": "24.3.10",
-    "@vaadin/notification": "24.3.10",
-    "@vaadin/number-field": "24.3.10",
-    "@vaadin/overlay": "24.3.10",
-    "@vaadin/password-field": "24.3.10",
-    "@vaadin/polymer-legacy-adapter": "24.3.10",
-    "@vaadin/progress-bar": "24.3.10",
-    "@vaadin/radio-group": "24.3.10",
+    "@vaadin/menu-bar": "24.3.13",
+    "@vaadin/message-input": "24.3.13",
+    "@vaadin/message-list": "24.3.13",
+    "@vaadin/multi-select-combo-box": "24.3.13",
+    "@vaadin/notification": "24.3.13",
+    "@vaadin/number-field": "24.3.13",
+    "@vaadin/overlay": "24.3.13",
+    "@vaadin/password-field": "24.3.13",
+    "@vaadin/polymer-legacy-adapter": "24.3.13",
+    "@vaadin/progress-bar": "24.3.13",
+    "@vaadin/radio-group": "24.3.13",
     "@vaadin/rich-text-editor": "23.3.0",
     "@vaadin/router": "1.7.5",
-    "@vaadin/scroller": "24.3.10",
-    "@vaadin/select": "24.3.10",
-    "@vaadin/side-nav": "24.3.10",
-    "@vaadin/split-layout": "24.3.10",
-    "@vaadin/tabs": "24.3.10",
-    "@vaadin/tabsheet": "24.3.10",
-    "@vaadin/text-area": "24.3.10",
-    "@vaadin/text-field": "24.3.10",
-    "@vaadin/time-picker": "24.3.10",
-    "@vaadin/tooltip": "24.3.10",
-    "@vaadin/upload": "24.3.10",
+    "@vaadin/scroller": "24.3.13",
+    "@vaadin/select": "24.3.13",
+    "@vaadin/side-nav": "24.3.13",
+    "@vaadin/split-layout": "24.3.13",
+    "@vaadin/tabs": "24.3.13",
+    "@vaadin/tabsheet": "24.3.13",
+    "@vaadin/text-area": "24.3.13",
+    "@vaadin/text-field": "24.3.13",
+    "@vaadin/time-picker": "24.3.13",
+    "@vaadin/tooltip": "24.3.13",
+    "@vaadin/upload": "24.3.13",
     "@vaadin/vaadin-board": "23.3.0",
     "@vaadin/vaadin-charts": "23.3.0",
     "@vaadin/vaadin-cookie-consent": "23.3.0",
     "@vaadin/vaadin-crud": "23.3.0",
-    "@vaadin/vaadin-development-mode-detector": "2.0.6",
+    "@vaadin/vaadin-development-mode-detector": "2.0.7",
     "@vaadin/vaadin-grid-pro": "23.3.0",
-    "@vaadin/vaadin-lumo-styles": "24.3.10",
-    "@vaadin/vaadin-material-styles": "24.3.10",
+    "@vaadin/vaadin-lumo-styles": "24.3.13",
+    "@vaadin/vaadin-material-styles": "24.3.13",
     "@vaadin/vaadin-rich-text-editor": "23.3.0",
-    "@vaadin/vaadin-themable-mixin": "24.3.10",
+    "@vaadin/vaadin-themable-mixin": "24.3.13",
     "@vaadin/vaadin-usage-statistics": "2.1.2",
-    "@vaadin/vertical-layout": "24.3.10",
-    "@vaadin/virtual-list": "24.3.10",
+    "@vaadin/vertical-layout": "24.3.13",
+    "@vaadin/virtual-list": "24.3.13",
     "ace-builds": "1.18.0",
     "bpmn-js": "12.1.0",
     "construct-style-sheets-polyfill": "3.1.0",

diff --git a/src/main/java/io/jmix/bookstore/view/addressmap/AddressMapView.java b/src/main/java/io/jmix/bookstore/view/addressmap/AddressMapView.java
@@ -23,7 +23,7 @@ public class AddressMapView extends StandardView {
 
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
 
     @ViewComponent

diff --git a/src/main/java/io/jmix/bookstore/view/customer/CustomerLookupView.java b/src/main/java/io/jmix/bookstore/view/customer/CustomerLookupView.java
@@ -24,7 +24,7 @@ public class CustomerLookupView extends StandardListView<Customer> {
     private CollectionContainer<Customer> customersDc;
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
 
     @Subscribe("customerFilterField")

diff --git a/src/main/java/io/jmix/bookstore/view/fulfillmentcenter/FulfillmentCenterDetailView.java b/src/main/java/io/jmix/bookstore/view/fulfillmentcenter/FulfillmentCenterDetailView.java
@@ -32,7 +32,7 @@ public class FulfillmentCenterDetailView extends StandardDetailView<FulfillmentC
     private Geocoding geocoding;
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
 
     @Subscribe

diff --git a/src/main/java/io/jmix/bookstore/view/login/LoginView.java b/src/main/java/io/jmix/bookstore/view/login/LoginView.java
@@ -80,7 +80,7 @@ public class LoginView extends StandardView implements LocaleChangeObserver {
     private LoginViewSupport loginViewSupport;
     @Autowired
     private MessageTools messageTools;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
     @Autowired
     private TestEnvironmentTenants testEnvironmentTenants;

diff --git a/src/main/java/io/jmix/bookstore/view/main/MainView.java b/src/main/java/io/jmix/bookstore/view/main/MainView.java
@@ -49,7 +49,7 @@ public class MainView extends StandardMainView {
     private Dialogs dialogs;
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
     @Autowired
     private CurrentAuthentication currentAuthentication;

diff --git a/src/main/java/io/jmix/bookstore/view/order/ConfirmOrderView.java b/src/main/java/io/jmix/bookstore/view/order/ConfirmOrderView.java
@@ -44,7 +44,7 @@ public class ConfirmOrderView extends StandardDetailView<Order> {
 
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
     @Autowired
     private Geocoding geocoding;

diff --git a/src/main/java/io/jmix/bookstore/view/order/OrderListView.java b/src/main/java/io/jmix/bookstore/view/order/OrderListView.java
@@ -31,7 +31,7 @@ public class OrderListView extends StandardListView<Order> {
     private ViewNavigators viewNavigators;
     @Autowired
     private Dialogs dialogs;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
     @Autowired
     private Messages messages;

diff --git a/src/main/java/io/jmix/bookstore/view/product/ProductListView.java b/src/main/java/io/jmix/bookstore/view/product/ProductListView.java
@@ -32,7 +32,7 @@ public class ProductListView extends StandardListView<Product> {
     private CurrentAuthentication currentAuthentication;
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
 
     @Subscribe("productsDataGrid.fillUpInventory")

diff --git a/src/main/java/io/jmix/bookstore/view/supplierorder/SupplierOrderListView.java b/src/main/java/io/jmix/bookstore/view/supplierorder/SupplierOrderListView.java
@@ -25,7 +25,7 @@ public class SupplierOrderListView extends StandardListView<SupplierOrder> {
     private TimeSource timeSource;
     @Autowired
     private Notifications notifications;
-    @Autowired
+    @ViewComponent
     private MessageBundle messageBundle;
 
     @ViewComponent