Merge 0f46a7b into 188269f

vaadin · Dec 14, 2018 · c85b02f · c85b02f
2 parents 188269f + 0f46a7b
commit c85b02f
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 299 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -134,6 +134,6 @@ Cross-browser Testing Platform and Open Source <3 Provided by [Sauce Labs](https
 
 ## License
 
-Commercial Vaadin Add-on License version 3 (CVALv3). For license terms, see LICENSE.
+Apache License 2.0
 
 Vaadin collects development time usage statistics to improve this product. For details and to opt-out, see https://github.com/vaadin/vaadin-usage-statistics.
diff --git a/bower.json b/bower.json
@@ -16,7 +16,7 @@
     "web-component",
     "polymer"
   ],
-  "license": "https://raw.githubusercontent.com/vaadin/vaadin-confirm-dialog/master/LICENSE",
+  "license": "Apache-2.0",
   "ignore": [
     "**/.*",
     "node_modules",
@@ -31,7 +31,6 @@
     "vaadin-element-mixin": "vaadin/vaadin-element-mixin#^2.0.0",
     "vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.3.0",
     "vaadin-material-styles": "vaadin/vaadin-material-styles#^1.2.0",
-    "vaadin-license-checker": "vaadin/license-checker#^2.1.0",
     "vaadin-text-field": "vaadin/vaadin-text-field#^2.1.0",
     "vaadin-button": "vaadin/vaadin-button#^2.1.0",
     "iron-form": "^2.4.0",

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "polymer"
   ],
   "author": "Vaadin Ltd",
-  "license": "https://raw.githubusercontent.com/vaadin/vaadin-confirm-dialog/master/LICENSE",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/vaadin/vaadin-login/issues"
   },

diff --git a/src/vaadin-login-mixin.html b/src/vaadin-login-mixin.html
@@ -1,8 +1,8 @@
 <!--
 @license
-Copyright (c) 2018 Vaadin Ltd.
-This program is available under Commercial Vaadin Add-On License 3.0 (CVALv3).
-See <a href="https://vaadin.com/license/cval-3">the website</a> for the complete license.
+Vaadin Login
+Copyright (C) 2018 Vaadin Ltd
+This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
 -->
 
 <script>

diff --git a/src/vaadin-login-overlay.html b/src/vaadin-login-overlay.html
@@ -1,8 +1,8 @@
 <!--
 @license
-Copyright (c) 2018 Vaadin Ltd.
-This program is available under Commercial Vaadin Add-On License 3.0 (CVALv3).
-See <a href="https://vaadin.com/license/cval-3">the website</a> for the complete license.
+Vaadin Login
+Copyright (C) 2018 Vaadin Ltd
+This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
 -->
 
 <link rel="import" href="../../polymer/polymer-element.html">

diff --git a/src/vaadin-login.html b/src/vaadin-login.html
@@ -1,14 +1,13 @@
 <!--
 @license
-Copyright (c) 2018 Vaadin Ltd.
-This program is available under Commercial Vaadin Add-On License 3.0 (CVALv3).
-See <a href="https://vaadin.com/license/cval-3">the website</a> for the complete license.
+Vaadin Login
+Copyright (C) 2018 Vaadin Ltd
+This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
 -->
 
 <link rel="import" href="../../polymer/polymer-element.html">
 <link rel="import" href="../../vaadin-themable-mixin/vaadin-themable-mixin.html">
 <link rel="import" href="../../vaadin-element-mixin/vaadin-element-mixin.html">
-<link rel="import" href="../../vaadin-license-checker/vaadin-license-checker.html">
 
 <link rel="import" href="vaadin-login-mixin.html">
 
@@ -195,12 +194,6 @@ <h5>[[i18n.errorMessage.title]]</h5>
        * @namespace Vaadin
        */
       window.Vaadin.VaadinLogin = VaadinLogin;
-
-      const licenseChecker = window.Vaadin.developmentModeCallback
-        && window.Vaadin.developmentModeCallback['vaadin-license-checker'];
-      if (typeof licenseChecker === 'function') {
-        licenseChecker(VaadinLogin);
-      }
     })();
   </script>
 </dom-module>