Upped versions.

vpro · Sep 29, 2023 · e2bf804 · e2bf804
1 parent c2c41ea
commit e2bf804
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/magnolia-vpro-ui-poms/pom.xml b/magnolia-vpro-ui-poms/pom.xml
@@ -6,13 +6,12 @@
     <version>1.10-SNAPSHOT</version>
   </parent>
   <artifactId>magnolia-vpro-ui-poms</artifactId>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>nl.vpro.poms</groupId>
         <artifactId>poms-bom</artifactId>
-        <version>7.6.4</version>
+        <version>7.7.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/magnolia-vpro-ui/pom.xml b/magnolia-vpro-ui/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>info.magnolia.dam</groupId>
       <artifactId>magnolia-dam-app</artifactId>
-      <version>3.0.25</version>
+      <version>3.0.26</version>
       <optional>true</optional>
     </dependency>
 

diff --git a/magnolia-vpro-ui/src/main/java/nl/vpro/magnolia/ui/enumfield/DisplayableConverter.java b/magnolia-vpro-ui/src/main/java/nl/vpro/magnolia/ui/enumfield/DisplayableConverter.java
@@ -18,7 +18,10 @@
  */
 package nl.vpro.magnolia.ui.enumfield;
 
+import java.net.URI;
+
 import com.vaadin.data.ValueContext;
+
 import nl.vpro.i18n.Displayable;
 import nl.vpro.i18n.Locales;
 
@@ -41,7 +44,7 @@ public String convertToPresentation(E value, ValueContext context) {
 
     @Override
     public String getIcon(E value) {
-        return value.getIcon().orElse(null);
+        return value.getIcon().map(URI::toString).orElse(null);
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -48,8 +48,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <magnolia.ui.version>6.2.38</magnolia.ui.version>
-    <vpro.shared.version>3.5.4</vpro.shared.version>
+    <magnolia.ui.version>6.2.39</magnolia.ui.version>
+    <vpro.shared.version>4.0.0</vpro.shared.version>
   </properties>
 
   <build>
@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.28</version>
+      <version>1.18.30</version>
       <scope>provided</scope>
     </dependency>