summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-09 17:19:39 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-10 10:24:42 +0200
commit6c4c67234a3c2bbfea659006b9d85c2ce1375b8a (patch)
treeefc73a520271d67f5abf962778b050b10f3edd72
parent16eae732958e7a5841e3f46a5968fa85833da05b (diff)
downloadvaadin-framework-6c4c67234a3c2bbfea659006b9d85c2ce1375b8a.tar.gz
vaadin-framework-6c4c67234a3c2bbfea659006b9d85c2ce1375b8a.zip
Migrate vaadin-shared build to maven
Change-Id: I4ddc5050874faeb091740ac5ab4f9cafecf5696b
-rw-r--r--.gitignore10
-rwxr-xr-xbuild/ide.xml2
-rw-r--r--client-compiler/ivy.xml2
-rw-r--r--client/ivy.xml2
-rw-r--r--ivysettings.xml2
-rw-r--r--server/ivy.xml2
-rw-r--r--shared/build.xml71
-rw-r--r--shared/ivy.xml19
-rw-r--r--shared/pom.xml195
-rw-r--r--shared/src/main/java-templates/com/vaadin/shared/Version.java (renamed from shared/src/com/vaadin/shared/Version.java)4
-rw-r--r--shared/src/main/java/com/vaadin/shared/AbstractComponentState.java (renamed from shared/src/com/vaadin/shared/AbstractComponentState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/AbstractFieldState.java (renamed from shared/src/com/vaadin/shared/AbstractFieldState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ApplicationConstants.java (renamed from shared/src/com/vaadin/shared/ApplicationConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ComponentConstants.java (renamed from shared/src/com/vaadin/shared/ComponentConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/Connector.java (renamed from shared/src/com/vaadin/shared/Connector.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ContextClickRpc.java (renamed from shared/src/com/vaadin/shared/ContextClickRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/EventId.java (renamed from shared/src/com/vaadin/shared/EventId.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/JavaScriptConnectorState.java (renamed from shared/src/com/vaadin/shared/JavaScriptConnectorState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java (renamed from shared/src/com/vaadin/shared/JavaScriptExtensionState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/JsonConstants.java (renamed from shared/src/com/vaadin/shared/JsonConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/MouseEventDetails.java (renamed from shared/src/com/vaadin/shared/MouseEventDetails.java)0
-rwxr-xr-xshared/src/main/java/com/vaadin/shared/Position.java (renamed from shared/src/com/vaadin/shared/Position.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/VBrowserDetails.java (renamed from shared/src/com/vaadin/shared/VBrowserDetails.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java (renamed from shared/src/com/vaadin/shared/VaadinUriResolver.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/annotations/Delayed.java (renamed from shared/src/com/vaadin/shared/annotations/Delayed.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/annotations/DelegateToWidget.java (renamed from shared/src/com/vaadin/shared/annotations/DelegateToWidget.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/annotations/NoLayout.java (renamed from shared/src/com/vaadin/shared/annotations/NoLayout.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/annotations/NoLoadingIndicator.java (renamed from shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/ClientRpc.java (renamed from shared/src/com/vaadin/shared/communication/ClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java (renamed from shared/src/com/vaadin/shared/communication/FieldRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java (renamed from shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java (renamed from shared/src/com/vaadin/shared/communication/MethodInvocation.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/PushConstants.java (renamed from shared/src/com/vaadin/shared/communication/PushConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/PushMode.java (renamed from shared/src/com/vaadin/shared/communication/PushMode.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/ServerRpc.java (renamed from shared/src/com/vaadin/shared/communication/ServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/SharedState.java (renamed from shared/src/com/vaadin/shared/communication/SharedState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/URLReference.java (renamed from shared/src/com/vaadin/shared/communication/URLReference.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/communication/UidlValue.java (renamed from shared/src/com/vaadin/shared/communication/UidlValue.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/data/DataProviderRpc.java (renamed from shared/src/com/vaadin/shared/data/DataProviderRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/data/DataRequestRpc.java (renamed from shared/src/com/vaadin/shared/data/DataRequestRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/data/sort/SortDirection.java (renamed from shared/src/com/vaadin/shared/data/sort/SortDirection.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java (renamed from shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java (renamed from shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/AbstractEmbeddedState.java (renamed from shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/AbstractLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/AbstractLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/AbstractMediaState.java (renamed from shared/src/com/vaadin/shared/ui/AbstractMediaState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java (renamed from shared/src/com/vaadin/shared/ui/AlignmentInfo.java)0
-rwxr-xr-xshared/src/main/java/com/vaadin/shared/ui/BorderStyle.java (renamed from shared/src/com/vaadin/shared/ui/BorderStyle.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/BrowserWindowOpenerState.java (renamed from shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ClickRpc.java (renamed from shared/src/com/vaadin/shared/ui/ClickRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java (renamed from shared/src/com/vaadin/shared/ui/ComponentStateUtil.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/Connect.java (renamed from shared/src/com/vaadin/shared/ui/Connect.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java (renamed from shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/LayoutClickRpc.java (renamed from shared/src/com/vaadin/shared/ui/LayoutClickRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java (renamed from shared/src/com/vaadin/shared/ui/MarginInfo.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/MediaControl.java (renamed from shared/src/com/vaadin/shared/ui/MediaControl.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/MultiSelectMode.java (renamed from shared/src/com/vaadin/shared/ui/MultiSelectMode.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/Orientation.java (renamed from shared/src/com/vaadin/shared/ui/Orientation.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ShortCutConstants.java (renamed from shared/src/com/vaadin/shared/ui/ShortCutConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/TabIndexState.java (renamed from shared/src/com/vaadin/shared/ui/TabIndexState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/accordion/AccordionState.java (renamed from shared/src/com/vaadin/shared/ui/accordion/AccordionState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/audio/AudioState.java (renamed from shared/src/com/vaadin/shared/ui/audio/AudioState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/browserframe/BrowserFrameState.java (renamed from shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/button/ButtonServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/button/ButtonState.java (renamed from shared/src/com/vaadin/shared/ui/button/ButtonState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/button/NativeButtonState.java (renamed from shared/src/com/vaadin/shared/ui/button/NativeButtonState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java (renamed from shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java (renamed from shared/src/com/vaadin/shared/ui/calendar/CalendarState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java (renamed from shared/src/com/vaadin/shared/ui/calendar/DateConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxState.java (renamed from shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/Color.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java (renamed from shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java (renamed from shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java (renamed from shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java (renamed from shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/customlayout/CustomLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldConstants.java (renamed from shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateFieldState.java (renamed from shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java (renamed from shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java (renamed from shared/src/com/vaadin/shared/ui/datefield/Resolution.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/TextualDateFieldState.java (renamed from shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/dd/AcceptCriterion.java (renamed from shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/dd/DragEventType.java (renamed from shared/src/com/vaadin/shared/ui/dd/DragEventType.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/dd/HorizontalDropLocation.java (renamed from shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/dd/VerticalDropLocation.java (renamed from shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java (renamed from shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedConstants.java (renamed from shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedState.java (renamed from shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/flash/FlashState.java (renamed from shared/src/com/vaadin/shared/ui/flash/FlashState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/form/FormState.java (renamed from shared/src/com/vaadin/shared/ui/form/FormState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/ColumnGroupState.java (renamed from shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java (renamed from shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/EditorClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/EditorServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridColumnState.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridColumnState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridConstants.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticCellType.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticSectionState.java (renamed from shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/HeightMode.java (renamed from shared/src/com/vaadin/shared/ui/grid/HeightMode.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/Range.java (renamed from shared/src/com/vaadin/shared/ui/grid/Range.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/ScrollDestination.java (renamed from shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java (renamed from shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java (renamed from shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/image/ImageServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/image/ImageState.java (renamed from shared/src/com/vaadin/shared/ui/image/ImageState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java (renamed from shared/src/com/vaadin/shared/ui/label/ContentMode.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java (renamed from shared/src/com/vaadin/shared/ui/label/LabelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/link/LinkConstants.java (renamed from shared/src/com/vaadin/shared/ui/link/LinkConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/link/LinkState.java (renamed from shared/src/com/vaadin/shared/ui/link/LinkState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarConstants.java (renamed from shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarState.java (renamed from shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java (renamed from shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java (renamed from shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java (renamed from shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/panel/PanelServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/panel/PanelState.java (renamed from shared/src/com/vaadin/shared/ui/panel/PanelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewState.java (renamed from shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressBarState.java (renamed from shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java (renamed from shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java (renamed from shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/slider/SliderOrientation.java (renamed from shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/slider/SliderServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/slider/SliderState.java (renamed from shared/src/com/vaadin/shared/ui/slider/SliderState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java (renamed from shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java (renamed from shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java (renamed from shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java (renamed from shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java (renamed from shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java (renamed from shared/src/com/vaadin/shared/ui/table/TableConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/table/TableServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/table/TableState.java (renamed from shared/src/com/vaadin/shared/ui/table/TableState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabState.java (renamed from shared/src/com/vaadin/shared/ui/tabsheet/TabState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java (renamed from shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java (renamed from shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetState.java (renamed from shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java (renamed from shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java (renamed from shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java (renamed from shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/textfield/TextFieldConstants.java (renamed from shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java (renamed from shared/src/com/vaadin/shared/ui/tree/TreeConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java (renamed from shared/src/com/vaadin/shared/ui/tree/TreeState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java (renamed from shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java (renamed from shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java (renamed from shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java (renamed from shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/NotificationRole.java (renamed from shared/src/com/vaadin/shared/ui/ui/NotificationRole.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/PageClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/PageState.java (renamed from shared/src/com/vaadin/shared/ui/ui/PageState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/ScrollClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/Transport.java (renamed from shared/src/com/vaadin/shared/ui/ui/Transport.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/UIClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/UIConstants.java (renamed from shared/src/com/vaadin/shared/ui/ui/UIConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java (renamed from shared/src/com/vaadin/shared/ui/ui/UIState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/upload/UploadClientRpc.java (renamed from shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/upload/UploadServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/upload/UploadState.java (renamed from shared/src/com/vaadin/shared/ui/upload/UploadState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/video/VideoConstants.java (renamed from shared/src/com/vaadin/shared/ui/video/VideoConstants.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/video/VideoState.java (renamed from shared/src/com/vaadin/shared/ui/video/VideoState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/window/WindowMode.java (renamed from shared/src/com/vaadin/shared/ui/window/WindowMode.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/window/WindowRole.java (renamed from shared/src/com/vaadin/shared/ui/window/WindowRole.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/window/WindowServerRpc.java (renamed from shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/window/WindowState.java (renamed from shared/src/com/vaadin/shared/ui/window/WindowState.java)0
-rw-r--r--shared/src/main/java/com/vaadin/shared/util/SharedUtil.java (renamed from shared/src/com/vaadin/shared/util/SharedUtil.java)0
-rw-r--r--shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java (renamed from shared/tests/src/com/vaadin/shared/ui/grid/RangeTest.java)0
-rw-r--r--shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java (renamed from shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java)0
-rw-r--r--widgets/ivy.xml2
199 files changed, 213 insertions, 98 deletions
diff --git a/.gitignore b/.gitignore
index 351b884123..8cb8b213ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
+# Eclipse
+.classpath
+.project
+.settings
# /
-/.classpath
/.cvsignore
-/.project
/.tomcatplugin
-/.settings
/work
/.gwt-cache
/.externalToolBuilders
@@ -84,6 +85,7 @@ scripts/*.pyc
*/result
result
push/target/
+shared/target/
.sass-cache
-phantomjsdriver.log \ No newline at end of file
+phantomjsdriver.log
diff --git a/build/ide.xml b/build/ide.xml
index 89b26a7e7b..c7cfee151c 100755
--- a/build/ide.xml
+++ b/build/ide.xml
@@ -34,7 +34,7 @@
<path refid="gwt.deps" />
<path refid="uitest.deps" />
<path location="server/src" />
- <path location="shared/src" />
+ <path location="shared/src/main/java" />
<path location="uitest/src" />
<path location="client/src" />
</path>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index d30dea5136..f0f479a5b3 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -21,7 +21,7 @@
</publications>
<dependencies>
<dependency org="com.vaadin" name="vaadin-shared"
- rev="${vaadin.version}" conf="build" />
+ rev="${vaadin.version}" conf="build -> default" />
<dependency org="com.vaadin" name="vaadin-server"
rev="${vaadin.version}" conf="build" />
<dependency org="com.vaadin" name="vaadin-client"
diff --git a/client/ivy.xml b/client/ivy.xml
index 6b941af818..961050826c 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -25,7 +25,7 @@
<!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
<dependency org="com.vaadin" name="vaadin-shared"
- rev="${vaadin.version}" conf="build,test->build">
+ rev="${vaadin.version}" conf="build,test->default">
<exclude type="pom" conf="test" />
</dependency>
<dependency org="com.vaadin" name="vaadin-server"
diff --git a/ivysettings.xml b/ivysettings.xml
index 66af667ef1..d8c870b068 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -38,7 +38,7 @@
<module organisation="com.vaadin" name="vaadin-buildhelpers"
resolver="build-temp" />
<module organisation="com.vaadin" name="vaadin-shared"
- resolver="build-temp" />
+ resolver="local-maven" />
<module organisation="com.vaadin" name="vaadin-server"
resolver="build-temp" />
<module organisation="com.vaadin" name="vaadin-client"
diff --git a/server/ivy.xml b/server/ivy.xml
index a384759128..c384829a16 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -51,7 +51,7 @@
<!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
<dependency org="com.vaadin" name="vaadin-shared"
- rev="${vaadin.version}" conf="build,test->build">
+ rev="${vaadin.version}" conf="build,test->default">
<exclude type="pom" conf="test" />
</dependency>
<dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
diff --git a/shared/build.xml b/shared/build.xml
deleted file mode 100644
index 30f4ac65ce..0000000000
--- a/shared/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-shared" basedir="." default="publish-local"
- xmlns:ivy="antlib:org.apache.ivy.ant">
- <description>
- The shared module containing classes used by both server and client.
- </description>
- <include file="../common.xml" as="common" />
- <include file="../build.xml" as="vaadin" />
- <include file="../gwt-files.xml" as="gwtfiles" />
-
- <!-- global properties -->
- <property name="module.name" value="vaadin-shared" />
- <property name="module.symbolic" value="com.vaadin.shared" />
- <property name="result.dir" location="result" />
- <property name="src.filtered" location="${result.dir}/filtered-src" />
- <property name="src" location="${src.filtered}" />
- <path id="classpath.compile.custom">
- <fileset file="${gwt.elemental.jar}" />
- </path>
- <path id="classpath.test.custom" />
-
- <target name="jar">
- <property name="shared.osgi.import"
- value="com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
- <property name="shared.osgi.require-bundle"
- value="com.google.gwt.thirdparty.guava;bundle-version=&quot;16.0.1.vaadin1&quot;" />
- <delete dir="${src.filtered}" />
- <!-- Update version in Version.java -->
- <copy todir="${src.filtered}">
- <fileset dir="src">
- </fileset>
- <filterchain>
- <replacetokens begintoken="@" endtoken="@">
- <token key="VERSION" value="${vaadin.version}" />
- </replacetokens>
- </filterchain>
- </copy>
-
- <antcall target="common.jar">
- <param name="import-package" value="${shared.osgi.import}" />
- <param name="require-bundle" value="${shared.osgi.require-bundle}" />
- <reference refid="shared.gwt.includes" torefid="extra.jar.includes" />
- <param name="osgi.extra.package.prefixes" value="elemental" />
- </antcall>
- </target>
-
- <target name="publish-local" depends="jar">
- <antcall target="common.sources.jar">
- <reference torefid="extra.jar.includes" refid="shared.gwt.includes" />
- </antcall>
- <antcall target="common.javadoc.jar" />
-
- <antcall target="common.publish-local" />
- </target>
-
- <target name="clean">
- <antcall target="common.clean" />
- </target>
-
- <target name="checkstyle">
- <antcall target="common.checkstyle">
- <param name="cs.src" location="src" />
- </antcall>
- </target>
-
- <target name="test" depends="checkstyle">
- <antcall target="common.test.run" />
- </target>
-
-</project>
diff --git a/shared/ivy.xml b/shared/ivy.xml
index dcb7390c04..0dad8e4921 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -8,28 +8,17 @@
revision="${vaadin.version}" />
<configurations>
- <conf name="build" />
- <conf name="build-provided" />
<conf name="ide" visibility="private" />
- <conf name="test" />
</configurations>
- <publications>
- <artifact type="jar" ext="jar" />
- <artifact type="source" ext="jar" m:classifier="sources" />
- <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
- <artifact type="pom" ext="pom" />
- </publications>
+
<dependencies>
<dependency org="com.vaadin.external.flute" name="flute"
- rev="1.3.0.gg2" conf="build,ide,test->default" />
+ rev="1.3.0.gg2" conf="ide->default" />
<dependency org="com.vaadin.external.streamhtmlparser"
name="streamhtmlparser-jsilver" rev="0.0.10.vaadin1"
- conf="build,ide,test->default" />
+ conf="ide->default" />
<dependency org="com.vaadin.external.google" name="guava"
- rev="16.0.1.vaadin1" conf="build,ide,test->default" />
- <dependency org="junit" name="junit" rev="4.11"
- conf="test,ide -> default" />
-
+ rev="16.0.1.vaadin1" conf="ide->default" />
</dependencies>
</ivy-module>
diff --git a/shared/pom.xml b/shared/pom.xml
new file mode 100644
index 0000000000..f5e24086b6
--- /dev/null
+++ b/shared/pom.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-shared</artifactId>
+ <name>vaadin-shared</name>
+ <packaging>jar</packaging>
+ <version>7.7.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <!-- Used version numbers for dependencies -->
+ <flute.version>1.3.0.gg2</flute.version>
+ <streamhtmlparser.version>0.0.10.vaadin1</streamhtmlparser.version>
+ <guava.version>16.0.1.vaadin1</guava.version>
+ <!-- TODO: Move to Parent -->
+ <vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
+ </properties>
+
+ <organization>
+ <name>Vaadin Ltd</name>
+ </organization>
+ <url>https://vaadin.com/</url>
+ <description>Vaadin shared</description>
+
+ <dependencies>
+ <!-- Actual dependencies -->
+ <dependency>
+ <groupId>com.vaadin.external.flute</groupId>
+ <artifactId>flute</artifactId>
+ <version>${flute.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.external.streamhtmlparser</groupId>
+ <artifactId>streamhtmlparser-jsilver</artifactId>
+ <version>${streamhtmlparser.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.external.google</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <!-- Needed GWT dependencies. Required parts are packaged to jar -->
+ <dependency>
+ <groupId>com.vaadin.external.gwt</groupId>
+ <artifactId>gwt-elemental</artifactId>
+ <version>${vaadin.gwt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- Generated Version.java -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>templating-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>filter-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Copy needed GWT dependencies to package -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>unpack-dependencies</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.vaadin.external.gwt</groupId>
+ <artifactId>gwt-elemental</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.vaadin.external.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <includes>elemental/json/**,elemental/util/Array*,elemental/util/Can*,elemental/util/Map*,com/google/gwt/*/shared/**,com/google/gwt/*/*/shared/**,com/google/web/bindery/*/shared/**,com/google/gwt/user/client/rpc/IsSerializable.*</includes>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <!-- Copy .java files to package -->
+ <execution>
+ <id>copy-sources</id>
+ <!-- here the phase you need -->
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/generated-sources/java-templates</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+ <Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}",elemental.*;version="${project.version}"</Export-Package>
+ <Import-Package>com.google.gwt.thirdparty.streamhtmlparser;version="${streamhtmlparser.version}",
+ com.google.gwt.thirdparty.streamhtmlparser.impl;version="${streamhtmlparser.version}",
+ com.google.gwt.thirdparty.streamhtmlparser.util;version="${streamhtmlparser.version}",
+ org.w3c.flute.parser;version="${flute.version}",
+ org.w3c.flute.parser.selectors;version="${flute.version}",
+ org.w3c.flute.util;version="${flute.version}"</Import-Package>
+ <Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}"</Require-Bundle>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <index>false</index>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19.1</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/shared/src/com/vaadin/shared/Version.java b/shared/src/main/java-templates/com/vaadin/shared/Version.java
index a492229643..7bcc8c6f65 100644
--- a/shared/src/com/vaadin/shared/Version.java
+++ b/shared/src/main/java-templates/com/vaadin/shared/Version.java
@@ -47,10 +47,10 @@ public class Version implements Serializable {
/* Initialize version numbers from string replaced by build-script. */
static {
- if ("@VERSION@".equals("@" + "VERSION" + "@")) {
+ if ("${vaadin.version}".equals("${" + "vaadin.version" + "}")) {
VERSION = "9.9.9.INTERNAL-DEBUG-BUILD";
} else {
- VERSION = "@VERSION@";
+ VERSION = "${vaadin.version}";
}
final String[] digits = VERSION.split("\\.", 4);
VERSION_MAJOR = Integer.parseInt(digits[0]);
diff --git a/shared/src/com/vaadin/shared/AbstractComponentState.java b/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java
index 1c32a67c70..1c32a67c70 100644
--- a/shared/src/com/vaadin/shared/AbstractComponentState.java
+++ b/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java
diff --git a/shared/src/com/vaadin/shared/AbstractFieldState.java b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
index 3e9fd811de..3e9fd811de 100644
--- a/shared/src/com/vaadin/shared/AbstractFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
index e5da716eb3..e5da716eb3 100644
--- a/shared/src/com/vaadin/shared/ApplicationConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
diff --git a/shared/src/com/vaadin/shared/ComponentConstants.java b/shared/src/main/java/com/vaadin/shared/ComponentConstants.java
index dae1382256..dae1382256 100644
--- a/shared/src/com/vaadin/shared/ComponentConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ComponentConstants.java
diff --git a/shared/src/com/vaadin/shared/Connector.java b/shared/src/main/java/com/vaadin/shared/Connector.java
index c4a880f5ea..c4a880f5ea 100644
--- a/shared/src/com/vaadin/shared/Connector.java
+++ b/shared/src/main/java/com/vaadin/shared/Connector.java
diff --git a/shared/src/com/vaadin/shared/ContextClickRpc.java b/shared/src/main/java/com/vaadin/shared/ContextClickRpc.java
index 2152de0863..2152de0863 100644
--- a/shared/src/com/vaadin/shared/ContextClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ContextClickRpc.java
diff --git a/shared/src/com/vaadin/shared/EventId.java b/shared/src/main/java/com/vaadin/shared/EventId.java
index ad840d1e5d..ad840d1e5d 100644
--- a/shared/src/com/vaadin/shared/EventId.java
+++ b/shared/src/main/java/com/vaadin/shared/EventId.java
diff --git a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java b/shared/src/main/java/com/vaadin/shared/JavaScriptConnectorState.java
index 12c9728628..12c9728628 100644
--- a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java
+++ b/shared/src/main/java/com/vaadin/shared/JavaScriptConnectorState.java
diff --git a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java
index 5050ffec10..5050ffec10 100644
--- a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java
+++ b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java
diff --git a/shared/src/com/vaadin/shared/JsonConstants.java b/shared/src/main/java/com/vaadin/shared/JsonConstants.java
index fd26d2ab74..fd26d2ab74 100644
--- a/shared/src/com/vaadin/shared/JsonConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/JsonConstants.java
diff --git a/shared/src/com/vaadin/shared/MouseEventDetails.java b/shared/src/main/java/com/vaadin/shared/MouseEventDetails.java
index 3c06ee80f3..3c06ee80f3 100644
--- a/shared/src/com/vaadin/shared/MouseEventDetails.java
+++ b/shared/src/main/java/com/vaadin/shared/MouseEventDetails.java
diff --git a/shared/src/com/vaadin/shared/Position.java b/shared/src/main/java/com/vaadin/shared/Position.java
index 9234c798d1..9234c798d1 100755
--- a/shared/src/com/vaadin/shared/Position.java
+++ b/shared/src/main/java/com/vaadin/shared/Position.java
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
index a7426d2022..a7426d2022 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
diff --git a/shared/src/com/vaadin/shared/VaadinUriResolver.java b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
index ee8d13f10f..ee8d13f10f 100644
--- a/shared/src/com/vaadin/shared/VaadinUriResolver.java
+++ b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
diff --git a/shared/src/com/vaadin/shared/annotations/Delayed.java b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java
index f7e24de006..f7e24de006 100644
--- a/shared/src/com/vaadin/shared/annotations/Delayed.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java
diff --git a/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java b/shared/src/main/java/com/vaadin/shared/annotations/DelegateToWidget.java
index ee5cf78a68..ee5cf78a68 100644
--- a/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/DelegateToWidget.java
diff --git a/shared/src/com/vaadin/shared/annotations/NoLayout.java b/shared/src/main/java/com/vaadin/shared/annotations/NoLayout.java
index b77729cdcc..b77729cdcc 100644
--- a/shared/src/com/vaadin/shared/annotations/NoLayout.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/NoLayout.java
diff --git a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java b/shared/src/main/java/com/vaadin/shared/annotations/NoLoadingIndicator.java
index 2e519b69e8..2e519b69e8 100644
--- a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/NoLoadingIndicator.java
diff --git a/shared/src/com/vaadin/shared/communication/ClientRpc.java b/shared/src/main/java/com/vaadin/shared/communication/ClientRpc.java
index e400c7de7c..e400c7de7c 100644
--- a/shared/src/com/vaadin/shared/communication/ClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/ClientRpc.java
diff --git a/shared/src/com/vaadin/shared/communication/FieldRpc.java b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java
index 28ae8d39b6..28ae8d39b6 100644
--- a/shared/src/com/vaadin/shared/communication/FieldRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java
diff --git a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java
index 4d21b5af7a..4d21b5af7a 100644
--- a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java
diff --git a/shared/src/com/vaadin/shared/communication/MethodInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java
index a4370f37de..a4370f37de 100644
--- a/shared/src/com/vaadin/shared/communication/MethodInvocation.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java
diff --git a/shared/src/com/vaadin/shared/communication/PushConstants.java b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java
index 5b23cd7f6e..5b23cd7f6e 100644
--- a/shared/src/com/vaadin/shared/communication/PushConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java
diff --git a/shared/src/com/vaadin/shared/communication/PushMode.java b/shared/src/main/java/com/vaadin/shared/communication/PushMode.java
index 7b0f968c77..7b0f968c77 100644
--- a/shared/src/com/vaadin/shared/communication/PushMode.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/PushMode.java
diff --git a/shared/src/com/vaadin/shared/communication/ServerRpc.java b/shared/src/main/java/com/vaadin/shared/communication/ServerRpc.java
index e23b3758c6..e23b3758c6 100644
--- a/shared/src/com/vaadin/shared/communication/ServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/ServerRpc.java
diff --git a/shared/src/com/vaadin/shared/communication/SharedState.java b/shared/src/main/java/com/vaadin/shared/communication/SharedState.java
index b21a675a4a..b21a675a4a 100644
--- a/shared/src/com/vaadin/shared/communication/SharedState.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/SharedState.java
diff --git a/shared/src/com/vaadin/shared/communication/URLReference.java b/shared/src/main/java/com/vaadin/shared/communication/URLReference.java
index be767fb25c..be767fb25c 100644
--- a/shared/src/com/vaadin/shared/communication/URLReference.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/URLReference.java
diff --git a/shared/src/com/vaadin/shared/communication/UidlValue.java b/shared/src/main/java/com/vaadin/shared/communication/UidlValue.java
index 04015213f9..04015213f9 100644
--- a/shared/src/com/vaadin/shared/communication/UidlValue.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/UidlValue.java
diff --git a/shared/src/com/vaadin/shared/data/DataProviderRpc.java b/shared/src/main/java/com/vaadin/shared/data/DataProviderRpc.java
index 05965ea56c..05965ea56c 100644
--- a/shared/src/com/vaadin/shared/data/DataProviderRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/data/DataProviderRpc.java
diff --git a/shared/src/com/vaadin/shared/data/DataRequestRpc.java b/shared/src/main/java/com/vaadin/shared/data/DataRequestRpc.java
index 4b553dda68..4b553dda68 100644
--- a/shared/src/com/vaadin/shared/data/DataRequestRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/data/DataRequestRpc.java
diff --git a/shared/src/com/vaadin/shared/data/sort/SortDirection.java b/shared/src/main/java/com/vaadin/shared/data/sort/SortDirection.java
index cd572087d7..cd572087d7 100644
--- a/shared/src/com/vaadin/shared/data/sort/SortDirection.java
+++ b/shared/src/main/java/com/vaadin/shared/data/sort/SortDirection.java
diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java
index 7a75bcbec1..7a75bcbec1 100644
--- a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java
diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
index e5af6a04f8..e5af6a04f8 100644
--- a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
+++ b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
diff --git a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractEmbeddedState.java
index 0cb9be8702..0cb9be8702 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractEmbeddedState.java
diff --git a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractLayoutState.java
index 49e5e1c36a..49e5e1c36a 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractMediaState.java
index 3029bedca7..3029bedca7 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractMediaState.java
diff --git a/shared/src/com/vaadin/shared/ui/AlignmentInfo.java b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java
index 120552a43d..120552a43d 100644
--- a/shared/src/com/vaadin/shared/ui/AlignmentInfo.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java
diff --git a/shared/src/com/vaadin/shared/ui/BorderStyle.java b/shared/src/main/java/com/vaadin/shared/ui/BorderStyle.java
index ff5c7c7179..ff5c7c7179 100755
--- a/shared/src/com/vaadin/shared/ui/BorderStyle.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/BorderStyle.java
diff --git a/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java b/shared/src/main/java/com/vaadin/shared/ui/BrowserWindowOpenerState.java
index 6196ea09ac..6196ea09ac 100644
--- a/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/BrowserWindowOpenerState.java
diff --git a/shared/src/com/vaadin/shared/ui/ClickRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ClickRpc.java
index 388ac14882..388ac14882 100644
--- a/shared/src/com/vaadin/shared/ui/ClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ClickRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java
index 894a1bbcbb..894a1bbcbb 100644
--- a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java
diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/main/java/com/vaadin/shared/ui/Connect.java
index b0c20cec31..b0c20cec31 100644
--- a/shared/src/com/vaadin/shared/ui/Connect.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/Connect.java
diff --git a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java
index 3208934146..3208934146 100644
--- a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java
diff --git a/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java b/shared/src/main/java/com/vaadin/shared/ui/LayoutClickRpc.java
index bd46bbda3d..bd46bbda3d 100644
--- a/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/LayoutClickRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/MarginInfo.java b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java
index a8979b36cf..a8979b36cf 100644
--- a/shared/src/com/vaadin/shared/ui/MarginInfo.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java
diff --git a/shared/src/com/vaadin/shared/ui/MediaControl.java b/shared/src/main/java/com/vaadin/shared/ui/MediaControl.java
index ab31d6f95f..ab31d6f95f 100644
--- a/shared/src/com/vaadin/shared/ui/MediaControl.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/MediaControl.java
diff --git a/shared/src/com/vaadin/shared/ui/MultiSelectMode.java b/shared/src/main/java/com/vaadin/shared/ui/MultiSelectMode.java
index b628017a12..b628017a12 100644
--- a/shared/src/com/vaadin/shared/ui/MultiSelectMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/MultiSelectMode.java
diff --git a/shared/src/com/vaadin/shared/ui/Orientation.java b/shared/src/main/java/com/vaadin/shared/ui/Orientation.java
index b370ba8109..b370ba8109 100644
--- a/shared/src/com/vaadin/shared/ui/Orientation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/Orientation.java
diff --git a/shared/src/com/vaadin/shared/ui/ShortCutConstants.java b/shared/src/main/java/com/vaadin/shared/ui/ShortCutConstants.java
index d7049c2a74..d7049c2a74 100644
--- a/shared/src/com/vaadin/shared/ui/ShortCutConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ShortCutConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/TabIndexState.java b/shared/src/main/java/com/vaadin/shared/ui/TabIndexState.java
index 1afe982546..1afe982546 100644
--- a/shared/src/com/vaadin/shared/ui/TabIndexState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/TabIndexState.java
diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java
index 9ec88db2c2..9ec88db2c2 100644
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
index 865d1420d5..865d1420d5 100644
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java b/shared/src/main/java/com/vaadin/shared/ui/accordion/AccordionState.java
index cbb7447a25..cbb7447a25 100644
--- a/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/accordion/AccordionState.java
diff --git a/shared/src/com/vaadin/shared/ui/audio/AudioState.java b/shared/src/main/java/com/vaadin/shared/ui/audio/AudioState.java
index f0b4501e82..f0b4501e82 100644
--- a/shared/src/com/vaadin/shared/ui/audio/AudioState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/audio/AudioState.java
diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/main/java/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
index f8a5343cc9..f8a5343cc9 100644
--- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonServerRpc.java
index d692fe5a6a..d692fe5a6a 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonState.java
index 01ef9a038b..01ef9a038b 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonState.java
diff --git a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java b/shared/src/main/java/com/vaadin/shared/ui/button/NativeButtonState.java
index 378b84832d..378b84832d 100644
--- a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/button/NativeButtonState.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java
index bffcde11a0..bffcde11a0 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java
index 67a5fe11e2..67a5fe11e2 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java
index 7b7856fee9..7b7856fee9 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java
index c26c4ead16..c26c4ead16 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java
index 48f42eebbe..48f42eebbe 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java
index f4124100e0..f4124100e0 100644
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxState.java
index 10d3b46d93..10d3b46d93 100644
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxState.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/Color.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
index 8624327993..8624327993 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/Color.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java
index 374a41a0fe..374a41a0fe 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java
index 8245ffeaac..8245ffeaac 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java
index ce5c4317b4..ce5c4317b4 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java
index e3e90f5418..e3e90f5418 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java
index f556625025..f556625025 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java
index 3fdce20ce7..3fdce20ce7 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java
diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java
index aeb04ba75f..aeb04ba75f 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
index 46e24aa266..46e24aa266 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
diff --git a/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java
index 1c0b743cc6..1c0b743cc6 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java
diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java
index 1ff2f83d08..1ff2f83d08 100644
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutState.java
index 5fe61082d5..5fe61082d5 100644
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
index 04c7eed7e4..04c7eed7e4 100644
--- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldConstants.java
index 48bc74c690..48bc74c690 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
index b15d28f706..b15d28f706 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
index 6f10af4314..6f10af4314 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
index 689db11188..689db11188 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
index bf38ee04a9..bf38ee04a9 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java b/shared/src/main/java/com/vaadin/shared/ui/dd/AcceptCriterion.java
index fa3ec107a2..fa3ec107a2 100644
--- a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/AcceptCriterion.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java b/shared/src/main/java/com/vaadin/shared/ui/dd/DragEventType.java
index f894ed6219..f894ed6219 100644
--- a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/DragEventType.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java b/shared/src/main/java/com/vaadin/shared/ui/dd/HorizontalDropLocation.java
index 064815695a..064815695a 100644
--- a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/HorizontalDropLocation.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java b/shared/src/main/java/com/vaadin/shared/ui/dd/VerticalDropLocation.java
index d64a48946a..d64a48946a 100644
--- a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/VerticalDropLocation.java
diff --git a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java b/shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java
index 9dda86ad73..9dda86ad73 100644
--- a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedConstants.java
index 6aadb43b05..6aadb43b05 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java
index 3b293ecdb2..3b293ecdb2 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedState.java
index 9f12a917e5..9f12a917e5 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedState.java
diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/main/java/com/vaadin/shared/ui/flash/FlashState.java
index d974650030..d974650030 100644
--- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/flash/FlashState.java
diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/main/java/com/vaadin/shared/ui/form/FormState.java
index 99ed11f8df..99ed11f8df 100644
--- a/shared/src/com/vaadin/shared/ui/form/FormState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/form/FormState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnGroupState.java
index 79e6c9a89f..79e6c9a89f 100644
--- a/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnGroupState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
index 8b64d22423..8b64d22423 100644
--- a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorClientRpc.java
index 61066f28c2..61066f28c2 100644
--- a/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorServerRpc.java
index 34a16ccb38..34a16ccb38 100644
--- a/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridClientRpc.java
index ac1b1d5a78..ac1b1d5a78 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridColumnState.java
index 98fa553330..98fa553330 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridColumnState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridConstants.java
index 0f1af94456..0f1af94456 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridServerRpc.java
index 336e8097c0..336e8097c0 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
index 54ccc78daa..54ccc78daa 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticCellType.java
index c646717d2c..c646717d2c 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticCellType.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticSectionState.java
index a3c485af08..a3c485af08 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticSectionState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/HeightMode.java b/shared/src/main/java/com/vaadin/shared/ui/grid/HeightMode.java
index 4cd19a01b1..4cd19a01b1 100644
--- a/shared/src/com/vaadin/shared/ui/grid/HeightMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/HeightMode.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/Range.java b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java
index 21e70d3dbf..21e70d3dbf 100644
--- a/shared/src/com/vaadin/shared/ui/grid/Range.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ScrollDestination.java
index 64cf070e46..64cf070e46 100644
--- a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ScrollDestination.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java
index 658caef050..658caef050 100644
--- a/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java
index 1ddecb31e4..1ddecb31e4 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java
index 3d56b65793..3d56b65793 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java
index ff8e7c424b..ff8e7c424b 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java
index be8770a94e..be8770a94e 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java
diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java
index 70b49154ee..70b49154ee 100644
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
index b84c2673f4..b84c2673f4 100644
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/image/ImageServerRpc.java
index ec03c7fe47..ec03c7fe47 100644
--- a/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/image/ImageServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/main/java/com/vaadin/shared/ui/image/ImageState.java
index b51913d168..b51913d168 100644
--- a/shared/src/com/vaadin/shared/ui/image/ImageState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/image/ImageState.java
diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java
index 37e821536d..37e821536d 100644
--- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java
diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java
index 8fd1d7c798..8fd1d7c798 100644
--- a/shared/src/com/vaadin/shared/ui/label/LabelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java b/shared/src/main/java/com/vaadin/shared/ui/link/LinkConstants.java
index 399e6b6148..399e6b6148 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/link/LinkConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/main/java/com/vaadin/shared/ui/link/LinkState.java
index 2b1f73b90a..2b1f73b90a 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/link/LinkState.java
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarConstants.java
index b34bc13a23..b34bc13a23 100644
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarState.java
index 6d6acebe18..6d6acebe18 100644
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarState.java
diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
index 5670b64b38..5670b64b38 100644
--- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
index f1676e0dd8..f1676e0dd8 100644
--- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
index 76e5267bb8..76e5267bb8 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java
index c06b945ada..c06b945ada 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java
index b8134d2cee..b8134d2cee 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
index 167e89f624..167e89f624 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
index 4c83a8b1dd..4c83a8b1dd 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelServerRpc.java
index 8bb98e8e5d..8bb98e8e5d 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelState.java
index 8f48fad921..8f48fad921 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java
index af712b9e31..af712b9e31 100644
--- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewState.java
index 86fda428a1..86fda428a1 100644
--- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewState.java
diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressBarState.java
index 6f557489dd..6f557489dd 100644
--- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressBarState.java
diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
index f541395cef..f541395cef 100644
--- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
index 9b3cf94d4a..9b3cf94d4a 100644
--- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
diff --git a/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java
index 8ea306daf6..8ea306daf6 100644
--- a/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderOrientation.java
index 74ccaa4e15..74ccaa4e15 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderOrientation.java
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderServerRpc.java
index 1938dc1de2..1938dc1de2 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderState.java
index a96d35bc13..a96d35bc13 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderState.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java
index 7f1e9555d5..7f1e9555d5 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
index 2db292d71d..2db292d71d 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
index 849cd89651..849cd89651 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
index cb06a2a076..cb06a2a076 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java b/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java
index afeb7fb35a..afeb7fb35a 100644
--- a/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java
diff --git a/shared/src/com/vaadin/shared/ui/table/TableConstants.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java
index 2bdb711153..2bdb711153 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java
index 13d494afb7..13d494afb7 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/table/TableState.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java
index 9e225846b8..9e225846b8 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabState.java
index 3c8c1d76d0..3c8c1d76d0 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabState.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java
index 62cfd5cb81..62cfd5cb81 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java
index 5b1497dd3b..5b1497dd3b 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java
index c99bf2eeb2..c99bf2eeb2 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java
index a96c616ec6..a96c616ec6 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetState.java
index 6059379dc5..6059379dc5 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetState.java
diff --git a/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java b/shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java
index 51c386ddfc..51c386ddfc 100644
--- a/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java
diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
index c1f9536278..c1f9536278 100644
--- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
index 9d4272c22f..9d4272c22f 100644
--- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java b/shared/src/main/java/com/vaadin/shared/ui/textfield/TextFieldConstants.java
index 242e53682b..242e53682b 100644
--- a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textfield/TextFieldConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java
index 33560dec53..33560dec53 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java
index 76b33aa8c3..76b33aa8c3 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java
index 19a70e89f2..19a70e89f2 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java
diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java
index 510c18d245..510c18d245 100644
--- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java
index ecc7d0f4c4..ecc7d0f4c4 100644
--- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java
diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
index 32422a38e5..32422a38e5 100644
--- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
index 12505c4231..12505c4231 100644
--- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java
index 9a5d269a87..9a5d269a87 100644
--- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
index b6f17661d0..b6f17661d0 100644
--- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java b/shared/src/main/java/com/vaadin/shared/ui/ui/NotificationRole.java
index b6f6c6bb83..b6f6c6bb83 100644
--- a/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/NotificationRole.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/PageClientRpc.java
index a4c7d33ad1..a4c7d33ad1 100644
--- a/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/PageClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/PageState.java b/shared/src/main/java/com/vaadin/shared/ui/ui/PageState.java
index b6dd5abb89..b6dd5abb89 100644
--- a/shared/src/com/vaadin/shared/ui/ui/PageState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/PageState.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/ScrollClientRpc.java
index fb052a25e9..fb052a25e9 100644
--- a/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/ScrollClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/main/java/com/vaadin/shared/ui/ui/Transport.java
index 6263f3039d..6263f3039d 100644
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/Transport.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIClientRpc.java
index 5026189d71..5026189d71 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIConstants.java
index 429360e05d..429360e05d 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java
index 887ea760b3..887ea760b3 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java
index 48ff9cdaaf..48ff9cdaaf 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadClientRpc.java
index a5147147bc..a5147147bc 100644
--- a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadServerRpc.java
index 5a5a1378d1..5a5a1378d1 100644
--- a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadState.java b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadState.java
index f91d67631c..f91d67631c 100644
--- a/shared/src/com/vaadin/shared/ui/upload/UploadState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadState.java
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java b/shared/src/main/java/com/vaadin/shared/ui/video/VideoConstants.java
index 0a61b88afc..0a61b88afc 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/video/VideoConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/main/java/com/vaadin/shared/ui/video/VideoState.java
index 91006f0f6a..91006f0f6a 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/video/VideoState.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowMode.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowMode.java
index e3438fe6a9..e3438fe6a9 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowMode.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowRole.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowRole.java
index 5114c04bc2..5114c04bc2 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowRole.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowRole.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowServerRpc.java
index 6c7191c54d..6c7191c54d 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowState.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowState.java
index 7dafba57ff..7dafba57ff 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowState.java
diff --git a/shared/src/com/vaadin/shared/util/SharedUtil.java b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java
index 28c1ea3734..28c1ea3734 100644
--- a/shared/src/com/vaadin/shared/util/SharedUtil.java
+++ b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java
diff --git a/shared/tests/src/com/vaadin/shared/ui/grid/RangeTest.java b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java
index e3cae858ee..e3cae858ee 100644
--- a/shared/tests/src/com/vaadin/shared/ui/grid/RangeTest.java
+++ b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java
diff --git a/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java
index e77501a446..e77501a446 100644
--- a/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java
+++ b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTests.java
diff --git a/widgets/ivy.xml b/widgets/ivy.xml
index 68aefe22b0..a1bc5d2fc8 100644
--- a/widgets/ivy.xml
+++ b/widgets/ivy.xml
@@ -25,7 +25,7 @@
<!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
<dependency org="com.vaadin" name="vaadin-shared"
- rev="${vaadin.version}" conf="build-provided,test->build">
+ rev="${vaadin.version}" conf="build-provided,test->default">
<exclude type="pom" conf="test" />
</dependency>
<dependency org="com.vaadin" name="vaadin-client"