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/08/21 19:31:30 UTC
[GitHub] geertjanw closed pull request #731: [NETBEANS-1074] Module Review
javascript2.jquery
geertjanw closed pull request #731: [NETBEANS-1074] Module Review javascript2.jquery
URL: https://github.com/apache/incubator-netbeans/pull/731
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/javascript2.jquery/.gitignore b/javascript2.jquery/.gitignore
new file mode 100644
index 0000000000..3bc8fb3d47
--- /dev/null
+++ b/javascript2.jquery/.gitignore
@@ -0,0 +1 @@
+external/jquery-api.xml
diff --git a/javascript2.jquery/build.xml b/javascript2.jquery/build.xml
index 5af21666af..7785d780c2 100644
--- a/javascript2.jquery/build.xml
+++ b/javascript2.jquery/build.xml
@@ -24,6 +24,6 @@
<import file="../nbbuild/templates/projectized.xml"/>
<target name="build-init" depends="projectized.build-init">
- <unzip src="external/jquery-api-resources.zip" dest="./external"/>
+ <unzip src="external/jquery-api-resources-1.10.zip" dest="./external"/>
</target>
</project>
diff --git a/javascript2.jquery/external/binaries-list b/javascript2.jquery/external/binaries-list
index 618d0ca30a..a825c81f9b 100644
--- a/javascript2.jquery/external/binaries-list
+++ b/javascript2.jquery/external/binaries-list
@@ -1 +1,17 @@
-9C18E4C25EDA4462926855AE86ED382F5FA25F3D jquery-api-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.
+9C18E4C25EDA4462926855AE86ED382F5FA25F3D jquery-api-resources-1.10.zip
diff --git a/javascript2.jquery/external/jquery-api-license.txt b/javascript2.jquery/external/jquery-api-1.10-license.txt
similarity index 94%
rename from javascript2.jquery/external/jquery-api-license.txt
rename to javascript2.jquery/external/jquery-api-1.10-license.txt
index cc1bc73c6e..d6200c9e63 100644
--- a/javascript2.jquery/external/jquery-api-license.txt
+++ b/javascript2.jquery/external/jquery-api-1.10-license.txt
@@ -1,8 +1,10 @@
Name: jquery-api.xml
-Version: jQuery 1.10
+Version: 1.10
Description: Documentation api file for jQuery
License: MIT-jquery
+Origin: http://jquery.com
Source: http://api.jquery.com/resources/api.xml
+Files: jquery-api-resources-1.10.zip
Copyright (c) 2011 John Resig, http://jquery.com/
diff --git a/nbbuild/licenses/MIT-jquery b/nbbuild/licenses/MIT-jquery
new file mode 100644
index 0000000000..03bd701140
--- /dev/null
+++ b/nbbuild/licenses/MIT-jquery
@@ -0,0 +1,18 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+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 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.
----------------------------------------------------------------
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