Add missing @since, remove empty @since annotations from tests7.6.7

Change-Id: I47ccc3bdffa5b6c9ea12dae2f21dd4578f483bc0

184 files changed, 2 insertions, 195 deletions

diff --git a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
index c2752f1953..f6d9205fda 100644
--- a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
+++ b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
@@ -19,8 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * 
- * @since
+ *
  * @author Vaadin Ltd
  */
 public class ServerMessageHandlerTest {
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 390e252906..f67f520d7d 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -1013,7 +1013,7 @@ public class Navigator implements Serializable {
      * Creates view change event for given {@code view}, {@code viewName} and
      * {@code parameters}.
      * 
-     * @since
+     * @since 7.6.7
      * @return view change event
      */
     public void destroy() {
diff --git a/server/tests/src/com/vaadin/server/MockServletConfig.java b/server/tests/src/com/vaadin/server/MockServletConfig.java
index d9d0e4d773..34922df2a0 100644
--- a/server/tests/src/com/vaadin/server/MockServletConfig.java
+++ b/server/tests/src/com/vaadin/server/MockServletConfig.java
@@ -27,7 +27,6 @@ import javax.servlet.ServletContext;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class MockServletConfig implements ServletConfig {
diff --git a/server/tests/src/com/vaadin/server/MockServletContext.java b/server/tests/src/com/vaadin/server/MockServletContext.java
index e9471fc9ee..ce55f77ae1 100644
--- a/server/tests/src/com/vaadin/server/MockServletContext.java
+++ b/server/tests/src/com/vaadin/server/MockServletContext.java
@@ -42,7 +42,6 @@ import javax.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class MockServletContext implements ServletContext {
diff --git a/server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java b/server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java
index f8fb1249b9..9b0f5ed62d 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java
+++ b/server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java
@@ -46,7 +46,6 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Tests that setting local id via DesignContext works as intended.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class DesignContextLocalIdTest {
diff --git a/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java b/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
index 8a2dec5a35..3e5d3e4349 100644
--- a/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
+++ b/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class InvalidLayoutTemplate extends VerticalLayout {
diff --git a/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java b/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
index fdfddf5c08..f3254e3b4f 100644
--- a/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
+++ b/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Template to be populated in the tests
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class LayoutTemplate extends VerticalLayout {
diff --git a/server/tests/src/com/vaadin/tests/design/LocaleTest.java b/server/tests/src/com/vaadin/tests/design/LocaleTest.java
index 6cb288db23..79ab99f287 100644
--- a/server/tests/src/com/vaadin/tests/design/LocaleTest.java
+++ b/server/tests/src/com/vaadin/tests/design/LocaleTest.java
@@ -39,7 +39,6 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Tests the handling of the locale property in parsing and html generation.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class LocaleTest {
diff --git a/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java b/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
index 20903512d1..3753204b07 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
@@ -49,7 +49,6 @@ import com.vaadin.ui.declarative.DesignException;
  * from prefixes to package names (for example <meta name=”package-mapping”
  * content=”my:com.addon.mypackage” />)
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ParseLayoutTest {
diff --git a/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java b/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
index dc95306cd3..490d8c3519 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
+++ b/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
@@ -27,7 +27,6 @@ import static org.junit.Assert.*;
 /**
  * Test case for reading nested templates
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ReadNestedTemplatesTest {
diff --git a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java
index cd9beafa10..7f5d2beb6e 100644
--- a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java
+++ b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java
@@ -44,7 +44,6 @@ import elemental.json.JsonException;
 /**
  * Test the actual csrf token validation by the server.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CsrfTokenMissingTest {
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
index 96f27851cf..25e48c7b0c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.Button;
 /**
  * Tests adding of components to {@link AbsoluteLayout}
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class AddComponentsTest {
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java
index fc97c84952..2d0e40c633 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java
@@ -45,7 +45,6 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Test cases for reading and writing the properties of AbstractComponent.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class AbstractComponentDeclarativeTest extends
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java
index 87f810d562..ca430d0577 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java
@@ -31,7 +31,6 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Tests declarative support for AbstractOrderedLayout.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class AbstractOrderedLayoutDeclarativeTest extends
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
index 02094cb611..4e9a0ddcc5 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.VerticalSplitPanel;
 /**
  * Tests declarative support for AbstractSplitPanel.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class AbstractSplitPanelDeclarativeTest extends
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
index 275cca33a0..9b6416552a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.TextField;
 /**
  * Tests declarative support for AbstractTextField.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class AbstractTextFieldDeclarativeTest extends
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
index 31ee1a05f5..385e8261b1 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.Label;
 /**
  * Tests declarative support for CssLayout.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CssLayoutDeclarativeTest extends DeclarativeTestBase<CssLayout> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
index 6ee3490c05..b54e002934 100644
--- a/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.Label;
 /**
  * Tests declarative support for {@link CustomLayout}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CustomLayoutDeclarativeTest extends
diff --git a/server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
index 0c2deaaf0a..9bcb6f4529 100644
--- a/server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.Flash;
  * Tests declarative support for implementations of {@link AbstractEmbedded} and
  * {@link Embedded}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class FlashDeclarativeTest extends DeclarativeTestBase<Flash> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index 41f967ac16..84b266be4a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.Grid.SingleSelectionModel;
 /**
  * Tests declarative support for {@link Grid} properties.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
index 562c629209..82707fb011 100644
--- a/server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
@@ -24,7 +24,6 @@ import com.vaadin.ui.Image;
 /**
  * Tests declarative support for implementations of {@link Image}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ImageDeclarativeTest extends DeclarativeTestBase<Image> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
index 39191f0665..babafbd49d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.declarative.DesignException;
 /**
  * Tests declarative support for Panel.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class PanelDeclarativeTest extends DeclarativeTestBase<Panel> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java
index fcb2453057..e341f8b3a8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.PasswordField;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class PasswordFieldDeclarativeTest extends
diff --git a/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
index dcfb415810..90e6dd616b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
@@ -24,7 +24,6 @@ import com.vaadin.ui.Slider;
 /**
  * Tests declarative support for implementations of {@link Slider}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class SliderDeclarativeTest extends DeclarativeTestBase<Slider> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
index 7de6eaf2ef..53b0d836e0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
@@ -30,7 +30,6 @@ import com.vaadin.ui.declarative.Design;
 /**
  * Test declarative support for {@link Table}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TableDeclarativeTest extends TableDeclarativeTestBase {
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
index 7fd5bc67f6..ce2aa3524f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
@@ -36,7 +36,6 @@ import com.vaadin.ui.Table;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TablePropertyValueConverterTest extends TestCase {
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
index 22472850f6..ca034905ca 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.TextField;
 /**
  * Tests declarative support for TabSheet.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSheetDeclarativeTest extends DeclarativeTestBase<TabSheet> {
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
index 9d614eccc9..4c59c9aa7a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.declarative.DesignException;
 /**
  * Test declarative support for {@link TreeTable}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TreeTableDeclarativeTest extends TableDeclarativeTest {
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
index e1c14e9757..2caaed8051 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
@@ -31,7 +31,6 @@ import com.vaadin.ui.declarative.DesignException;
 /**
  * Tests declarative support for implementations of {@link Window}.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class WindowDeclarativeTest extends DeclarativeTestBase<Window> {
diff --git a/server/tests/src/com/vaadin/ui/declarative/DesignTest.java b/server/tests/src/com/vaadin/ui/declarative/DesignTest.java
index f1d6982992..d9b4969890 100644
--- a/server/tests/src/com/vaadin/ui/declarative/DesignTest.java
+++ b/server/tests/src/com/vaadin/ui/declarative/DesignTest.java
@@ -35,7 +35,6 @@ import com.vaadin.ui.Label;
 /**
  * Tests for {@link Design} declarative support class.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class DesignTest {
diff --git a/uitest/src/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/com/vaadin/tests/application/CommErrorEmulatorUI.java
index 080d36fa48..151d99b9eb 100644
--- a/uitest/src/com/vaadin/tests/application/CommErrorEmulatorUI.java
+++ b/uitest/src/com/vaadin/tests/application/CommErrorEmulatorUI.java
@@ -35,7 +35,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Theme("valo")
@@ -89,7 +88,6 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
     }
 
     /**
-     * @since
      * @return
      */
     private Component createServerConfigPanel() {
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java b/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
index 56e593ce0f..cf056b4693 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
@@ -49,7 +49,6 @@ public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
     }
 
     /**
-     * @since
      * @param gridLayout
      * @return
      */
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java b/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
index 17c7fe6804..d041691100 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
@@ -28,7 +28,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for Accordion: Tab.setId should be propagated to client side tabs.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class AccordionTabIdsTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.java b/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.java
index dd89d1b9a7..b1557c79ad 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.CheckBox;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ButtonUpdateAltText extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java b/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
index 2431b2f4d0..04010ff34e 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
@@ -30,7 +30,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests opening and closing of calendar notifications.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CalendarNotificationsTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java b/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
index 62223ccc25..55b79ab0ad 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
@@ -30,7 +30,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests opening and closing of calendar notifications.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CalendarNotificationsTestIE extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java b/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
index 98c5c08095..ece198d853 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.components.calendar.event.BasicEvent;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  * 
  *         test for defect: Calendar event not shown correctly when partially
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours.java b/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
index 65e5502686..4f1491bbe7 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.components.calendar.event.BasicEvent;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  * 
  *         test for defect: calendar visible hours of day invalid shows invalid
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
index e547e68fc1..b935546e4b 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
@@ -36,7 +36,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * pagination works when the matching results number more than those that can be
  * displayed.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ComboBoxSlowTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
index b6f46cadd0..428cd1b3ce 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
@@ -24,7 +24,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CustomFieldSize extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
index a3f8f06976..d1a11b2744 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
@@ -23,7 +23,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CustomFieldSizeTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValid.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValid.java
index 66d1c34ab7..f07e95aac9 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValid.java
@@ -52,7 +52,6 @@ public class DateFieldIsValid extends AbstractTestUIWithLog {
     }
 
     /**
-     * @since
      * @param value
      * @return
      */
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
index 5f659d389b..769669faf0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
@@ -99,7 +99,6 @@ public class DateFieldTestTest extends MultiBrowserTest {
     }
 
     /**
-     * @since
      * @param string
      */
     private void menuSub(String string) {
@@ -109,7 +108,6 @@ public class DateFieldTestTest extends MultiBrowserTest {
     }
 
     /**
-     * @since
      * @param string
      */
     private void menu(String string) {
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
index 23f6d6f5a6..661ab6fe7d 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
@@ -55,7 +55,6 @@ public class DateFieldWhenChangingValueAndEnablingParentTest extends
     }
 
     /**
-     * @since
      * @param id
      * @param widgetEnabled
      * @param textInputEnabled
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java b/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
index 31f97afabd..2e1224bd70 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
@@ -58,7 +58,6 @@ public class DynamicallyChangeDateRange extends AbstractTestUI {
     }
 
     /**
-     * @since
      * @param df
      * @param i
      */
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
index 62a788f4c2..44eb7d43df 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
@@ -34,7 +34,6 @@ import com.vaadin.ui.NativeSelect;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog {
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
index c7e16440bc..a1075e15a8 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
@@ -37,7 +37,6 @@ import com.vaadin.ui.VerticalLayout;
  * Test UI for text area inside {@link DragAndDropWrapper}: text area should
  * obtain focus on click.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class DragAndDropFocusObtain extends AbstractTestUIWithLog {
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
index 7a2abe5efc..bbdd49ca3e 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.DragAndDropWrapper;
  * Test for text area inside {@link DragAndDropWrapper}: text area should obtain
  * focus on click.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class DragAndDropFocusObtainTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
index 4139bb0c5f..cf3520f64d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
@@ -43,7 +43,6 @@ import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers;
 /**
  * Tests Grid client side renderers
  * 
- * @since
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridThemeUITest.java b/uitest/src/com/vaadin/tests/components/grid/GridThemeUITest.java
index 140e8a90d8..066dae9db5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridThemeUITest.java
@@ -101,7 +101,6 @@ public class GridThemeUITest extends MultiBrowserThemeTest {
     }
 
     /**
-     * @since
      * @param string
      */
     private void selectPage(String string) {
diff --git a/uitest/src/com/vaadin/tests/components/grid/MyBeanJSRenderer.java b/uitest/src/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
index a2d1c08ea0..ebbb91fc31 100644
--- a/uitest/src/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
+++ b/uitest/src/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @JavaScript("myBeanJsRenderer.js")
diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java
index 063d05b735..dbb6f04830 100644
--- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java
@@ -36,7 +36,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * TB tests for the various builtin widget-based renderers.
  * 
- * @since
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
index 429f15bb47..06c720e26e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.UI;
 /**
  * Initializer shell for GridClientBasicFeatures test application
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Widgetset(TestingWidgetSet.NAME)
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
index 0a1b1735fa..65b18d3f6d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
@@ -26,7 +26,6 @@ import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
 /**
  * GridBasicClientFeatures.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public abstract class GridBasicClientFeaturesTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index 777f5f6775..b123247bcf 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -84,7 +84,6 @@ import com.vaadin.ui.renderers.NumberRenderer;
 /**
  * Tests the basic features like columns, footers and headers
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class GridBasicFeatures extends AbstractComponentTest<Grid> {
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
index ef7d15ff3d..c35ea76b07 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
@@ -27,7 +27,6 @@ import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
 /**
  * Abstract base class for header and footer tests.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public abstract class GridStaticSectionTest extends GridBasicClientFeaturesTest {
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
index e1934d4f2b..13c519ac3e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
@@ -27,7 +27,6 @@ public class CustomGridElement extends GridElement {
     /**
      * Gets the element that contains the details of a row.
      * 
-     * @since
      * @param rowIndex
      *            the index of the row for the details
      * @return the element that contains the details of a row. <code>null</code>
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
index ca9d78409c..50dd3c61f5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
@@ -27,7 +27,6 @@ import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 /**
  * Test for server-side Grid focus features.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class GridFocusTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
index 16a0896aa2..cb76a22f6b 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
@@ -31,7 +31,6 @@ import com.vaadin.ui.MenuBar.MenuItem;
  * items with image icons: the icon should not be considered to be a part of the
  * item's caption.
  * 
- * @since
  * @author Vaadin
  */
 @SuppressWarnings("serial")
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
index 4c3383c5d6..f084f5d1eb 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
@@ -32,7 +32,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * This class tests the method VMenuBar.getSubPartElement(String) by using
  * Vaadin locators for finding the items of a MenuBar.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class MenuBarsWithNestingTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java b/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
index 79797c60a2..e0c5490048 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
+++ b/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
@@ -30,7 +30,6 @@ public class ProgressBarGenericTest extends AbstractFieldTest<ProgressBar> {
     }
 
     /**
-     * @since
      */
     protected void createPrimaryStyleNameSelect() {
         LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
diff --git a/uitest/src/com/vaadin/tests/components/table/DndEmptyTable.java b/uitest/src/com/vaadin/tests/components/table/DndEmptyTable.java
index baac7ce057..5b761fa370 100644
--- a/uitest/src/com/vaadin/tests/components/table/DndEmptyTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/DndEmptyTable.java
@@ -30,7 +30,6 @@ import com.vaadin.ui.Table;
  * Test UI for empty table: empty table (without any data) throws client side
  * exception if it's a target for DnD.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class DndEmptyTable extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/table/DndEmptyTableTest.java b/uitest/src/com/vaadin/tests/components/table/DndEmptyTableTest.java
index 6fb0d446d3..d6e41d490f 100644
--- a/uitest/src/com/vaadin/tests/components/table/DndEmptyTableTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/DndEmptyTableTest.java
@@ -26,7 +26,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Test for empty table as a DnD target: it should not throws client side
  * exception.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class DndEmptyTableTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/com/vaadin/tests/components/table/FooterClickTest.java
index 2e4df1c116..42180d876f 100644
--- a/uitest/src/com/vaadin/tests/components/table/FooterClickTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/FooterClickTest.java
@@ -32,7 +32,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class FooterClickTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/com/vaadin/tests/components/table/FooterTest.java
index 11a6838234..6a990cb4cc 100644
--- a/uitest/src/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/FooterTest.java
@@ -35,7 +35,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class FooterTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/com/vaadin/tests/components/table/HeaderClickTest.java
index 2ad069540d..980c87823d 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderClickTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderClickTest.java
@@ -30,7 +30,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HeaderClickTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index 01fc173c9a..397dca5264 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
@@ -29,7 +29,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HeaderFooterClickLeftRightMiddleTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
index 26847a692d..3770b56230 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
@@ -26,7 +26,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HeaderPositionWhenSortingTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
index c9307f0849..5c87a21dd2 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
@@ -26,7 +26,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HeaderSyncOnScrollTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
index 7a3813599d..6fcac29c4e 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
@@ -27,7 +27,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HeaderUpdateWhenNoRowsTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java b/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java
index fa88325429..14b11b4c51 100644
--- a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java
+++ b/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java
@@ -27,7 +27,6 @@ import com.vaadin.ui.Table;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HiddenComponentCells extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTable.java b/uitest/src/com/vaadin/tests/components/table/MemoryLeakTable.java
index 1b76be3b72..67d24b04c5 100644
--- a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/MemoryLeakTable.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.Table;
 /**
  * Test UI Class for testing memory leak in table (#14159).
  *
- * @since
  * @author Vaadin Ltd
  */
 public class MemoryLeakTable extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index b254d27b58..cc7637182d 100644
--- a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/MemoryLeakTableTest.java
@@ -35,7 +35,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * To test memory consuption. Run test in debug mode. Take memory snapshot in
  * Profiler in browser before and after the loop. Compare memory consuption.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class MemoryLeakTableTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java b/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
index 809cb67226..8364bec9e8 100644
--- a/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
+++ b/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.VerticalLayout;
  * There shouldn't be any attempts to refresh table's cells if the table isn't
  * attached.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
@@ -92,7 +91,6 @@ public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
     /**
      * Remove Table's parent component.
      * 
-     * @since
      */
     protected void removeTableParent() {
         removeComponent(layout);
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewport.java b/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewport.java
index 5a406eac48..53240e219f 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewport.java
+++ b/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewport.java
@@ -24,7 +24,6 @@ import com.vaadin.ui.Table;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class SelectAllConstantViewport extends AbstractTestUIWithLog {
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
index 5e1c4cca66..abb52b3c58 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
+++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
@@ -30,7 +30,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class SetCurrentPageFirstItemIndex extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
index 8102f82834..950ccfa37b 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
@@ -30,7 +30,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Ignore
diff --git a/uitest/src/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
index 074958d671..f259199d2f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
@@ -32,7 +32,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * For testing that UI scroll does not jump back to up when: 1. UI is in iframe
  * 2. the window scrolled down 3. and table is clicked
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TableInIframeRowClickScrollJumpTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
index ea730ea30e..06906b85b0 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
@@ -32,7 +32,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Regular click cases already covered by @LabelEmbeddedClickThroughForTableTest
  * Testing cases when mouse down and mouse up positions are different
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TableMatchesMouseDownMouseUpElementTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
index 30bddc2666..cc9981ce01 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
@@ -26,7 +26,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests if table focus is moved correctly to the selected item
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TableMoveFocusWithSelectionTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
index 060b79f65f..da6f3d6130 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
@@ -25,7 +25,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests Table Footer ClickListener
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TableVisibleColumnsUpdateTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/table/TabletContextMenu.java b/uitest/src/com/vaadin/tests/components/table/TabletContextMenu.java
index 193cb499a7..e23a335ff4 100644
--- a/uitest/src/com/vaadin/tests/components/table/TabletContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/TabletContextMenu.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.Table;
  * This UI has no attached unit test due to the poor support of touch events on
  * Selenium.
  *
- * @since
  * @author Vaadin Ltd
  */
 public class TabletContextMenu extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java b/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
index 939bd645ea..91a44aecd5 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
@@ -27,7 +27,6 @@ import com.vaadin.ui.TabSheet.Tab;
  * In case an unselected tab is removed and the selected one is not visible, the
  * scroll should not jump to the selected one.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class NewSelectionAfterTabRemove extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
index bffbc3ecdf..ecc64755d1 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
@@ -30,7 +30,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Automatic test of the default TabSheet selection algorithm when removing a
  * selected tab.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class NewSelectionAfterTabRemoveTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index 620f04fe60..019d627bbd 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * The solution was broken in ticket (#14304)
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabKeyboardNavigation extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
index 65307f9492..c9dde817cf 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
@@ -29,7 +29,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Add TB3 test as the TB2 one failed on keyboard events.
  *
- * @since
  * @author Vaadin Ltd
  */
 public class TabKeyboardNavigationTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
index 0d7ec48a99..17c1ef7626 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
@@ -18,7 +18,6 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
  * This test used to cause nonfunctional TabSheet if the current tab was 1, user
  * selects 5, then the selection listener will revert the selected tab to 1.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSelectionRevertedByServer extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
index 64aee8768b..a090da7f85 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
@@ -29,7 +29,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * from a server side selection listener. This test makes sure that actually
  * happen.
  *
- * @since
  * @author Vaadin Ltd
  */
 public class TabSelectionRevertedByServerTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetClose.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetClose.java
index 2cadde567f..fc29a7bbb5 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetClose.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetClose.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.TabSheet.Tab;
  * This test UI is used for checking that when a tab is closed, another one is
  * scrolled into view.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSheetClose extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
index 5314038d72..0cf2cb4dd6 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
@@ -27,7 +27,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * with no error. Only the last tab should be visible, so the actual TabSheet
  * width should be small.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSheetCloseTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
index 1400100f3b..3725ff28d8 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.TabSheet.Tab;
  * not change when tabs are removed. The exception is removing the leftmost
  * visible tab.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSheetScrollOnTabClose extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
index 8247b436d0..788c0dc862 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
@@ -33,7 +33,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Tests removing tabs that have been scrolled out of view. This should cause no
  * change to the scroll position.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
index 3a5be51e47..a1aea7aabb 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
@@ -27,7 +27,6 @@ import com.vaadin.ui.VerticalLayout;
  * If the space is pressed on the tabs of a tabsheet the browser default scroll
  * behavior must be prevented.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSpaceNotScroll extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
index c35248c1f4..8358be3e6b 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
@@ -29,7 +29,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test if the page scroll when press space on a tabsheet's tab.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabSpaceNotScrollTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
index 990f545697..4e0540b964 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
@@ -28,7 +28,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * 
  * Ticket #12154
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TabsheetNotEnoughHorizontalSpaceTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java b/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
index b2607050a4..f76b729feb 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
@@ -39,7 +39,6 @@ import com.vaadin.ui.TextField;
  * the state will confirm the change of the text, but the width and height
  * didn't change in the state either client or server before the fix.
  *
- * @since
  * @author Vaadin Ltd
  */
 public class TextAreaSizeResetted extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
index e80686f6f3..1586e5a054 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
index 661db179e7..ad3931f0c0 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
@@ -25,7 +25,6 @@ import com.vaadin.tests.tb3.SingleBrowserTest;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class UnnecessaryPaddingInResponsiveUITest extends SingleBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java b/uitest/src/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
index 37766dd060..4542a6a1e7 100644
--- a/uitest/src/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
@@ -24,7 +24,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class VaadinFinderLocatorUISearchTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUp.java b/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
index 2c5e415408..0e7a4a12f3 100644
--- a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
+++ b/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
@@ -36,7 +36,6 @@ import com.vaadin.ui.Window;
  * the server, the window.setVisible would be call again, and the hack that
  * solved the scrollbars in a window (#11994) would cause the our bug.
  *
- * @since
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
diff --git a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java b/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
index 3d0da2677b..b2d45f0909 100644
--- a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
@@ -31,7 +31,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * 
  * While testing without the fix, the test failed on both Chrome and PhantomJS.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class BottomComponentScrollsUpTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
index b952df0ed9..d8f486b7e8 100644
--- a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
@@ -24,7 +24,6 @@ import com.vaadin.ui.Window;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ComboboxScrollableWindow extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
index 4ec1dc5c98..8c35385b2a 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
@@ -34,7 +34,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests dialogs with WAI-ARIA.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java b/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
index 9a3ccb3b31..be9c5980a1 100644
--- a/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
@@ -24,7 +24,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ScrollingBodyElementWithModalOpenedTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java b/uitest/src/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
index e0cc240d6d..330c700c62 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
@@ -33,7 +33,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Test for issue #12726, IE's make text selection when sub windows are
  * dragged(moved).
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class SubWindowsTextSelectionTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/declarative/Potus.java b/uitest/src/com/vaadin/tests/declarative/Potus.java
index 23448a9b7f..5600e85dbc 100644
--- a/uitest/src/com/vaadin/tests/declarative/Potus.java
+++ b/uitest/src/com/vaadin/tests/declarative/Potus.java
@@ -19,7 +19,6 @@ import java.util.Date;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class Potus {
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java b/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java
index f1d94f7f16..f6fca128ad 100644
--- a/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java
+++ b/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.UI;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java
index 830b96b3d7..dbda3c12b1 100644
--- a/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java
+++ b/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java
@@ -37,7 +37,6 @@ import com.vaadin.ui.Window;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class HtmlInCaption extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
index ea47ab4620..dcf258e839 100644
--- a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
@@ -32,7 +32,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests LayoutClickListener on different layouts.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class TestLayoutClickListenersTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java b/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
index fc37455752..52f7dfda6f 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
+++ b/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.Label;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class GridSpanEmptyColumns extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
index 7ea8739cf4..7aff336c24 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.TextField;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseAddReplaceMove extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignment.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignment.java
index bfdc53bf7c..ba11ffdd72 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignment.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignment.java
@@ -20,7 +20,6 @@ import com.vaadin.ui.AbstractOrderedLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 abstract public class BaseAlignment extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java
index 9dd90a4031..b300c0e1e1 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java
@@ -23,7 +23,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public abstract class BaseAlignmentTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaption.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaption.java
index 37ce77e745..16364c749e 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaption.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaption.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.TabSheet;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseCaption extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java
index ed20657e2a..f98aa42fff 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java
@@ -23,7 +23,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public abstract class BaseCaptionTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java
index d9377c6a8b..0090067107 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java
@@ -20,7 +20,6 @@ import com.vaadin.ui.AbstractLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseComponentSizing extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIcon.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIcon.java
index 34ec7928ff..5a6c1b91ca 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIcon.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIcon.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.TextField;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseIcon extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIconTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIconTest.java
index 9322672eae..bff5fe4f58 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIconTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIconTest.java
@@ -23,7 +23,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public abstract class BaseIconTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
index f21db94f80..0dce759bc0 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
@@ -23,7 +23,6 @@ import com.vaadin.ui.Table;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseLayoutExpand extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
index e98573d170..5ba42026fe 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.Table;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseLayoutForSpacingMargin extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java
index 61d6f8a362..8e78be84c2 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java
@@ -23,7 +23,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public abstract class BaseLayoutRegErrorTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java
index edc0b275d1..2ba6746f3c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java
@@ -20,7 +20,6 @@ import com.vaadin.ui.AbstractLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseLayoutSizing extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java
index e97353c989..fffccee6c7 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java
@@ -25,7 +25,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public abstract class BaseLayoutSizingTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseRegError.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseRegError.java
index df4053b533..4398b96448 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseRegError.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseRegError.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.TextField;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class BaseRegError extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
index 84254b4935..a0ec861cab 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.TextField;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java
index f83a6ccf67..a2618acf1b 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMoveTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridAddReplaceMoveTest extends BaseAddReplaceMoveTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
index c08e5286a6..b80de344bb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
@@ -27,7 +27,6 @@ import com.vaadin.ui.Label;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java
index ab8046ebf3..08b4b59cdd 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseCaptionTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridCaptionTest extends BaseCaptionTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java
index bebccfbf9d..593b92d12b 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java
@@ -19,7 +19,6 @@ import com.vaadin.server.VaadinRequest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridComponentSizing extends GridBaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
index 863a4f2c1d..2450048aa4 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.TextField;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridIcon extends GridBaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java
index 25a0faa88e..0cc72cc99a 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseIconTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridIconTest extends BaseIconTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
index b3a84cdc26..f7faf6c706 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.Table;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutExpand extends GridBaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java
index 2a49af52a9..7dedd587e7 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutExpandTest extends BaseLayoutExpandTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
index 78a67bdf82..c8f8cfb806 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.Table;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutMarginSpacing extends GridBaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java
index 516f3b088b..9763695413 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutMarginSpacingTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutMarginSpacingTest extends BaseLayoutMarginSpacingTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
index 5b4dd2a947..14a9459436 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
@@ -27,7 +27,6 @@ import com.vaadin.ui.TextField;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutRegError extends GridBaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java
index e377a7b0c4..79adb84d14 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutRegErrorTest extends BaseLayoutRegErrorTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java
index 8358f91997..c7d0c17f58 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java
@@ -19,7 +19,6 @@ import com.vaadin.server.VaadinRequest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutSizing extends GridBaseLayoutTestUI {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java
index c8a48cd70c..d6a4fe2dfa 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class GridLayoutSizingTest extends BaseLayoutSizingTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java
index b042c018eb..89aea76f6c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.HorizontalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java
index cb4eb321b9..8750c6b3e9 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.HorizontalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java
index 273ca07bc4..cb77e922b5 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.HorizontalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java
index 9fea380155..92587c3e85 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.HorizontalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java
index 3c7134a061..c18310f07d 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.HorizontalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java
index 350037b05c..c04554a8fc 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.HorizontalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java
index a0ef960f57..ab5de6470a 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java
index 70f7237c96..f596ae7e8c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMoveTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class VAddReplaceMoveTest extends BaseAddReplaceMoveTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java
index b2f50961cb..b70c0a46da 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java
index 942736b286..34e79ebcfd 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseCaptionTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class VCaptionTest extends BaseCaptionTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java
index 67fcb85652..1f1cad748a 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java
index 1420be4907..2b28a99fc8 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java
index 15a31b16f0..70ce1b3d17 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
index 152e3f0b86..09f43c8afb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class VLayoutExpandTest extends BaseLayoutExpandTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java
index d6d9040bae..1b88a32685 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java
index 72fd35b842..8fc3a6b0d3 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
index 7f803781fb..37438d81c5 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class VLayoutRegErrorTest extends BaseLayoutRegErrorTest {
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java
index ea6464cfb7..bc02283a36 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
index 519f8113f8..d00c453e49 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
@@ -19,7 +19,6 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class VLayoutSizingTest extends BaseLayoutSizingTest {
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/com/vaadin/tests/push/PushConfigurator.java
index 7da58af1da..0c35dbffa2 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurator.java
@@ -64,7 +64,6 @@ public class PushConfigurator extends VerticalLayout {
     }
 
     /**
-     * @since
      */
     private void refreshStatus() {
         PushConfiguration pc = ui.getPushConfiguration();
@@ -79,7 +78,6 @@ public class PushConfigurator extends VerticalLayout {
     }
 
     /**
-     * @since
      */
     private void construct() {
         pushMode.addItem(PushMode.DISABLED);
@@ -107,7 +105,6 @@ public class PushConfigurator extends VerticalLayout {
     }
 
     /**
-     * @since
      */
     private void listeners() {
         pushMode.addValueChangeListener(new ValueChangeListener() {
diff --git a/uitest/src/com/vaadin/tests/push/TablePushStreaming.java b/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
index 04aad63813..d08cb112ad 100644
--- a/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
@@ -30,7 +30,6 @@ import com.vaadin.ui.Table;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Push(transport = Transport.STREAMING)
@@ -82,7 +81,6 @@ public class TablePushStreaming extends AbstractTestUI {
 
     /**
      * @param iter
-     * @since
      * @return
      */
     private Container generateContainer(int rows, int cols, int iter) {
diff --git a/uitest/src/com/vaadin/tests/resources/PublishedFileHandlerCaching.java b/uitest/src/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
index a2828032c7..0517a26c5e 100644
--- a/uitest/src/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
+++ b/uitest/src/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
@@ -33,7 +33,6 @@ import com.vaadin.tests.components.AbstractTestUI;
  * FireBug), keeping an eye on the GET requests for cachingtest.js and it's
  * cache headers.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class PublishedFileHandlerCaching extends AbstractTestUI {
diff --git a/uitest/src/com/vaadin/tests/tb3/ChangedTB3TestLocator.java b/uitest/src/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
index a6f2e5191a..37aa77f36f 100644
--- a/uitest/src/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
+++ b/uitest/src/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
@@ -41,7 +41,6 @@ import org.eclipse.jgit.util.io.DisabledOutputStream;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ChangedTB3TestLocator extends TB3TestLocator {
diff --git a/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java b/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java
index 3c7030b1e9..290a4fbff6 100644
--- a/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java
+++ b/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java
@@ -27,7 +27,6 @@ import com.vaadin.tests.tb3.ChangedTB3Tests.ChangedTB3TestsSuite;
  * current workspace. If there are no changes in the workspace, it will run the
  * changes to test classes introduced in the HEAD commit.
  * 
- * @since
  * @author Vaadin Ltd
  */
 @RunWith(ChangedTB3TestsSuite.class)
diff --git a/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java
index 789422c0c6..83f53e2e5f 100644
--- a/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java
+++ b/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java
@@ -29,7 +29,6 @@ import java.lang.annotation.Target;
  * <p>
  * Used by {@link TB3TestLocator}
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java b/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
index ee88595ba7..bac521992e 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ButtonsAndLinks extends VerticalLayout implements View {
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Dragging.java b/uitest/src/com/vaadin/tests/themes/valo/Dragging.java
index 8de518be23..6817997189 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Dragging.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/Dragging.java
@@ -50,7 +50,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class Dragging extends VerticalLayout implements View {
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/com/vaadin/tests/themes/valo/Forms.java
index 32aef68520..d2d48a0860 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/Forms.java
@@ -40,7 +40,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class Forms extends VerticalLayout implements View {
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java
index 87f24d98d4..388a57285c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.Upload;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Labels.java b/uitest/src/com/vaadin/tests/themes/valo/Labels.java
index 9954979d50..711ea242d3 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Labels.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/Labels.java
@@ -27,7 +27,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class Labels extends VerticalLayout implements View {
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TestIcon.java b/uitest/src/com/vaadin/tests/themes/valo/TestIcon.java
index 0d34bf2b63..be60210659 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TestIcon.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/TestIcon.java
@@ -24,7 +24,6 @@ import com.vaadin.server.ThemeResource;
 
 /**
  *
- * @since
  * @author Vaadin Ltd
  */
 public class TestIcon {
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoMenuLayout.java b/uitest/src/com/vaadin/tests/themes/valo/ValoMenuLayout.java
index 0e62f983a6..1b6a37fb3c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoMenuLayout.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ValoMenuLayout.java
@@ -23,7 +23,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class ValoMenuLayout extends HorizontalLayout {
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/MockApplicationConnection.java b/uitest/src/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
index 8237d75c6c..ed32f0d8ba 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
@@ -21,7 +21,6 @@ import com.vaadin.tests.widgetset.server.csrf.ui.CsrfTokenDisabled;
 /**
  * Mock ApplicationConnection for several issues where we need to hack it.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class MockApplicationConnection extends ApplicationConnection {
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
index b6386afe44..0e89b411ea 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
@@ -93,7 +93,6 @@ import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget.Data
 /**
  * Grid basic client features test application.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class GridBasicClientFeaturesWidget extends
@@ -215,7 +214,6 @@ public class GridBasicClientFeaturesWidget extends
     }
 
     /**
-     * @since
      * @return
      */
     private List<List<Data>> createData(int rowCount) {
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java
index 90eee9e1c6..0ef80e94f8 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java
@@ -37,12 +37,10 @@ public interface GridClientColumnRendererRpc extends ClientRpc {
     void triggerClientSorting();
 
     /**
-     * @since
      */
     void triggerClientSortingTest();
 
     /**
-     * @since
      */
     void shuffle();
 }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
index bda1a0c33e..593658d432 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
@@ -31,7 +31,6 @@ import com.vaadin.client.ui.SubPartAware;
  * Pure GWT Test Application base for testing features of a single widget;
  * provides a menu system and convenience method for adding items to it.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendants.java b/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
index aadabb3fcc..8e2793459c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
@@ -24,7 +24,6 @@ import com.vaadin.ui.TextArea;
 /**
  * UI for testing that @DelegateToWidget works on derived widget states.
  *
- * @since
  * @author Vaadin Ltd
  */
 @Widgetset(TestingWidgetSet.NAME)
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java b/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
index aa29284010..8394388e64 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
@@ -27,7 +27,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Class for unit testing that @DelegateToWidget works on derived widget states.
  *
- * @since
  * @author Vaadin Ltd
  */
 public class OverriddenDecendantsTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java b/uitest/src/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java
index 567127927d..be2829cb7c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.AbstractComponent;
  * Dummy client connector to link with the client functionality if the
  * CsrfToken.
  *
- * @since
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
index f8f1754385..654417d034 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
@@ -26,7 +26,6 @@ import com.vaadin.ui.Label;
 /**
  * Abstract UI to test the CSRF token issue as reported in (#14111)
  * 
- * @since
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
index 6283285b40..346f80cf15 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
@@ -25,7 +25,6 @@ import com.vaadin.launcher.CustomDeploymentConfiguration.Conf;
  * the parameter anyway. So now the server knows how to deal the issue if the
  * csrfToken is not present.
  *
- * @since
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
index 504425fead..d5b9b85034 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
@@ -20,7 +20,6 @@ import com.vaadin.shared.ApplicationConstants;
 /**
  * Test the CSRF Token issue.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CsrfTokenDisabledTest extends AbstractCsrfTokenUITest {
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
index 1d51f1c372..fa143db0bc 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.widgetset.server.csrf.ui;
 /**
  * Test the CSRF Token issue.
  * 
- * @since
  * @author Vaadin Ltd
  */
 public class CsrfTokenEnabledTest extends AbstractCsrfTokenUITest {
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
index ce260f108d..14af2fd179 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
@@ -61,21 +61,18 @@ public class GridClientColumnRenderers extends UI {
         }
 
         /**
-         * @since
          */
         public void triggerClientSorting() {
             rpc().triggerClientSorting();
         }
 
         /**
-         * @since
          */
         public void triggerClientSortingTest() {
             rpc().triggerClientSortingTest();
         }
 
         /**
-         * @since
          */
         public void shuffle() {
             rpc().shuffle();
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java b/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java
index c04800713d..159d20400b 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java
@@ -21,7 +21,6 @@ import com.vaadin.ui.AbstractComponent;
  * Dummy client connector to link with the client functionality where the GWT
  * RPC is triggered.
  *
- * @since
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")