summaryrefslogtreecommitdiffstats
path: root/all
diff options
context:
space:
mode:
Diffstat (limited to 'all')
-rw-r--r--all/src/main/resources/WebContent/licenses/the-json-license.txt20
-rw-r--r--all/src/main/templates/release-notes.html4
2 files changed, 4 insertions, 20 deletions
diff --git a/all/src/main/resources/WebContent/licenses/the-json-license.txt b/all/src/main/resources/WebContent/licenses/the-json-license.txt
deleted file mode 100644
index 85380e76a7..0000000000
--- a/all/src/main/resources/WebContent/licenses/the-json-license.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html
index 4286b3ace0..fc1d69fd24 100644
--- a/all/src/main/templates/release-notes.html
+++ b/all/src/main/templates/release-notes.html
@@ -140,6 +140,10 @@
cause problems with external libraries compiled against said versions.</li>
<li>Declarative format is now using "vaadin-" as a default prefix instead of the "v-" prefix used in 7.5.
This default can be changed in deployment configuration.</li>
+ <li>The annotations @PreserveOnRefresh, @Push, @Theme, @Title, @VaadinServletConfiguration and @Widgetset now use
+ @Inherited. The annotation is also looked up in extended interfaces for backwards compatibility.</li>
+ <li>Server-side timings of request processing are only sent to the client when not in production mode. Using the
+ timings in TestBench tests requires the server not to be in production mode.</li>
</ul>
<h3 id="knownissues">Known Issues and Limitations</h3>
<ul>