From 309a7bfda59396d45afc61557d0ded2c262451d4 Mon Sep 17 00:00:00 2001 From: Marko Gronroos Date: Fri, 14 Dec 2012 18:35:07 +0200 Subject: Moved third-party license notes to the license file. For #10153. --- WebContent/release-notes.html | 230 +----------------------------------------- 1 file changed, 3 insertions(+), 227 deletions(-) (limited to 'WebContent/release-notes.html') diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index ec2d2548fe..b0522b3727 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -45,16 +45,15 @@
  • Upgrading to Vaadin @version-minor@
  • Supported technologies
  • Vaadin on the Web
    • -
  • Vaadin Framework Terms and Conditions

    • Overview

    Vaadin is a Java framework for building modern web applications that look - great, perform well and make you and your users happy. Vaadin and is - available under the Apache 2 license (see Vaadin Framework Terms - and Conditions). + great, perform well and make you and your users happy. Vaadin is + available under the Apache License, Version 2.0 (see the license.html in + the Vaadin ZIP or JAR package).

    @@ -490,229 +489,6 @@ -

    Vaadin Framework Terms and Conditions for Use, Reproduction and Distribution

    - -

    - The Vaadin Framework software developed by Vaadin is licensed under the Apache - License version 2.0. The full license text is included in the ZIP installation - package, in the Vaadin JARs, and on-line at vaadin.com/license or apache.org/licenses. -

    - -

    - The license of the Vaadin Framework is for this product only and may not apply to - all Vaadin add-on components, such as those available from Vaadin Directory, or - other Vaadin products, which may have a different license. -

    - -

    - Other software included in this distribution is provided under other licenses, as - listed in the following section. -

    - -

    Included Third-Party Software and Licenses

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PackageLicense
    Apache Ant
    - Ant Launcher    		Apache License, Version 2.0
    Apache Commons
    - BCEL
    - Beanutils
    - CLI
    - Codec
    - Collections
    - Digester 3
    - Discovery
    - EL
    - IO
    - Jexl
    - Lang
    - Logging
    - Math
    - Modeler    		Apache License, Version 2.0
    Apache HttpComponents CoreApache License, Version 2.0
    Apache Jakarta RegexpApache License, Version 2.0
    Apache James Server
    - Apache James Mime4j    		Apache License, Version 2.0
    Apache TapestryApache License, Version 2.0
    Apache Tomcat
    Catalina
    Coyote
    Jasper
    JK
    Naming    		Apache License, Version 2.0
    Apache XalanApache License, Version 2.0
    Apache XercesApache License, Version 2.0
    Args4jThe MIT License (MIT)
    Bean Validation (JSR-303) APIApache License, Version 2.0
    CSS ParserGNU Lesser General Public License, version 2.0
    CUPCUP Open Source License
    CyberNeko HTML ParserApache License, Version 2.0
    Eclipse - JDTEclipse Public License - v 1.0
    FluteW3C Software Copyright Notice and License
    Google AppEngine APIGoogle App Engine Terms of Service
    Google Closure CompilerApache License, Version 2.0
    Google CollectionsApache License, Version 2.0
    Google Protocol BuffersBSD License
    Google GWTApache License, Version 2.0
    GuavaApache License, Version 2.0
    HtmlUnitApache License, Version 2.0
    ICUICU License
    JettyApache License, Version 2.0 OR Eclipse 1.0 (see exceptions)
    JsilverApache License, Version 2.0
    JSONThe JSON License
    JSoupThe MIT License
    JUnitCommon Public License (CPL) - v 1.0
    Liferay Service InterfacesGNU Lesser General Public License 2.1 or newer
    Mozilla RhinoMozilla Public License v. 1.1
    MX4JThe MX4J License
    SAC: The Simple API for CSSW3C Software Copyright Notice and License
    SmartSpritesBSD License
    SwingworkerGNU Lesser General Public License 2.1
    -