Upgrade vaadin from 7.6.8 -> 7.7.3: (#339)
* Upgrade vaadin from 7.6.8 -> 7.7.3: upgrade vaadin.spring from 1.0.0 -> 1.0.2 upgrade flexibleoptiongroup from 2.2.0 -> 2.3.0 upgrade dbar-addon from 1.2.0 -> 2.0.0 exclude gwt-elemental for example app Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com> * Change Maven scope for javax.servlet-api to provided Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com> * Fix problem with locale for formatting distribution-bar width value - Set fix locale to Locale.ENGLISH Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
This commit is contained in:
committed by
Michael Hirsch
parent
8d19f19a35
commit
23eb0c3c73
@@ -114,6 +114,18 @@
|
|||||||
<groupId>com.h2database</groupId>
|
<groupId>com.h2database</groupId>
|
||||||
<artifactId>h2</artifactId>
|
<artifactId>h2</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- exclude gwt-elemental as there are class conflicts -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.vaadin</groupId>
|
||||||
|
<artifactId>vaadin-client</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.vaadin.external.gwt</groupId>
|
||||||
|
<artifactId>gwt-elemental</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>javax.servlet-api</artifactId>
|
<artifactId>javax.servlet-api</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.eclipse.hawkbit.ui.rollout;
|
package org.eclipse.hawkbit.ui.rollout;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -114,7 +115,9 @@ public final class DistributionBarHelper {
|
|||||||
final double minTotalSize = MINIMUM_PART_SIZE * noOfParts;
|
final double minTotalSize = MINIMUM_PART_SIZE * noOfParts;
|
||||||
final double availableSize = PARENT_SIZE_IN_PCT - minTotalSize;
|
final double availableSize = PARENT_SIZE_IN_PCT - minTotalSize;
|
||||||
final double val = MINIMUM_PART_SIZE + (double) value / totalValue * availableSize;
|
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,
|
private static String getPart(final int partIndex, final Status status, final Long value, final Long totalValue,
|
||||||
|
|||||||
8
pom.xml
8
pom.xml
@@ -115,14 +115,14 @@
|
|||||||
<!-- Spring boot version overrides - END -->
|
<!-- Spring boot version overrides - END -->
|
||||||
|
|
||||||
<!-- Vaadin versions - START -->
|
<!-- Vaadin versions - START -->
|
||||||
<vaadin.spring.version>1.0.0</vaadin.spring.version>
|
<vaadin.spring.version>1.0.2</vaadin.spring.version>
|
||||||
<vaadin.spring.addon.version>0.0.6.RELEASE</vaadin.spring.addon.version>
|
<vaadin.spring.addon.version>0.0.6.RELEASE</vaadin.spring.addon.version>
|
||||||
<vaadin.version>7.6.8</vaadin.version>
|
<vaadin.version>7.7.3</vaadin.version>
|
||||||
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
|
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
|
||||||
<vaadin.addon.vaadin-lazyquerycontainer.version>7.6.1.3</vaadin.addon.vaadin-lazyquerycontainer.version>
|
<vaadin.addon.vaadin-lazyquerycontainer.version>7.6.1.3</vaadin.addon.vaadin-lazyquerycontainer.version>
|
||||||
<vaadin.addon.flexibleoptiongroup.version>2.2.0</vaadin.addon.flexibleoptiongroup.version>
|
<vaadin.addon.flexibleoptiongroup.version>2.3.0</vaadin.addon.flexibleoptiongroup.version>
|
||||||
<vaadin.addon.tokenfield.version>7.0.1</vaadin.addon.tokenfield.version>
|
<vaadin.addon.tokenfield.version>7.0.1</vaadin.addon.tokenfield.version>
|
||||||
<vaadin.addon.dbar-addon.version>1.2.0</vaadin.addon.dbar-addon.version>
|
<vaadin.addon.dbar-addon.version>2.0.0</vaadin.addon.dbar-addon.version>
|
||||||
<vaadin.addon.contextmenu.version>4.5</vaadin.addon.contextmenu.version>
|
<vaadin.addon.contextmenu.version>4.5</vaadin.addon.contextmenu.version>
|
||||||
<!-- Vaadin versions - END -->
|
<!-- Vaadin versions - END -->
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user