Removed @version which is included in some files but not in all (#9299)

133 files changed, 0 insertions, 241 deletions

diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index 05951ce88f..09971b3467 100644
--- a/server/src/com/vaadin/Application.java
+++ b/server/src/com/vaadin/Application.java
@@ -113,8 +113,6 @@ import com.vaadin.ui.Window;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/annotations/AutoGenerated.java b/server/src/com/vaadin/annotations/AutoGenerated.java
index 72c9b62a91..6490c52e53 100644
--- a/server/src/com/vaadin/annotations/AutoGenerated.java
+++ b/server/src/com/vaadin/annotations/AutoGenerated.java
@@ -9,8 +9,6 @@ package com.vaadin.annotations;
  * These elements may be modified or removed by code generation.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.0
  */
 public @interface AutoGenerated {
diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java
index 357bcc3649..4cfc924344 100644
--- a/server/src/com/vaadin/annotations/JavaScript.java
+++ b/server/src/com/vaadin/annotations/JavaScript.java
@@ -26,7 +26,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * the ClassLoader that was used to load com.example.MyConnector.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java
index d082cb8d30..f80b62c2a9 100644
--- a/server/src/com/vaadin/annotations/StyleSheet.java
+++ b/server/src/com/vaadin/annotations/StyleSheet.java
@@ -23,7 +23,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * com.example.MyConnector.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/server/src/com/vaadin/data/Buffered.java b/server/src/com/vaadin/data/Buffered.java
index 1387cb965b..f15ab0d1c4 100644
--- a/server/src/com/vaadin/data/Buffered.java
+++ b/server/src/com/vaadin/data/Buffered.java
@@ -36,8 +36,6 @@ import com.vaadin.data.Validator.InvalidValueException;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Buffered extends Serializable {
@@ -195,8 +193,6 @@ public interface Buffered extends Serializable {
      * in processing a data source.
      * 
      * @author Vaadin Ltd.
-     * @version
-     * @VERSION@
      * @since 3.0
      */
     @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/BufferedValidatable.java b/server/src/com/vaadin/data/BufferedValidatable.java
index ce1d44fce6..ddbd10602f 100644
--- a/server/src/com/vaadin/data/BufferedValidatable.java
+++ b/server/src/com/vaadin/data/BufferedValidatable.java
@@ -14,8 +14,6 @@ import java.io.Serializable;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface BufferedValidatable extends Buffered, Validatable,
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java
index f4c0ed9794..28c25ee7f6 100644
--- a/server/src/com/vaadin/data/Container.java
+++ b/server/src/com/vaadin/data/Container.java
@@ -65,8 +65,6 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Container extends Serializable {
diff --git a/server/src/com/vaadin/data/Item.java b/server/src/com/vaadin/data/Item.java
index 98b95aecff..7038e15c08 100644
--- a/server/src/com/vaadin/data/Item.java
+++ b/server/src/com/vaadin/data/Item.java
@@ -15,8 +15,6 @@ import java.util.Collection;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Item extends Serializable {
diff --git a/server/src/com/vaadin/data/Property.java b/server/src/com/vaadin/data/Property.java
index 9fab642381..9b6cae2d47 100644
--- a/server/src/com/vaadin/data/Property.java
+++ b/server/src/com/vaadin/data/Property.java
@@ -34,8 +34,6 @@ import java.io.Serializable;
  *            type of values of the property
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Property<T> extends Serializable {
diff --git a/server/src/com/vaadin/data/Validatable.java b/server/src/com/vaadin/data/Validatable.java
index 4a7a0fda10..085cbf8abc 100644
--- a/server/src/com/vaadin/data/Validatable.java
+++ b/server/src/com/vaadin/data/Validatable.java
@@ -15,8 +15,6 @@ import java.util.Collection;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  * @see com.vaadin.data.Validator
  */
diff --git a/server/src/com/vaadin/data/Validator.java b/server/src/com/vaadin/data/Validator.java
index 768a02babe..80e27270a0 100644
--- a/server/src/com/vaadin/data/Validator.java
+++ b/server/src/com/vaadin/data/Validator.java
@@ -33,8 +33,6 @@ import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Validator extends Serializable {
diff --git a/server/src/com/vaadin/data/util/BeanItem.java b/server/src/com/vaadin/data/util/BeanItem.java
index 94439471f5..ffa1270f80 100644
--- a/server/src/com/vaadin/data/util/BeanItem.java
+++ b/server/src/com/vaadin/data/util/BeanItem.java
@@ -22,8 +22,6 @@ import java.util.Set;
  * A wrapper class for adding the Item interface to any Java Bean.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 717ce834cf..642a60792d 100644
--- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -33,8 +33,6 @@ import com.vaadin.data.Property;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index d3d6f88d3e..6f368f6a1c 100644
--- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -27,8 +27,6 @@ import com.vaadin.data.Property;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/com/vaadin/data/util/FilesystemContainer.java
index cdfeb57e14..abd3a768b5 100644
--- a/server/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/server/src/com/vaadin/data/util/FilesystemContainer.java
@@ -28,8 +28,6 @@ import com.vaadin.terminal.Resource;
  * A hierarchical container wrapper for a filesystem.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/HierarchicalContainer.java b/server/src/com/vaadin/data/util/HierarchicalContainer.java
index 06ab77c0e7..158a252bec 100644
--- a/server/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/server/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -20,8 +20,6 @@ import com.vaadin.data.Item;
  * tree-like structure.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index b95b2c4de8..96c6a34a13 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -40,8 +40,6 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * @see com.vaadin.data.Container
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 
@@ -653,7 +651,6 @@ public class IndexedContainer extends
      * 
      * @author Vaadin Ltd.
      * 
-     * @version @VERSION@
      * 
      * @since 3.0
      */
diff --git a/server/src/com/vaadin/data/util/MethodProperty.java b/server/src/com/vaadin/data/util/MethodProperty.java
index 0c64d90481..a6e3f995b0 100644
--- a/server/src/com/vaadin/data/util/MethodProperty.java
+++ b/server/src/com/vaadin/data/util/MethodProperty.java
@@ -41,8 +41,6 @@ import com.vaadin.util.SerializerHelper;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/ObjectProperty.java b/server/src/com/vaadin/data/util/ObjectProperty.java
index cb85b44c2a..d3a11636b2 100644
--- a/server/src/com/vaadin/data/util/ObjectProperty.java
+++ b/server/src/com/vaadin/data/util/ObjectProperty.java
@@ -12,8 +12,6 @@ import com.vaadin.data.Property;
  * interface.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java
index 22f2da75b2..ac0549d296 100644
--- a/server/src/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/com/vaadin/data/util/PropertysetItem.java
@@ -21,8 +21,6 @@ import com.vaadin.data.Property;
  * set managed by the class.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/util/converter/Converter.java b/server/src/com/vaadin/data/util/converter/Converter.java
index b8c15e8cdc..06aa6ad24c 100644
--- a/server/src/com/vaadin/data/util/converter/Converter.java
+++ b/server/src/com/vaadin/data/util/converter/Converter.java
@@ -33,8 +33,6 @@ import java.util.Locale;
  *            The presentation type. Must be compatible with what
  *            {@link #getPresentationType()} returns.
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 7.0
  */
 public interface Converter<PRESENTATION, MODEL> extends Serializable {
diff --git a/server/src/com/vaadin/data/util/converter/ConverterFactory.java b/server/src/com/vaadin/data/util/converter/ConverterFactory.java
index ed4ab41ac0..11b1a5d806 100644
--- a/server/src/com/vaadin/data/util/converter/ConverterFactory.java
+++ b/server/src/com/vaadin/data/util/converter/ConverterFactory.java
@@ -11,8 +11,6 @@ import java.io.Serializable;
  * model type.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 7.0
  * 
  */
diff --git a/server/src/com/vaadin/data/util/converter/DateToLongConverter.java b/server/src/com/vaadin/data/util/converter/DateToLongConverter.java
index aeba38aa1f..8bd02db155 100644
--- a/server/src/com/vaadin/data/util/converter/DateToLongConverter.java
+++ b/server/src/com/vaadin/data/util/converter/DateToLongConverter.java
@@ -11,8 +11,6 @@ import java.util.Locale;
  * A converter that converts from {@link Long} to {@link Date} and back.
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class DateToLongConverter implements Converter<Date, Long> {
diff --git a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
index afb95d81ed..ed3e088681 100644
--- a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
+++ b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
@@ -18,8 +18,6 @@ import com.vaadin.Application;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class DefaultConverterFactory implements ConverterFactory {
diff --git a/server/src/com/vaadin/data/util/converter/ReverseConverter.java b/server/src/com/vaadin/data/util/converter/ReverseConverter.java
index fa1bb5daf1..f4e4ebf187 100644
--- a/server/src/com/vaadin/data/util/converter/ReverseConverter.java
+++ b/server/src/com/vaadin/data/util/converter/ReverseConverter.java
@@ -16,8 +16,6 @@ import java.util.Locale;
  *            The target type
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class ReverseConverter<PRESENTATION, MODEL> implements
diff --git a/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java b/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
index 999f575dc4..4ca666cf4b 100644
--- a/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
@@ -14,8 +14,6 @@ import java.util.Locale;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class StringToBooleanConverter implements Converter<String, Boolean> {
diff --git a/server/src/com/vaadin/data/util/converter/StringToDateConverter.java b/server/src/com/vaadin/data/util/converter/StringToDateConverter.java
index 487b02b2aa..98d40c38a3 100644
--- a/server/src/com/vaadin/data/util/converter/StringToDateConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToDateConverter.java
@@ -20,8 +20,6 @@ import java.util.Locale;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class StringToDateConverter implements Converter<String, Date> {
diff --git a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
index 251f91855b..b38ae10db9 100644
--- a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
@@ -20,8 +20,6 @@ import java.util.Locale;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class StringToDoubleConverter implements Converter<String, Double> {
diff --git a/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java b/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java
index 950f01c6ab..03686a9bad 100644
--- a/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java
@@ -17,8 +17,6 @@ import java.util.Locale;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class StringToIntegerConverter implements Converter<String, Integer> {
diff --git a/server/src/com/vaadin/data/util/converter/StringToNumberConverter.java b/server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
index 42699a326a..461e919c5a 100644
--- a/server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
@@ -16,8 +16,6 @@ import java.util.Locale;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class StringToNumberConverter implements Converter<String, Number> {
diff --git a/server/src/com/vaadin/data/validator/AbstractStringValidator.java b/server/src/com/vaadin/data/validator/AbstractStringValidator.java
index 5267cc7b7b..8860210e44 100644
--- a/server/src/com/vaadin/data/validator/AbstractStringValidator.java
+++ b/server/src/com/vaadin/data/validator/AbstractStringValidator.java
@@ -13,7 +13,6 @@ package com.vaadin.data.validator;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version @VERSION@
  * @since 5.4
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/AbstractValidator.java b/server/src/com/vaadin/data/validator/AbstractValidator.java
index 8febe5338a..7f986fbd5e 100644
--- a/server/src/com/vaadin/data/validator/AbstractValidator.java
+++ b/server/src/com/vaadin/data/validator/AbstractValidator.java
@@ -30,8 +30,6 @@ import com.vaadin.data.Validator;
  * @param <T>
  *            The type
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.4
  */
 public abstract class AbstractValidator<T> implements Validator {
diff --git a/server/src/com/vaadin/data/validator/CompositeValidator.java b/server/src/com/vaadin/data/validator/CompositeValidator.java
index cad31c9d4d..d8501a55ad 100644
--- a/server/src/com/vaadin/data/validator/CompositeValidator.java
+++ b/server/src/com/vaadin/data/validator/CompositeValidator.java
@@ -19,7 +19,6 @@ import com.vaadin.data.Validator;
  * <code>AND</code> and <code>OR</code>.
  * 
  * @author Vaadin Ltd.
- * @version @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/DateRangeValidator.java b/server/src/com/vaadin/data/validator/DateRangeValidator.java
index 24f3d3ce10..0f7f7ee540 100644
--- a/server/src/com/vaadin/data/validator/DateRangeValidator.java
+++ b/server/src/com/vaadin/data/validator/DateRangeValidator.java
@@ -17,8 +17,6 @@ import com.vaadin.ui.DateField.Resolution;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class DateRangeValidator extends RangeValidator<Date> {
diff --git a/server/src/com/vaadin/data/validator/DoubleRangeValidator.java b/server/src/com/vaadin/data/validator/DoubleRangeValidator.java
index 05ae2f827e..77599ec325 100644
--- a/server/src/com/vaadin/data/validator/DoubleRangeValidator.java
+++ b/server/src/com/vaadin/data/validator/DoubleRangeValidator.java
@@ -7,8 +7,6 @@ package com.vaadin.data.validator;
  * Validator for validating that a {@link Double} is inside a given range.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 7.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/com/vaadin/data/validator/DoubleValidator.java
index 18f1909add..ae8a791a70 100644
--- a/server/src/com/vaadin/data/validator/DoubleValidator.java
+++ b/server/src/com/vaadin/data/validator/DoubleValidator.java
@@ -9,8 +9,6 @@ package com.vaadin.data.validator;
  * information.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.4
  * @deprecated in Vaadin 7.0. Use an Double converter on the field instead.
  */
diff --git a/server/src/com/vaadin/data/validator/EmailValidator.java b/server/src/com/vaadin/data/validator/EmailValidator.java
index c76d7e13dc..4f47d8a559 100644
--- a/server/src/com/vaadin/data/validator/EmailValidator.java
+++ b/server/src/com/vaadin/data/validator/EmailValidator.java
@@ -12,8 +12,6 @@ package com.vaadin.data.validator;
  * information.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.4
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/IntegerRangeValidator.java b/server/src/com/vaadin/data/validator/IntegerRangeValidator.java
index c171dd97d8..0ddf3fec27 100644
--- a/server/src/com/vaadin/data/validator/IntegerRangeValidator.java
+++ b/server/src/com/vaadin/data/validator/IntegerRangeValidator.java
@@ -7,8 +7,6 @@ package com.vaadin.data.validator;
  * Validator for validating that an {@link Integer} is inside a given range.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.4
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/IntegerValidator.java b/server/src/com/vaadin/data/validator/IntegerValidator.java
index 88ae9f3f0b..8cafe0ca01 100644
--- a/server/src/com/vaadin/data/validator/IntegerValidator.java
+++ b/server/src/com/vaadin/data/validator/IntegerValidator.java
@@ -9,8 +9,6 @@ package com.vaadin.data.validator;
  * information.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.4
  * @deprecated in Vaadin 7.0. Use an Integer converter on the field instead.
  */
diff --git a/server/src/com/vaadin/data/validator/NullValidator.java b/server/src/com/vaadin/data/validator/NullValidator.java
index 551d88c776..50e85be8a6 100644
--- a/server/src/com/vaadin/data/validator/NullValidator.java
+++ b/server/src/com/vaadin/data/validator/NullValidator.java
@@ -11,8 +11,6 @@ import com.vaadin.data.Validator;
  * values. By default, nulls are not allowed.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/RangeValidator.java b/server/src/com/vaadin/data/validator/RangeValidator.java
index 433271274f..734ff481af 100644
--- a/server/src/com/vaadin/data/validator/RangeValidator.java
+++ b/server/src/com/vaadin/data/validator/RangeValidator.java
@@ -21,8 +21,6 @@ package com.vaadin.data.validator;
  *            The type of Number to validate. Must implement Comparable so that
  *            minimum and maximum checks work.
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 7.0
  */
 public class RangeValidator<T extends Comparable> extends AbstractValidator<T> {
diff --git a/server/src/com/vaadin/data/validator/RegexpValidator.java b/server/src/com/vaadin/data/validator/RegexpValidator.java
index 8143d54c97..abab85c285 100644
--- a/server/src/com/vaadin/data/validator/RegexpValidator.java
+++ b/server/src/com/vaadin/data/validator/RegexpValidator.java
@@ -20,8 +20,6 @@ import java.util.regex.Pattern;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.4
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/data/validator/StringLengthValidator.java b/server/src/com/vaadin/data/validator/StringLengthValidator.java
index 54b2d28f58..06f3463531 100644
--- a/server/src/com/vaadin/data/validator/StringLengthValidator.java
+++ b/server/src/com/vaadin/data/validator/StringLengthValidator.java
@@ -9,8 +9,6 @@ package com.vaadin.data.validator;
  * strings.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/event/Action.java b/server/src/com/vaadin/event/Action.java
index 6c218c25dc..41f2e13bcb 100644
--- a/server/src/com/vaadin/event/Action.java
+++ b/server/src/com/vaadin/event/Action.java
@@ -14,8 +14,6 @@ import com.vaadin.terminal.Resource;
  * unregistration.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/event/EventRouter.java b/server/src/com/vaadin/event/EventRouter.java
index 90c080b860..5ddd779e06 100644
--- a/server/src/com/vaadin/event/EventRouter.java
+++ b/server/src/com/vaadin/event/EventRouter.java
@@ -18,8 +18,6 @@ import java.util.List;
  * {@link com.vaadin.event package documentation}.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/event/ListenerMethod.java b/server/src/com/vaadin/event/ListenerMethod.java
index f7dc8a7f13..ee1066ae5b 100644
--- a/server/src/com/vaadin/event/ListenerMethod.java
+++ b/server/src/com/vaadin/event/ListenerMethod.java
@@ -36,8 +36,6 @@ import java.util.logging.Logger;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/event/MethodEventSource.java b/server/src/com/vaadin/event/MethodEventSource.java
index fb2e7b029b..cbe6aa2969 100644
--- a/server/src/com/vaadin/event/MethodEventSource.java
+++ b/server/src/com/vaadin/event/MethodEventSource.java
@@ -18,8 +18,6 @@ import java.lang.reflect.Method;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface MethodEventSource extends Serializable {
diff --git a/server/src/com/vaadin/event/MouseEvents.java b/server/src/com/vaadin/event/MouseEvents.java
index fafd44be89..c0c664a4e5 100644
--- a/server/src/com/vaadin/event/MouseEvents.java
+++ b/server/src/com/vaadin/event/MouseEvents.java
@@ -15,8 +15,6 @@ import com.vaadin.ui.Component;
  * 
  * @author Vaadin Ltd.
  * @see ClickListener
- * @version
- * @VERSION@
  * @since 6.2
  */
 public interface MouseEvents {
diff --git a/server/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java
index 71bff7b865..902f5f3a9e 100644
--- a/server/src/com/vaadin/service/ApplicationContext.java
+++ b/server/src/com/vaadin/service/ApplicationContext.java
@@ -20,8 +20,6 @@ import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
  * HttpSession.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.1
  */
 public interface ApplicationContext extends Serializable {
diff --git a/server/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/service/FileTypeResolver.java
index c457c16eb4..284ad64852 100644
--- a/server/src/com/vaadin/service/FileTypeResolver.java
+++ b/server/src/com/vaadin/service/FileTypeResolver.java
@@ -22,8 +22,6 @@ import com.vaadin.terminal.ThemeResource;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/AbstractClientConnector.java b/server/src/com/vaadin/terminal/AbstractClientConnector.java
index 9c68361382..0eff69e4ef 100644
--- a/server/src/com/vaadin/terminal/AbstractClientConnector.java
+++ b/server/src/com/vaadin/terminal/AbstractClientConnector.java
@@ -35,7 +35,6 @@ import com.vaadin.ui.Root;
  * provides all the basic functionality required for connectors.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public abstract class AbstractClientConnector implements ClientConnector {
diff --git a/server/src/com/vaadin/terminal/AbstractExtension.java b/server/src/com/vaadin/terminal/AbstractExtension.java
index 33a60e39ef..1ac9e41a83 100644
--- a/server/src/com/vaadin/terminal/AbstractExtension.java
+++ b/server/src/com/vaadin/terminal/AbstractExtension.java
@@ -17,7 +17,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * the extend method is declared as protected.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public abstract class AbstractExtension extends AbstractClientConnector
diff --git a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
index 69c70435f0..fecf7a25a9 100644
--- a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
+++ b/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
@@ -107,7 +107,6 @@ import com.vaadin.ui.JavaScriptFunction;
  * </ul>
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public abstract class AbstractJavaScriptExtension extends AbstractExtension {
diff --git a/server/src/com/vaadin/terminal/ApplicationResource.java b/server/src/com/vaadin/terminal/ApplicationResource.java
index da92642d02..3df4686aba 100644
--- a/server/src/com/vaadin/terminal/ApplicationResource.java
+++ b/server/src/com/vaadin/terminal/ApplicationResource.java
@@ -19,8 +19,6 @@ import com.vaadin.Application;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface ApplicationResource extends Resource, Serializable {
diff --git a/server/src/com/vaadin/terminal/ClassResource.java b/server/src/com/vaadin/terminal/ClassResource.java
index b74c8e7bb7..f63111ef9b 100644
--- a/server/src/com/vaadin/terminal/ClassResource.java
+++ b/server/src/com/vaadin/terminal/ClassResource.java
@@ -18,8 +18,6 @@ import com.vaadin.service.FileTypeResolver;
  * @see java.lang.Class#getResource(java.lang.String)
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/CompositeErrorMessage.java b/server/src/com/vaadin/terminal/CompositeErrorMessage.java
index b82b622f54..586d1dc79e 100644
--- a/server/src/com/vaadin/terminal/CompositeErrorMessage.java
+++ b/server/src/com/vaadin/terminal/CompositeErrorMessage.java
@@ -11,8 +11,6 @@ import java.util.Iterator;
  * Class for combining multiple error messages together.
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/DownloadStream.java b/server/src/com/vaadin/terminal/DownloadStream.java
index 9853b0eee2..896d48a1b4 100644
--- a/server/src/com/vaadin/terminal/DownloadStream.java
+++ b/server/src/com/vaadin/terminal/DownloadStream.java
@@ -20,8 +20,6 @@ import com.vaadin.terminal.gwt.server.Constants;
  * Downloadable stream.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/ErrorMessage.java b/server/src/com/vaadin/terminal/ErrorMessage.java
index 60a0780a72..08565c64d8 100644
--- a/server/src/com/vaadin/terminal/ErrorMessage.java
+++ b/server/src/com/vaadin/terminal/ErrorMessage.java
@@ -11,8 +11,6 @@ import java.io.Serializable;
  * shown to user must implement this interface.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface ErrorMessage extends Serializable {
diff --git a/server/src/com/vaadin/terminal/Extension.java b/server/src/com/vaadin/terminal/Extension.java
index ef5bb4cf8d..f114e402d7 100644
--- a/server/src/com/vaadin/terminal/Extension.java
+++ b/server/src/com/vaadin/terminal/Extension.java
@@ -16,7 +16,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * Extensions can use shared state and RPC in the same way as components.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public interface Extension extends ClientConnector {
diff --git a/server/src/com/vaadin/terminal/ExternalResource.java b/server/src/com/vaadin/terminal/ExternalResource.java
index 84fcc65a44..856cf35d07 100644
--- a/server/src/com/vaadin/terminal/ExternalResource.java
+++ b/server/src/com/vaadin/terminal/ExternalResource.java
@@ -15,8 +15,6 @@ import com.vaadin.service.FileTypeResolver;
  * terminal and are not fetched trough the terminal adapter.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/FileResource.java b/server/src/com/vaadin/terminal/FileResource.java
index e3c9f0172a..c6c39058b0 100644
--- a/server/src/com/vaadin/terminal/FileResource.java
+++ b/server/src/com/vaadin/terminal/FileResource.java
@@ -19,8 +19,6 @@ import com.vaadin.terminal.Terminal.ErrorEvent;
  * resource is automatically registered to the application when it is created.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java
index e3669b84ab..7b6c978e9e 100644
--- a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java
+++ b/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.JavaScriptFunction;
  * You should most likely no use this class directly.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class JavaScriptCallbackHelper implements Serializable {
diff --git a/server/src/com/vaadin/terminal/KeyMapper.java b/server/src/com/vaadin/terminal/KeyMapper.java
index 3f19692ef1..523ae60b6f 100644
--- a/server/src/com/vaadin/terminal/KeyMapper.java
+++ b/server/src/com/vaadin/terminal/KeyMapper.java
@@ -12,8 +12,6 @@ import java.util.HashMap;
  * for objects and retrieving the objects later with the key.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public class KeyMapper<V> implements Serializable {
diff --git a/server/src/com/vaadin/terminal/PaintException.java b/server/src/com/vaadin/terminal/PaintException.java
index 68f689b7f1..b8ede0e501 100644
--- a/server/src/com/vaadin/terminal/PaintException.java
+++ b/server/src/com/vaadin/terminal/PaintException.java
@@ -11,8 +11,6 @@ import java.io.Serializable;
  * <code>PaintExcepection</code> is thrown if painting of a component fails.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/PaintTarget.java b/server/src/com/vaadin/terminal/PaintTarget.java
index 9fa8f67bac..ab84bddb30 100644
--- a/server/src/com/vaadin/terminal/PaintTarget.java
+++ b/server/src/com/vaadin/terminal/PaintTarget.java
@@ -15,8 +15,6 @@ import com.vaadin.ui.Component;
  * This interface defines the methods for painting XML to the UIDL stream.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface PaintTarget extends Serializable {
diff --git a/server/src/com/vaadin/terminal/Resource.java b/server/src/com/vaadin/terminal/Resource.java
index 58dc4fea9d..0835ced75e 100644
--- a/server/src/com/vaadin/terminal/Resource.java
+++ b/server/src/com/vaadin/terminal/Resource.java
@@ -11,8 +11,6 @@ import java.io.Serializable;
  * displaying the resource type is left to the terminal.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Resource extends Serializable {
diff --git a/server/src/com/vaadin/terminal/Scrollable.java b/server/src/com/vaadin/terminal/Scrollable.java
index 472954c556..87c791b1c7 100644
--- a/server/src/com/vaadin/terminal/Scrollable.java
+++ b/server/src/com/vaadin/terminal/Scrollable.java
@@ -13,8 +13,6 @@ import java.io.Serializable;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Scrollable extends Serializable {
diff --git a/server/src/com/vaadin/terminal/Sizeable.java b/server/src/com/vaadin/terminal/Sizeable.java
index e3c98e0fa9..00bb7d9765 100644
--- a/server/src/com/vaadin/terminal/Sizeable.java
+++ b/server/src/com/vaadin/terminal/Sizeable.java
@@ -11,8 +11,6 @@ import java.io.Serializable;
  * may be dynamically resized during runtime.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Sizeable extends Serializable {
diff --git a/server/src/com/vaadin/terminal/StreamResource.java b/server/src/com/vaadin/terminal/StreamResource.java
index 1afd91dc08..128af14801 100644
--- a/server/src/com/vaadin/terminal/StreamResource.java
+++ b/server/src/com/vaadin/terminal/StreamResource.java
@@ -17,8 +17,6 @@ import com.vaadin.service.FileTypeResolver;
  * registered to window in creation.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/StreamVariable.java b/server/src/com/vaadin/terminal/StreamVariable.java
index 63763a5751..48ea895ae5 100644
--- a/server/src/com/vaadin/terminal/StreamVariable.java
+++ b/server/src/com/vaadin/terminal/StreamVariable.java
@@ -24,8 +24,6 @@ import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
  * <p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.5
  * @see PaintTarget#addVariable(VariableOwner, String, StreamVariable)
  */
diff --git a/server/src/com/vaadin/terminal/SystemError.java b/server/src/com/vaadin/terminal/SystemError.java
index bae135ee6b..8d9999d418 100644
--- a/server/src/com/vaadin/terminal/SystemError.java
+++ b/server/src/com/vaadin/terminal/SystemError.java
@@ -16,8 +16,6 @@ import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
  * {@link ErrorMessage}.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/Terminal.java b/server/src/com/vaadin/terminal/Terminal.java
index 9dc6ced6a7..a018cd33ed 100644
--- a/server/src/com/vaadin/terminal/Terminal.java
+++ b/server/src/com/vaadin/terminal/Terminal.java
@@ -12,8 +12,6 @@ import java.io.Serializable;
  * this interface. </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Terminal extends Serializable {
diff --git a/server/src/com/vaadin/terminal/ThemeResource.java b/server/src/com/vaadin/terminal/ThemeResource.java
index 41674b2373..608f3970a3 100644
--- a/server/src/com/vaadin/terminal/ThemeResource.java
+++ b/server/src/com/vaadin/terminal/ThemeResource.java
@@ -13,8 +13,6 @@ import com.vaadin.service.FileTypeResolver;
  * provide static images, flash, java-applets, etc for the terminals.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/UserError.java b/server/src/com/vaadin/terminal/UserError.java
index a7a4fd89e2..eb9008ccf0 100644
--- a/server/src/com/vaadin/terminal/UserError.java
+++ b/server/src/com/vaadin/terminal/UserError.java
@@ -9,8 +9,6 @@ package com.vaadin.terminal;
  * errors are occur in normal usage of the application and guide the user.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/Vaadin6Component.java b/server/src/com/vaadin/terminal/Vaadin6Component.java
index 59cbf956ca..20217f6204 100644
--- a/server/src/com/vaadin/terminal/Vaadin6Component.java
+++ b/server/src/com/vaadin/terminal/Vaadin6Component.java
@@ -14,7 +14,6 @@ import com.vaadin.ui.Component;
  * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  * 
  */
diff --git a/server/src/com/vaadin/terminal/VariableOwner.java b/server/src/com/vaadin/terminal/VariableOwner.java
index c52e04c008..427b42337e 100644
--- a/server/src/com/vaadin/terminal/VariableOwner.java
+++ b/server/src/com/vaadin/terminal/VariableOwner.java
@@ -17,8 +17,6 @@ import java.util.Map;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  * @deprecated in 7.0. Only provided to ease porting of Vaadin 6 components. Do
  *             not implement this directly, implement {@link Vaadin6Component}.
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index d3adbeaf19..312a113f82 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -55,8 +55,6 @@ import com.vaadin.ui.Root;
  * 
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.0
  */
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
index 66918c7e5a..e63e2a4805 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
@@ -30,7 +30,6 @@ import com.vaadin.tools.ReflectTools;
  * {@link DeploymentConfiguration#getAddonContextListeners()}.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class AddonContext {
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java b/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java
index ea97153afe..625ed57086 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java
@@ -12,7 +12,6 @@ import java.util.EventObject;
  * @see AddonContextListener
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class AddonContextEvent extends EventObject {
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java b/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java
index 5cc82b9994..04e240c57c 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java
@@ -16,7 +16,6 @@ import java.util.EventListener;
  * interface.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public interface AddonContextListener extends EventListener {
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
index 1af49e0da0..fe612cd4a8 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
@@ -14,8 +14,6 @@ import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassExcep
  * This servlet connects a Vaadin Application to Web.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java
index 24193adc5d..26350b8239 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java
@@ -14,7 +14,6 @@ import com.vaadin.Application;
  * .
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class ApplicationStartedEvent extends EventObject {
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java
index 07e22a90de..7af2fc4385 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java
@@ -16,7 +16,6 @@ import com.vaadin.Application;
  * @see AddonContext#addApplicationStartedListener(ApplicationStartedListener)
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public interface ApplicationStartedListener extends EventListener {
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
index 8d3812abcb..69f1033416 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
@@ -17,7 +17,6 @@ import com.vaadin.terminal.WrappedRequest;
  * includes the JavaScript that initializes the application.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class BootstrapFragmentResponse extends BootstrapResponse {
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java
index 662e0573e2..968075d1af 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java
@@ -15,7 +15,6 @@ import javax.portlet.RenderResponse;
  * HTML is generated.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public interface BootstrapListener extends EventListener {
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
index f72522a801..e0e27a871a 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
@@ -18,7 +18,6 @@ import com.vaadin.terminal.WrappedResponse;
  * that will be included in the corresponding HTTP response.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class BootstrapPageResponse extends BootstrapResponse {
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
index ea8d825e96..2221994fce 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
@@ -16,7 +16,6 @@ import com.vaadin.ui.Root;
  * modification events.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public abstract class BootstrapResponse extends EventObject {
diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
index 4f74cfe4bb..9f8a970bc8 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
@@ -19,7 +19,6 @@ import com.vaadin.ui.Root;
  * with the client side
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  * 
  */
diff --git a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index 3cc3a8cb64..be5e7caabf 100644
--- a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -24,8 +24,6 @@ import com.vaadin.ui.Root;
  * @see AbstractCommunicationManager
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 5a830ddb63..e2f097737d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -31,8 +31,6 @@ import com.vaadin.ui.CustomLayout;
  * etc.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcManager.java b/server/src/com/vaadin/terminal/gwt/server/RpcManager.java
index 026c847e2b..cc1cd10262 100644
--- a/server/src/com/vaadin/terminal/gwt/server/RpcManager.java
+++ b/server/src/com/vaadin/terminal/gwt/server/RpcManager.java
@@ -21,7 +21,6 @@ public interface RpcManager extends Serializable {
      * call
      * 
      * @author Vaadin Ltd
-     * @version @VERSION@
      * @since 7.0
      * 
      */
diff --git a/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java
index 36c08b2ed9..adf8dc38cd 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java
@@ -22,8 +22,6 @@ import com.vaadin.Application;
  * added to a {@link HttpSession}.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.1
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 4b92b12b66..7e6989fe62 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -17,7 +17,6 @@ import com.vaadin.terminal.WrappedRequest;
  * IP address.
  * 
  * @author Vaadin Ltd.
- * @version @VERSION@
  */
 public class WebBrowser implements Terminal {
 
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index e7cb38256c..50ea70a6dd 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -37,8 +37,6 @@ import com.vaadin.tools.ReflectTools;
  * components. Most components in Vaadin do just that.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/com/vaadin/ui/AbstractComponentContainer.java
index bc27242bb8..16a9499215 100644
--- a/server/src/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/com/vaadin/ui/AbstractComponentContainer.java
@@ -19,8 +19,6 @@ import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
  * qualify as a component container.
  * 
  * @author Vaadin Ltd
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 6fe7f54df5..837ba8104b 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -52,8 +52,6 @@ import com.vaadin.terminal.ErrorMessage;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
index 12f1f83968..7964ec359b 100644
--- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
@@ -109,7 +109,6 @@ import com.vaadin.terminal.JavaScriptCallbackHelper;
  * </ul>
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public abstract class AbstractJavaScriptComponent extends AbstractComponent {
diff --git a/server/src/com/vaadin/ui/AbstractLayout.java b/server/src/com/vaadin/ui/AbstractLayout.java
index 7b3a537d06..6916767dde 100644
--- a/server/src/com/vaadin/ui/AbstractLayout.java
+++ b/server/src/com/vaadin/ui/AbstractLayout.java
@@ -12,8 +12,6 @@ import com.vaadin.ui.Layout.MarginHandler;
  * interface.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index 0a97ceb649..2be46b8d7c 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -49,8 +49,6 @@ import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java
index 3b51e6099b..eefdf746a7 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -25,8 +25,6 @@ import com.vaadin.tools.ReflectTools;
  * can contain two components. The components are split by a divider element.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.5
  */
 public abstract class AbstractSplitPanel extends AbstractComponentContainer {
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index 0cb667d527..5797e319c0 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -28,8 +28,6 @@ import com.vaadin.ui.Component.Focusable;
  * A generic button component.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java
index a2c257ab68..0457e5504b 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/com/vaadin/ui/Component.java
@@ -47,8 +47,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Component extends ClientConnector, Sizeable, Serializable {
diff --git a/server/src/com/vaadin/ui/ComponentContainer.java b/server/src/com/vaadin/ui/ComponentContainer.java
index 8182d54b56..4983b9e9cf 100644
--- a/server/src/com/vaadin/ui/ComponentContainer.java
+++ b/server/src/com/vaadin/ui/ComponentContainer.java
@@ -12,8 +12,6 @@ import java.io.Serializable;
  * implement this interface.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface ComponentContainer extends HasComponents {
diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java
index 0eeaa0d9e1..dbaf03e539 100644
--- a/server/src/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/com/vaadin/ui/ConnectorTracker.java
@@ -31,7 +31,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * </p>
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  * 
  */
diff --git a/server/src/com/vaadin/ui/CustomComponent.java b/server/src/com/vaadin/ui/CustomComponent.java
index 40b5dcd636..103163dd13 100644
--- a/server/src/com/vaadin/ui/CustomComponent.java
+++ b/server/src/com/vaadin/ui/CustomComponent.java
@@ -17,8 +17,6 @@ import java.util.Iterator;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java
index d7830603f0..0513580b86 100644
--- a/server/src/com/vaadin/ui/CustomLayout.java
+++ b/server/src/com/vaadin/ui/CustomLayout.java
@@ -43,8 +43,6 @@ import com.vaadin.terminal.gwt.server.JsonPaintTarget;
  * @author Vaadin Ltd.
  * @author Duy B. Vo (<a
  *         href="mailto:devduy@gmail.com?subject=Vaadin">devduy@gmail.com</a>)
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index ff597f8699..f48680d36a 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -45,8 +45,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index ffa47f60b8..a0e97a262f 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -23,8 +23,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * Component for embedding external objects.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java
index fbc4d5a8e6..ce3921a70c 100644
--- a/server/src/com/vaadin/ui/Form.java
+++ b/server/src/com/vaadin/ui/Form.java
@@ -60,8 +60,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  * @deprecated Use {@link FieldGroup} instead of {@link Form} for more
  *             flexibility.
diff --git a/server/src/com/vaadin/ui/FormFieldFactory.java b/server/src/com/vaadin/ui/FormFieldFactory.java
index 1efa05c5f5..6beac74cd9 100644
--- a/server/src/com/vaadin/ui/FormFieldFactory.java
+++ b/server/src/com/vaadin/ui/FormFieldFactory.java
@@ -16,8 +16,6 @@ import com.vaadin.data.Item;
  * <p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.0
  * @see TableFieldFactory
  */
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java
index 49d4c26936..194bc5028f 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/com/vaadin/ui/GridLayout.java
@@ -47,8 +47,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/HasComponents.java b/server/src/com/vaadin/ui/HasComponents.java
index 3ebd63bff2..71d5a3796f 100644
--- a/server/src/com/vaadin/ui/HasComponents.java
+++ b/server/src/com/vaadin/ui/HasComponents.java
@@ -10,7 +10,6 @@ import java.util.Iterator;
  * other {@link Component}s.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  * 
  */
diff --git a/server/src/com/vaadin/ui/HorizontalLayout.java b/server/src/com/vaadin/ui/HorizontalLayout.java
index b9dc1c13ca..835f27c6f7 100644
--- a/server/src/com/vaadin/ui/HorizontalLayout.java
+++ b/server/src/com/vaadin/ui/HorizontalLayout.java
@@ -10,8 +10,6 @@ package com.vaadin.ui;
  * subcomponents in the order of their addition (horizontally).
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.3
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/HorizontalSplitPanel.java b/server/src/com/vaadin/ui/HorizontalSplitPanel.java
index 5bd6c8a075..caedee328a 100644
--- a/server/src/com/vaadin/ui/HorizontalSplitPanel.java
+++ b/server/src/com/vaadin/ui/HorizontalSplitPanel.java
@@ -22,8 +22,6 @@ package com.vaadin.ui;
  * </pre>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.5
  */
 public class HorizontalSplitPanel extends AbstractSplitPanel {
diff --git a/server/src/com/vaadin/ui/InlineDateField.java b/server/src/com/vaadin/ui/InlineDateField.java
index cf61703318..c06d3446d8 100644
--- a/server/src/com/vaadin/ui/InlineDateField.java
+++ b/server/src/com/vaadin/ui/InlineDateField.java
@@ -17,8 +17,6 @@ import com.vaadin.data.Property;
  * @see DateField
  * @see PopupDateField
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 public class InlineDateField extends DateField {
diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java
index 0b4669728a..3a4dd1b04e 100644
--- a/server/src/com/vaadin/ui/JavaScript.java
+++ b/server/src/com/vaadin/ui/JavaScript.java
@@ -22,7 +22,6 @@ import com.vaadin.terminal.Page;
  * corresponding to the current Page.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public class JavaScript extends AbstractExtension {
diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/com/vaadin/ui/JavaScriptFunction.java
index e39ae9b87b..b09e72b37c 100644
--- a/server/src/com/vaadin/ui/JavaScriptFunction.java
+++ b/server/src/com/vaadin/ui/JavaScriptFunction.java
@@ -20,7 +20,6 @@ import com.vaadin.terminal.AbstractJavaScriptExtension;
  * @see AbstractJavaScriptExtension#addFunction(String, JavaScriptCallback)
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0.0
  */
 public interface JavaScriptFunction extends Serializable {
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index 7e50a37805..37495ef55c 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -33,8 +33,6 @@ import com.vaadin.shared.ui.label.LabelState;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Layout.java b/server/src/com/vaadin/ui/Layout.java
index d083f9afdc..13c7d735dc 100644
--- a/server/src/com/vaadin/ui/Layout.java
+++ b/server/src/com/vaadin/ui/Layout.java
@@ -16,8 +16,6 @@ import com.vaadin.shared.ui.AlignmentInfo.Bits;
  * specific locations in the UI.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public interface Layout extends ComponentContainer, Serializable {
diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java
index fd105f3255..a5b7131309 100644
--- a/server/src/com/vaadin/ui/Link.java
+++ b/server/src/com/vaadin/ui/Link.java
@@ -16,8 +16,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * Link is used to create external or internal URL links.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java
index fab8d57c02..a009026a11 100644
--- a/server/src/com/vaadin/ui/Panel.java
+++ b/server/src/com/vaadin/ui/Panel.java
@@ -27,8 +27,6 @@ import com.vaadin.ui.Component.Focusable;
  * Panel - a simple single component container.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/PopupDateField.java b/server/src/com/vaadin/ui/PopupDateField.java
index 3688d4035f..1ad24da9d0 100644
--- a/server/src/com/vaadin/ui/PopupDateField.java
+++ b/server/src/com/vaadin/ui/PopupDateField.java
@@ -19,8 +19,6 @@ import com.vaadin.terminal.PaintTarget;
  * @see DateField
  * @see InlineDateField
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.0
  */
 public class PopupDateField extends DateField {
diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java
index fef54a267c..0301ed10e6 100644
--- a/server/src/com/vaadin/ui/ProgressIndicator.java
+++ b/server/src/com/vaadin/ui/ProgressIndicator.java
@@ -22,8 +22,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * May view an other property that indicates progress 0...1
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 4
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index f60935c64b..a630619eb3 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -38,8 +38,6 @@ import com.vaadin.terminal.Resource;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java
index f6db9f9b91..c7afc5a165 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/com/vaadin/ui/TabSheet.java
@@ -56,8 +56,6 @@ import com.vaadin.ui.themes.Runo;
  * time they are shown, but this may change in future releases.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 public class TabSheet extends AbstractComponentContainer implements Focusable,
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 24cf608dd4..7062c05004 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -67,8 +67,6 @@ import com.vaadin.terminal.Resource;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings({ "deprecation" })
diff --git a/server/src/com/vaadin/ui/TableFieldFactory.java b/server/src/com/vaadin/ui/TableFieldFactory.java
index 6c9a641aa8..de1f8ef272 100644
--- a/server/src/com/vaadin/ui/TableFieldFactory.java
+++ b/server/src/com/vaadin/ui/TableFieldFactory.java
@@ -17,8 +17,6 @@ import com.vaadin.data.Container;
  * <p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 6.0
  * @see FormFieldFactory
  */
diff --git a/server/src/com/vaadin/ui/TextField.java b/server/src/com/vaadin/ui/TextField.java
index 567e9c1c10..308e3e4577 100644
--- a/server/src/com/vaadin/ui/TextField.java
+++ b/server/src/com/vaadin/ui/TextField.java
@@ -22,8 +22,6 @@ import com.vaadin.data.Property;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index f84146ffc3..5d13fcaf7d 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -51,8 +51,6 @@ import com.vaadin.tools.ReflectTools;
  * a hierarchical set of items.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings({ "serial", "deprecation" })
diff --git a/server/src/com/vaadin/ui/UniqueSerializable.java b/server/src/com/vaadin/ui/UniqueSerializable.java
index 828b285538..aa53204bd4 100644
--- a/server/src/com/vaadin/ui/UniqueSerializable.java
+++ b/server/src/com/vaadin/ui/UniqueSerializable.java
@@ -12,7 +12,6 @@ import java.io.Serializable;
  * an anonymous inner class. Otherwise each instance will not be unique.
  * 
  * @author Vaadin Ltd
- * @version @VERSION@
  * @since 7.0
  * 
  */
diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java
index 9d533b67f6..9bd9428a1c 100644
--- a/server/src/com/vaadin/ui/Upload.java
+++ b/server/src/com/vaadin/ui/Upload.java
@@ -55,8 +55,6 @@ import com.vaadin.terminal.gwt.server.NoOutputStreamException;
  * browsers setting size may work to some extend.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/VerticalLayout.java b/server/src/com/vaadin/ui/VerticalLayout.java
index a04d052d98..bc70c3a5d6 100644
--- a/server/src/com/vaadin/ui/VerticalLayout.java
+++ b/server/src/com/vaadin/ui/VerticalLayout.java
@@ -11,8 +11,6 @@ package com.vaadin.ui;
  * is by default 100% wide.
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 5.3
  */
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index 0d18f5d28e..4e91f1845c 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -50,8 +50,6 @@ import com.vaadin.terminal.Vaadin6Component;
  * </p>
  * 
  * @author Vaadin Ltd.
- * @version
- * @VERSION@
  * @since 3.0
  */
 @SuppressWarnings("serial")