You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/05 11:45:05 UTC

[GitHub] geertjanw closed pull request #839: Module Review html.knockout

geertjanw closed pull request #839: Module Review html.knockout
URL: https://github.com/apache/incubator-netbeans/pull/839
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/html.knockout/.gitignore b/html.knockout/.gitignore
new file mode 100644
index 0000000000..a932046cb2
--- /dev/null
+++ b/html.knockout/.gitignore
@@ -0,0 +1 @@
+test/unit/data/KOTestProject/public_html/js/libs/knockout-2.2.1/knockout-min.js
diff --git a/html.knockout/build.xml b/html.knockout/build.xml
index c7c5283a3f..e6e23602cf 100644
--- a/html.knockout/build.xml
+++ b/html.knockout/build.xml
@@ -24,6 +24,12 @@
     <import file="../nbbuild/templates/projectized.xml"/>
 
     <target name="build-init" depends="projectized.build-init">
-        <unzip src="external/html.knockout-knockout-resources.zip" dest="."/>
+        <unzip src="external/knockout-2.2.1.jar" dest=".">
+            <patternset>
+                <include name="META-INF/resources/webjars/knockout/2.2.1/knockout.js"/>
+            </patternset>
+            <globmapper from="META-INF/resources/webjars/knockout/2.2.1/knockout.js" 
+                        to="test/unit/data/KOTestProject/public_html/js/libs/knockout-2.2.1/knockout-min.js"/>
+        </unzip>
     </target>
 </project>
diff --git a/html.knockout/external/binaries-list b/html.knockout/external/binaries-list
index e33f03bca4..edbde0b240 100644
--- a/html.knockout/external/binaries-list
+++ b/html.knockout/external/binaries-list
@@ -1 +1,17 @@
-A6CC9C5BDC5F79CD807C1A8E59EE4BF8DD0E744F html.knockout-knockout-resources.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+6A23AC5F22CEBCDCFFC11EB7C32F54BEBB561142 org.webjars:knockout:2.2.1
diff --git a/html.knockout/external/html.knockout-knockout-license.txt b/html.knockout/external/knockout-2.2.1-license.txt
similarity index 88%
rename from html.knockout/external/html.knockout-knockout-license.txt
rename to html.knockout/external/knockout-2.2.1-license.txt
index 08a07b1ae8..e79c10beb2 100644
--- a/html.knockout/external/html.knockout-knockout-license.txt
+++ b/html.knockout/external/knockout-2.2.1-license.txt
@@ -1,4 +1,11 @@
-The MIT License (MIT) - http://www.opensource.org/licenses/mit-license.php
+Name: KnockoutJS
+Version: 2.2.1
+Description: KnockoutJS library
+License: MIT
+Origin: http://knockoutjs.com/
+Type: compile-time
+
+The MIT License
 
 Copyright (c) Steven Sanderson, the Knockout.js team, and other contributors
 http://knockoutjs.com/


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists