# HG changeset patch # User Jaroslav Tulach # Date 1409070157 -7200 # Node ID 7b0f9b77670a4b369fef44633bd7f8c9310eac7a # Parent bdc3d696dd4aedee93e8f84df1244e5795a3aaa6 MIT allows sublicensing, so let's re-distribute the knockout.js under our license while keeping Steven Sanderson copyright. diff -r bdc3d696dd4a -r 7b0f9b77670a ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-3.2.0.debug.js --- a/ko4j/src/main/resources/org/netbeans/html/ko4j/knockout-3.2.0.debug.js Tue Aug 26 18:13:30 2014 +0200 +++ 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,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2013-2014 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + /*! * Knockout JavaScript library v3.2.0 * (c) Steven Sanderson - http://knockoutjs.com/ diff -r bdc3d696dd4a -r 7b0f9b77670a pom.xml --- a/pom.xml Tue Aug 26 18:13:30 2014 +0200 +++ b/pom.xml Tue Aug 26 18:22:37 2014 +0200 @@ -95,7 +95,6 @@ * .*/** - ko4j/src/main/resources/org/netbeans/html/ko4j/knockout*.js boot-script/src/test/resources/net/java/html/boot/script/ko4j/env.nashorn.1.2-debug.js src/main/javadoc/resources/teavm.js