Merge remote-tracking branch 'origin/master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: I7f97cb771665485dbc9130a3c9b0365185615fc5

2 files changed, 11 insertions, 7 deletions

diff --git a/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java b/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java
index 6780b1bc75..aab7231258 100644
--- a/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java
+++ b/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java
@@ -50,6 +50,8 @@ import com.vaadin.tools.CvalChecker.UnreachableCvalServerException;
  * </ul>
  *
  * The class also have a method to check just one product.
+ *
+ * @since 7.3
  */
 public final class CvalAddonsChecker {
 
@@ -77,7 +79,7 @@ public final class CvalAddonsChecker {
 
     /**
      * Visit all MANIFEST.MF files in the classpath validating licenses.
-     *
+     * 
      * Return a list of Cval licensed products in order to have enough info to
      * generate nag messages in the UI.
      */
@@ -149,7 +151,7 @@ public final class CvalAddonsChecker {
 
     /**
      * Set the filter regexp of .jar names which we have to consider.
-     *
+     * 
      * default is '.*touchkit.*'
      */
     public CvalAddonsChecker setFilter(String regexp) {
diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/com/vaadin/tools/CvalChecker.java
index 5ad44a70f8..2de7e10faa 100644
--- a/client-compiler/src/com/vaadin/tools/CvalChecker.java
+++ b/client-compiler/src/com/vaadin/tools/CvalChecker.java
@@ -36,19 +36,21 @@ import org.json.JSONObject;
 
 /**
  * This class is able to validate the vaadin CVAL license.
- *
+ * 
  * It reads the developer license file and asks the server to validate the
  * licenseKey. If the license is invalid it throws an exception with the
  * information about the problem and the server response.
+ * 
+ * @since 7.3
  */
 public final class CvalChecker {
 
     /*
      * Class used for binding the JSON gotten from server.
-     *
+     * 
      * It is not in a separate f le, so as it is easier to copy into any product
      * which does not depend on vaadin core.
-     *
+     * 
      * We are using org.json in order not to use additional dependency like
      * auto-beans, gson, etc.
      */
@@ -301,7 +303,7 @@ public final class CvalChecker {
 
     /**
      * Given a product name returns the name of the file with the license key.
-     *
+     * 
      * Traditionally we have delivered license keys with a name like
      * 'vaadin.touchkit.developer.license' but our database product name is
      * 'vaadin-touchkit' so we have to replace '-' by '.' to maintain
@@ -342,7 +344,7 @@ public final class CvalChecker {
 
     /**
      * Validate whether there is a valid license key for a product.
-     *
+     * 
      * @param productName
      *            for example vaadin-touchkit
      * @param productVersion