Update Spring Boot version to 2.5.2 jmix-framework/jmix#208

jmix-projects · Jul 6, 2021 · 5dfb297 · 5dfb297
1 parent b63a422
commit 5dfb297
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.../java/io/jmix/ui/app/propertyfilter/dateinterval/converter/NextLastIntervalConverter.java b/.../java/io/jmix/ui/app/propertyfilter/dateinterval/converter/NextLastIntervalConverter.java
@@ -21,10 +21,10 @@
 import io.jmix.core.annotation.Internal;
 import io.jmix.ui.app.propertyfilter.dateinterval.model.BaseDateInterval;
 import io.jmix.ui.app.propertyfilter.dateinterval.model.DateInterval;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Nullable;
 import java.util.regex.Pattern;
 
 @Internal

diff --git a/...ava/io/jmix/ui/app/propertyfilter/dateinterval/converter/PredefinedIntervalConverter.java b/...ava/io/jmix/ui/app/propertyfilter/dateinterval/converter/PredefinedIntervalConverter.java
@@ -21,10 +21,10 @@
 import io.jmix.ui.app.propertyfilter.dateinterval.model.BaseDateInterval;
 import io.jmix.ui.app.propertyfilter.dateinterval.model.predefined.PredefinedDateInterval;
 import io.jmix.ui.app.propertyfilter.dateinterval.model.predefined.PredefinedDateIntervalRegistry;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Nullable;
 import java.util.regex.Pattern;
 
 @Internal

diff --git a/ui/src/main/java/io/jmix/ui/xml/layout/loader/TreeLoader.java b/ui/src/main/java/io/jmix/ui/xml/layout/loader/TreeLoader.java
@@ -32,7 +32,8 @@
 import io.jmix.ui.xml.layout.ComponentLoader;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.Element;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class TreeLoader extends ActionsHolderLoader<Tree> {