diff --git a/examples/hawkbit-example-app/pom.xml b/examples/hawkbit-example-app/pom.xml index f0bae1729..5ec64d3fa 100644 --- a/examples/hawkbit-example-app/pom.xml +++ b/examples/hawkbit-example-app/pom.xml @@ -114,6 +114,18 @@ com.h2database h2 + + + + com.vaadin + vaadin-client + + + com.vaadin.external.gwt + gwt-elemental + + + diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml index 8a3107971..1297ae68b 100644 --- a/hawkbit-security-core/pom.xml +++ b/hawkbit-security-core/pom.xml @@ -29,6 +29,7 @@ javax.servlet javax.servlet-api + provided org.springframework diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java index 3d167d4cb..327f096d7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java @@ -8,6 +8,7 @@ */ package org.eclipse.hawkbit.ui.rollout; +import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; @@ -17,7 +18,7 @@ import org.vaadin.alump.distributionbar.gwt.client.GwtDistributionBar; /** * Distribution bar helper to render distribution bar in grid. - * + * */ public final class DistributionBarHelper { private static final String HTML_DIV_END = ""; @@ -33,10 +34,10 @@ public final class DistributionBarHelper { /** * Returns a string with details of status and count . - * + * * @param statusTotalCountMap * map with status and count - * + * * @return string of format "status1:count,status2:count" */ public static String getDistributionBarAsHTMLString(final Map statusTotalCountMap) { @@ -61,7 +62,7 @@ public final class DistributionBarHelper { /** * Returns the map with status having non zero values. - * + * * @param statusTotalCountMap * map with status and count * @return map with non zero values @@ -73,7 +74,7 @@ public final class DistributionBarHelper { /** * Returns tool tip for progress bar. - * + * * @param statusCountMap * map with status and count details * @return tool tip @@ -114,7 +115,9 @@ public final class DistributionBarHelper { final double minTotalSize = MINIMUM_PART_SIZE * noOfParts; final double availableSize = PARENT_SIZE_IN_PCT - minTotalSize; final double val = MINIMUM_PART_SIZE + (double) value / totalValue * availableSize; - return String.format("%.3f", val) + "%"; + // necessary due the format must contain a dot and other locals might + // use a comma + return String.format(Locale.ENGLISH, "%.3f", val) + "%"; } private static String getPart(final int partIndex, final Status status, final Long value, final Long totalValue, diff --git a/pom.xml b/pom.xml index af1dd2d86..f26a9f577 100644 --- a/pom.xml +++ b/pom.xml @@ -115,14 +115,14 @@ - 1.0.0 + 1.0.2 0.0.6.RELEASE - 7.6.8 + 7.7.3 ${vaadin.version} 7.6.1.3 - 2.2.0 + 2.3.0 7.0.1 - 1.2.0 + 2.0.0 4.5 @@ -472,7 +472,7 @@ ${vaadin.version} pom import - + com.vaadin vaadin-spring-boot