You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2019/08/08 12:33:35 UTC
[netbeans] branch master updated: [NETBEANS-1159] Using UPL
licensed graal-js-parser.
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new bba551d [NETBEANS-1159] Using UPL licensed graal-js-parser.
bba551d is described below
commit bba551de9d35e8cb5c8dd1f405399e60ea190b7c
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Thu Aug 8 14:33:30 2019 +0200
[NETBEANS-1159] Using UPL licensed graal-js-parser.
---
ergonomics/ide.ergonomics/enterprise.properties | 1 -
.../ide/ergonomics/fod/FoDUpdateUnitProvider.java | 3 +-
.../modules/ide/ergonomics/DynamicVerifyTest.java | 13 +-
ergonomics/ide.ergonomics/webcommon.properties | 1 -
.../modules/kotlin/editor/KtDataObject.java | 3 +-
php/php.editor/nbproject/project.properties | 2 -
webcommon/javascript2.editor/build.xml | 10 -
.../nbproject/project.properties | 2 -
webcommon/javascript2.editor/nbproject/project.xml | 2 +-
webcommon/libs.nashorn/build.xml | 17 -
webcommon/libs.nashorn/external/binaries-list | 2 +-
.../com.oracle.js.parser-ba7a8bc42268-license.txt | 433 ---------------------
.../external/graal-js-parser-e20fe15-license.txt | 24 ++
webcommon/libs.nashorn/manifest.mf | 3 +-
.../libs.nashorn/nbproject/project.properties | 2 +
webcommon/libs.nashorn/nbproject/project.xml | 4 +-
16 files changed, 36 insertions(+), 486 deletions(-)
diff --git a/ergonomics/ide.ergonomics/enterprise.properties b/ergonomics/ide.ergonomics/enterprise.properties
index e630aa0..7ae04e9 100644
--- a/ergonomics/ide.ergonomics/enterprise.properties
+++ b/ergonomics/ide.ergonomics/enterprise.properties
@@ -23,5 +23,4 @@ project.xpath.src/main/webapp=
mainModule=org.netbeans.modules.j2ee.kit
-extra.modules=org.netbeans.libs.oracle.jsparser
LBL_Ergonomics_Extra_Required=Javascript Parser is required by HTML5 features.
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDUpdateUnitProvider.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDUpdateUnitProvider.java
index 697e2aa..d8f00c2 100644
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDUpdateUnitProvider.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDUpdateUnitProvider.java
@@ -70,10 +70,9 @@ public class FoDUpdateUnitProvider implements UpdateProvider {
/**
* Known extra modules present during tests. Should contain compile-time
- * modules like Oracle JS parser and NB Javac stub
+ * modules NB Javac stub
*/
private static final Collection<String> EXCLUDE_EXTRA_MODULES = new HashSet<>(Arrays.asList(
- "org.netbeans.libs.oracle.jsparser", // NOI18N
"org.netbeans.modules.java.source.nbjavac.test"// NOI18N
));
diff --git a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/DynamicVerifyTest.java b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/DynamicVerifyTest.java
index 0a0b3f9..3c391e7 100644
--- a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/DynamicVerifyTest.java
+++ b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/DynamicVerifyTest.java
@@ -98,17 +98,8 @@ public class DynamicVerifyTest extends NbTestCase {
}
public void testNoUserDefinedFeaturesInStandardBuild() throws Exception {
- // remove the javascript parser from the checklist: it has to be user-installed
- // through AU when HTML5 is enabled
- FoDUpdateUnitProvider instance = new FoDUpdateUnitProvider() {
- @Override
- protected boolean acceptsModule(ModuleInfo mi) {
- if (!super.acceptsModule(mi)) {
- return false;
- }
- return !"org.netbeans.libs.oracle.jsparser".equals(mi.getCodeNameBase());
- }
- };
+ FoDUpdateUnitProvider instance = new FoDUpdateUnitProvider();
+
Map<String, UpdateItem> items = instance.getUpdateItems();
assertNull("No user installed modules should be in standard build. If this happens,\n" +
"like in case of http://openide.netbeans.org/issues/show_bug.cgi?id=174052\n" +
diff --git a/ergonomics/ide.ergonomics/webcommon.properties b/ergonomics/ide.ergonomics/webcommon.properties
index a177aec..723608b 100644
--- a/ergonomics/ide.ergonomics/webcommon.properties
+++ b/ergonomics/ide.ergonomics/webcommon.properties
@@ -16,5 +16,4 @@
# under the License.
mainModule=org.netbeans.modules.web.client.kit
-extra.modules=org.netbeans.libs.oracle.jsparser
LBL_Ergonomics_Extra_Required=Javascript Parser is required for Javascript + HTML support to work properly.
diff --git a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java
index 29ad9f5..59cc2b4 100644
--- a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java
+++ b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java
@@ -45,7 +45,8 @@ import org.openide.windows.TopComponent;
@MIMEResolver.ExtensionRegistration(
displayName = "#LBL_Kt_LOADER",
mimeType = "text/x-kotlin",
- extension = {"kt", "kts"}
+ extension = {"kt", "kts"},
+ position = 80843
)
@DataObject.Registration(
mimeType = "text/x-kotlin",
diff --git a/php/php.editor/nbproject/project.properties b/php/php.editor/nbproject/project.properties
index 2883a75..67ad487 100644
--- a/php/php.editor/nbproject/project.properties
+++ b/php/php.editor/nbproject/project.properties
@@ -78,5 +78,3 @@ test.config.stableBTD.excludes=\
**/ParamDeclTypes68Test.class,\
**/SemanticAnalyzerTest.class,\
**/ToggleBlockCommentActionTest.class
-nashorn.prepend=${basedir}/../../webcommon/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268.jar
-bootclasspath.prepend=${nashorn.prepend}
diff --git a/webcommon/javascript2.editor/build.xml b/webcommon/javascript2.editor/build.xml
index 80cc944..f636753 100644
--- a/webcommon/javascript2.editor/build.xml
+++ b/webcommon/javascript2.editor/build.xml
@@ -40,15 +40,5 @@
<copy file="external/js-domstubs-DOM3.zip" tofile="${cluster}/jsstubs/domstubs.zip"/>
</target>
<target name="release" depends="projectized.release,-bundle-corestubs,-bundle-domstubs,-bundle-reststubs"/>
-
-<!-- <target name="-verify-bootclasspath" depends="build-init">
- <fail message="Nashorn is not on a bootclasspath">
- <condition>
- <not>
- <available file="${nashorn.prepend}" />
- </not>
- </condition>
- </fail>
- </target>-->
</project>
diff --git a/webcommon/javascript2.editor/nbproject/project.properties b/webcommon/javascript2.editor/nbproject/project.properties
index 7390cea..82cf855 100644
--- a/webcommon/javascript2.editor/nbproject/project.properties
+++ b/webcommon/javascript2.editor/nbproject/project.properties
@@ -29,5 +29,3 @@ extra.module.files=\
jsstubs/reststubs.zip
jnlp.indirect.jars=jsstubs/*.zip
-nashorn.prepend=${basedir}/../libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268.jar
-bootclasspath.prepend=${nashorn.prepend}
diff --git a/webcommon/javascript2.editor/nbproject/project.xml b/webcommon/javascript2.editor/nbproject/project.xml
index c0c5324..61ee8e0 100644
--- a/webcommon/javascript2.editor/nbproject/project.xml
+++ b/webcommon/javascript2.editor/nbproject/project.xml
@@ -66,7 +66,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
- <specification-version>1.13</specification-version>
+ <specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/webcommon/libs.nashorn/build.xml b/webcommon/libs.nashorn/build.xml
index 0d2b4e1..788897a 100644
--- a/webcommon/libs.nashorn/build.xml
+++ b/webcommon/libs.nashorn/build.xml
@@ -22,21 +22,4 @@
<project basedir="." default="build" name="webcommon/libs.nashorn">
<description>Builds, tests, and runs the project org.netbeans.libs.nashorn</description>
<import file="../../nbbuild/templates/projectized.xml"/>
- <import file="../../nbbuild/templates/common.xml"/>
-
- <!-- Relative path to the jsparser module build -->
- <property name="jsparser.module.dir" location="../../contrib/libs.oracle.jsparser/build/webcommon/modules"/>
-
- <!-- For testing purposes, build distribution of JS parser in a separate directory -->
- <target name="expand-test-jsparser-module">
- <ant dir="../../contrib/libs.oracle.jsparser" inheritall="false" inheritrefs="false"/>
- <mkdir dir="${build.test.unit.classes.dir}"/>
- <mkdir dir="build/test/unit/classes"/>
- <!-- Test infrastructure will zip the files again, into ${test.unit.out.folder} -->
- <unzip src="${jsparser.module.dir}/org-netbeans-libs-oracle-jsparser.jar" dest="build/test/unit/classes"/>
- <mkdir dir="${test.unit.out.folder}/ext"/>
- <copy file="${jsparser.module.dir}/ext/com.oracle.js.parser.jar" todir="${test.unit.out.folder}/ext"/>
- </target>
-
- <target name="do-unit-test-build" depends="test-init,expand-test-jsparser-module,projectized.do-unit-test-build"/>
</project>
diff --git a/webcommon/libs.nashorn/external/binaries-list b/webcommon/libs.nashorn/external/binaries-list
index b9b7a8f..4dc7332 100644
--- a/webcommon/libs.nashorn/external/binaries-list
+++ b/webcommon/libs.nashorn/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser-ba7a8bc42268.jar
+F500B932961B227F74352474D23F905EC52F112E graal-js-parser-e20fe15.jar
diff --git a/webcommon/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt b/webcommon/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt
deleted file mode 100644
index ba0470c..0000000
--- a/webcommon/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt
+++ /dev/null
@@ -1,433 +0,0 @@
-Name: com.oracle.js.parser.jar
-Version: ba7a8bc42268
-Description: An ECMAScript 6 (ECMAScript 2015) compliant parser for JavaScript source code. Based on the parser of Project Nashorn in OpenJDK (http://openjdk.java.net/projects/nashorn/).
-License: GPL-2-CP
-Origin: http://hg.openjdk.java.net/graal/graal-js-parser
-Type: compile-time
-Comment: Compile-time only library, JAR will not be copied to the distribution.
-
-The GNU General Public License (GPL)
-Version 2, June 1991
-
- Copyright 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim
- copies of this license document, but changing it is not
- allowed.
-
- Preamble
-
-The licenses for most software are designed to take away
-your freedom to share and change it. By contrast, the GNU
-General Public License is intended to guarantee your freedom
-to share and change free software--to make sure the software
-is free for all its users. This General Public License
-applies to most of the Free Software Foundation's software
-and to any other program whose authors commit to using it.
-(Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can
-apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom,
-not price. Our General Public Licenses are designed to make
-sure that you have the freedom to distribute copies of free
-software (and charge for this service if you wish), that you
-receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that
-forbid anyone to deny you these rights or to ask you to
-surrender the rights. These restrictions translate to
-certain responsibilities for you if you distribute copies of
-the software, or if you modify it.
-
-For example, if you distribute copies of such a program,
-whether gratis or for a fee, you must give the recipients
-all the rights that you have. You must make sure that they,
-too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the
-software, and (2) offer you this license which gives you
-legal permission to copy, distribute and/or modify the
-software.
-
-Also, for each author's protection and ours, we want to make
-certain that everyone understands that there is no warranty
-for this free software. If the software is modified by
-someone else and passed on, we want its recipients to know
-that what they have is not the original, so that any
-problems introduced by others will not reflect on the
-original authors' reputations.
-
-Finally, any free program is threatened constantly by
-software patents. We wish to avoid the danger that
-redistributors of a free program will individually obtain
-patent licenses, in effect making the program proprietary.
-To prevent this, we have made it clear that any patent must
-be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution
-and modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
-MODIFICATION
-
-0. This License applies to any program or other work which
-contains a notice placed by the copyright holder saying it
-may be distributed under the terms of this General Public
-License. The "Program", below, refers to any such program or
-work, and a "work based on the Program" means either the
-Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into
-another language. (Hereinafter, translation is included
-without limitation in the term "modification".) Each
-licensee is addressed as "you".
-
-Activities other than copying, distribution and modification
-are not covered by this License; they are outside its scope.
-The act of running the Program is not restricted, and the
-output from the Program is covered only if its contents
-constitute a work based on the Program (independent of
-having been made by running the Program). Whether that is
-true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the
-Program's source code as you receive it, in any medium,
-provided that you conspicuously and appropriately publish on
-each copy an appropriate copyright notice and disclaimer of
-warranty; keep intact all the notices that refer to this
-License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this License along
-with the Program.
-
-You may charge a fee for the physical act of transferring a
-copy, and you may at your option offer warranty protection
-in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any
-portion of it, thus forming a work based on the Program, and
-copy and distribute such modifications or work under the
-terms of Section 1 above, provided that you also meet all of
-these conditions:
-
- a) You must cause the modified files to carry prominent
- notices stating that you changed the files and the date
- of any change.
-
- b) You must cause any work that you distribute or
- publish, that in whole or in part contains or is derived
- from the Program or any part thereof, to be licensed as
- a whole at no charge to all third parties under the
- terms of this License.
-
- c) If the modified program normally reads commands
- interactively when run, you must cause it, when started
- running for such interactive use in the most ordinary
- way, to print or display an announcement including an
- appropriate copyright notice and a notice that there is
- no warranty (or else, saying that you provide a
- warranty) and that users may redistribute the program
- under these conditions, and telling the user how to view
- a copy of this License. (Exception: if the Program
- itself is interactive but does not normally print such
- an announcement, your work based on the Program is not
- required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the
-Program, and can be reasonably considered independent and
-separate works in themselves, then this License, and its
-terms, do not apply to those sections when you distribute
-them as separate works. But when you distribute the same
-sections as part of a whole which is a work based on the
-Program, the distribution of the whole must be on the terms
-of this License, whose permissions for other licensees
-extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights
-or contest your rights to work written entirely by you;
-rather, the intent is to exercise the right to control the
-distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on
-the Program with the Program (or with a work based on the
-Program) on a volume of a storage or distribution medium
-does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based
-on it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you
-also do one of the following:
-
- a) Accompany it with the complete corresponding
- machine-readable source code, which must be distributed
- under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least
- three years, to give any third party, for a charge no
- more than your cost of physically performing source
- distribution, a complete machine-readable copy of the
- corresponding source code, to be distributed under the
- terms of Sections 1 and 2 above on a medium customarily
- used for software interchange; or,
-
- c) Accompany it with the information you received as to
- the offer to distribute corresponding source code. (This
- alternative is allowed only for noncommercial
- distribution and only if you received the program in
- object code or executable form with such an offer, in
- accord with Subsection b above.)
-
-The source code for a work means the preferred form of the
-work for making modifications to it. For an executable work,
-complete source code means all the source code for all
-modules it contains, plus any associated interface
-definition files, plus the scripts used to control
-compilation and installation of the executable. However, as
-a special exception, the source code distributed need not
-include anything that is normally distributed (in either
-source or binary form) with the major components (compiler,
-kernel, and so on) of the operating system on which the
-executable runs, unless that component itself accompanies
-the executable.
-
-If distribution of executable or object code is made by
-offering access to copy from a designated place, then
-offering equivalent access to copy the source code from the
-same place counts as distribution of the source code, even
-though third parties are not compelled to copy the source
-along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the
-Program except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense or distribute
-the Program is void, and will automatically terminate your
-rights under this License. However, parties who have
-received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties
-remain in full compliance.
-
-5. You are not required to accept this License, since you
-have not signed it. However, nothing else grants you
-permission to modify or distribute the Program or its
-derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or
-distributing the Program (or any work based on the Program),
-you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or
-modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based
-on the Program), the recipient automatically receives a
-license from the original licensor to copy, distribute or
-modify the Program subject to these terms and conditions.
-You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein. You are
-not responsible for enforcing compliance by third parties to
-this License.
-
-7. If, as a consequence of a court judgment or allegation of
-patent infringement or for any other reason (not limited to
-patent issues), conditions are imposed on you (whether by
-court order, agreement or otherwise) that contradict the
-conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as
-to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a
-consequence you may not distribute the Program at all. For
-example, if a patent license would not permit royalty-free
-redistribution of the Program by all those who receive
-copies directly or indirectly through you, then the only way
-you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or
-unenforceable under any particular circumstance, the balance
-of the section is intended to apply and the section as a
-whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to
-infringe any patents or other property right claims or to
-contest validity of any such claims; this section has the
-sole purpose of protecting the integrity of the free
-software distribution system, which is implemented by public
-license practices. Many people have made generous
-contributions to the wide range of software distributed
-through that system in reliance on consistent application of
-that system; it is up to the author/donor to decide if he or
-she is willing to distribute software through any other
-system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is
-believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is
-restricted in certain countries either by patents or by
-copyrighted interfaces, the original copyright holder who
-places the Program under this License may add an explicit
-geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or
-among countries not thus excluded. In such case, this
-License incorporates the limitation as if written in the
-body of this License.
-
-9. The Free Software Foundation may publish revised and/or
-new versions of the General Public License from time to
-time. Such new versions will be similar in spirit to the
-present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If
-the Program specifies a version number of this License which
-applies to it and "any later version", you have the option
-of following the terms and conditions either of that version
-or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number
-of this License, you may choose any version ever published
-by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into
-other free programs whose distribution conditions are
-different, write to the author to ask for permission. For
-software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be
-guided by the two goals of preserving the free status of all
-derivatives of our free software and of promoting the
-sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS
-NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
-"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
-OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED
-TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
-WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED
-ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
-THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT
-LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
-HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the
-greatest possible use to the public, the best way to achieve
-this is to make it free software which everyone can
-redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is
-safest to attach them to the start of each source file to
-most effectively convey the exclusion of warranty; and each
-file should have at least the "copyright" line and a pointer
-to where the full notice is found.
-
- One line to give the program's name and a brief idea of
- what it does. Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General
- Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General
- Public License along with this program; if not, write to
- the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and
-paper mail.
-
-If the program is interactive, make it output a short notice
-like this when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of
- author Gnomovision comes with ABSOLUTELY NO WARRANTY;
- for details type `show w'. This is free software, and
- you are welcome to redistribute it under certain
- conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show
-the appropriate parts of the General Public License. Of
-course, the commands you use may be called something other
-than `show w' and `show c'; they could even be mouse-clicks
-or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a
-programmer) or your school, if any, to sign a "copyright
-disclaimer" for the program, if necessary. Here is a sample;
-alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in
- the program `Gnomovision' (which makes passes at
- compilers) written by James Hacker.
-
- signature of Ty Coon, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating
-your program into proprietary programs. If your program is a
-subroutine library, you may consider it more useful to
-permit linking proprietary applications with the library. If
-this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-
-Certain source files distributed by Sun Microsystems, Inc.
-are subject to the following clarification and special
-exception to the GPL, but only where Sun has expressly
-included in the particular source file's header the words
-"Sun designates this particular file as subject to the
-"Classpath" exception as provided by Sun in the LICENSE file
-that accompanied this code."
-
-Linking this library statically or dynamically with other
-modules is making a combined work based on this library.
-Thus, the terms and conditions of the GNU General Public
-License cover the whole combination.
-
-As a special exception, the copyright holders of this
-library give you permission to link this library with
-independent modules to produce an executable, regardless of
-the license terms of these independent modules, and to copy
-and distribute the resulting executable under terms of your
-choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license
-of that module. An independent module is a module which is
-not derived from or based on this library. If you modify
-this library, you may extend this exception to your version
-of the library, but you are not obligated to do so. If you
-do not wish to do so, delete this exception statement from
-your version.
diff --git a/webcommon/libs.nashorn/external/graal-js-parser-e20fe15-license.txt b/webcommon/libs.nashorn/external/graal-js-parser-e20fe15-license.txt
new file mode 100644
index 0000000..6285fbf
--- /dev/null
+++ b/webcommon/libs.nashorn/external/graal-js-parser-e20fe15-license.txt
@@ -0,0 +1,24 @@
+Name: Graal.js Parser
+Version: e20fe15
+Description: An ECMAScript 6 (ECMAScript 2015) compliant parser for JavaScript source code. Based on the parser of Graal.js (https://github.com/graalvm/graaljs).
+License: UPL
+Origin: https://github.com/JaroslavTulach/graaljs/commit/e20fe15dc14a42b5246901cefc524235e7b77505
+
+Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data (collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software each a "Larger Work" to which the Software is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create derivative works of, display, perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
+
+This license is subject to the following condition:
+
+The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must 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.
+
diff --git a/webcommon/libs.nashorn/manifest.mf b/webcommon/libs.nashorn/manifest.mf
index 27c83f9..5c937ab 100644
--- a/webcommon/libs.nashorn/manifest.mf
+++ b/webcommon/libs.nashorn/manifest.mf
@@ -2,5 +2,4 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.nashorn/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/nashorn/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
-OpenIDE-Module-Needs: com.oracle.js.parser.implementation
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/webcommon/libs.nashorn/nbproject/project.properties b/webcommon/libs.nashorn/nbproject/project.properties
index 3a3208d..4f080cb 100644
--- a/webcommon/libs.nashorn/nbproject/project.properties
+++ b/webcommon/libs.nashorn/nbproject/project.properties
@@ -18,3 +18,5 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true
+
+release.external/graal-js-parser-e20fe15.jar=modules/ext/graal-js-parser-e20fe15.jar
\ No newline at end of file
diff --git a/webcommon/libs.nashorn/nbproject/project.xml b/webcommon/libs.nashorn/nbproject/project.xml
index b962cac..901e3a8 100644
--- a/webcommon/libs.nashorn/nbproject/project.xml
+++ b/webcommon/libs.nashorn/nbproject/project.xml
@@ -29,8 +29,8 @@
<subpackages>com.oracle.js.parser</subpackages>
</public-packages>
<class-path-extension>
- <runtime-relative-path></runtime-relative-path>
- <binary-origin>external/com.oracle.js.parser-ba7a8bc42268.jar</binary-origin>
+ <runtime-relative-path>ext/graal-js-parser-e20fe15.jar</runtime-relative-path>
+ <binary-origin>external/graal-js-parser-e20fe15.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists