MIT allows sublicensing, so let's re-distribute the knockout.js under our license while keeping Steven Sanderson copyright.
authorJaroslav Tulach <jtulach@netbeans.org>
Tue, 26 Aug 2014 18:22:37 +0200
changeset 8397b0f9b77670a
parent 838 bdc3d696dd4a
child 840 177e6467c0c3
MIT allows sublicensing, so let's re-distribute the knockout.js under our license while keeping Steven Sanderson copyright.
ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-3.2.0.debug.js
pom.xml
     1.1 --- a/ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-3.2.0.debug.js	Tue Aug 26 18:13:30 2014 +0200
     1.2 +++ b/ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-3.2.0.debug.js	Tue Aug 26 18:22:37 2014 +0200
     1.3 @@ -1,3 +1,46 @@
     1.4 +/*
     1.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.6 + *
     1.7 + * Copyright 2013-2014 Oracle and/or its affiliates. All rights reserved.
     1.8 + *
     1.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.10 + * Other names may be trademarks of their respective owners.
    1.11 + *
    1.12 + * The contents of this file are subject to the terms of either the GNU
    1.13 + * General Public License Version 2 only ("GPL") or the Common
    1.14 + * Development and Distribution License("CDDL") (collectively, the
    1.15 + * "License"). You may not use this file except in compliance with the
    1.16 + * License. You can obtain a copy of the License at
    1.17 + * http://www.netbeans.org/cddl-gplv2.html
    1.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.19 + * specific language governing permissions and limitations under the
    1.20 + * License.  When distributing the software, include this License Header
    1.21 + * Notice in each file and include the License file at
    1.22 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.23 + * particular file as subject to the "Classpath" exception as provided
    1.24 + * by Oracle in the GPL Version 2 section of the License file that
    1.25 + * accompanied this code. If applicable, add the following below the
    1.26 + * License Header, with the fields enclosed by brackets [] replaced by
    1.27 + * your own identifying information:
    1.28 + * "Portions Copyrighted [year] [name of copyright owner]"
    1.29 + *
    1.30 + * Contributor(s):
    1.31 + *
    1.32 + * The Original Software is NetBeans. The Initial Developer of the Original
    1.33 + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved.
    1.34 + *
    1.35 + * If you wish your version of this file to be governed by only the CDDL
    1.36 + * or only the GPL Version 2, indicate your decision by adding
    1.37 + * "[Contributor] elects to include this software in this distribution
    1.38 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.39 + * single choice of license, a recipient has the option to distribute
    1.40 + * your version of this file under either the CDDL, the GPL Version 2 or
    1.41 + * to extend the choice of license to its licensees as provided above.
    1.42 + * However, if you add GPL Version 2 code and therefore, elected the GPL
    1.43 + * Version 2 license, then the option applies only if the new code is
    1.44 + * made subject to such option by the copyright holder.
    1.45 + */
    1.46 +
    1.47  /*!
    1.48   * Knockout JavaScript library v3.2.0
    1.49   * (c) Steven Sanderson - http://knockoutjs.com/
     2.1 --- a/pom.xml	Tue Aug 26 18:13:30 2014 +0200
     2.2 +++ b/pom.xml	Tue Aug 26 18:22:37 2014 +0200
     2.3 @@ -95,7 +95,6 @@
     2.4                    <excludes>
     2.5                         <exclude>*</exclude>
     2.6                         <exclude>.*/**</exclude>
     2.7 -                       <exclude>ko4j/src/main/resources/org/netbeans/html/ko4j/knockout*.js</exclude>
     2.8                         <exclude>boot-script/src/test/resources/net/java/html/boot/script/ko4j/env.nashorn.1.2-debug.js</exclude>
     2.9                         <exclude>src/main/javadoc/resources/teavm.js</exclude>
    2.10                    </excludes>