netbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sde...@apache.org
Subject [incubator-netbeans] branch master updated: [NETBEANS-1074] Module Review libs.nashorn (#738)
Date Thu, 23 Aug 2018 06:27:53 GMT
This is an automated email from the ASF dual-hosted git repository.

sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 84b1d33  [NETBEANS-1074] Module Review libs.nashorn (#738)
84b1d33 is described below

commit 84b1d33a08c0147444c5a0c4178bca2abe10f02e
Author: Svatopluk Dedic <svatopluk.dedic@oracle.com>
AuthorDate: Thu Aug 23 08:27:51 2018 +0200

    [NETBEANS-1074] Module Review libs.nashorn (#738)
    
    [NETBEANS-1074] Module Review libs.nashorn
---
 libs.nashorn/external/binaries-list                    | 18 +++++++++++++++++-
 ...t => com.oracle.js.parser-ba7a8bc42268-license.txt} | 14 ++++++++------
 libs.nashorn/nbproject/project.properties              |  3 ++-
 libs.nashorn/nbproject/project.xml                     |  5 ++++-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/libs.nashorn/external/binaries-list b/libs.nashorn/external/binaries-list
index 529bd58..b9b7a8f 100644
--- a/libs.nashorn/external/binaries-list
+++ b/libs.nashorn/external/binaries-list
@@ -1 +1,17 @@
-7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser.jar
+# 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.
+7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser-ba7a8bc42268.jar
diff --git a/libs.nashorn/external/com.oracle.js.parser-license.txt b/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt
similarity index 97%
rename from libs.nashorn/external/com.oracle.js.parser-license.txt
rename to libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt
index 8e008a3..740763e 100644
--- a/libs.nashorn/external/com.oracle.js.parser-license.txt
+++ b/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt
@@ -2,12 +2,14 @@ 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
-Source: http://hg.openjdk.java.net/graal/graal-js-parser
+Origin: http://hg.openjdk.java.net/graal/graal-js-parser
+Type: compile-time
+Comment: NetBeans JS support will be broken unless Nashorn is compatible-licensed, or a download
is provided similar to nb-javac. See NETBEANS-1159, NETBEANS-1160.
 
 The GNU General Public License (GPL)
 Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 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
@@ -405,16 +407,16 @@ Public License instead of this License.
 
 Certain source files distributed by Sun Microsystems, Inc.
 are subject to the following clarification and special
-exception to the GPL Version 2, but only where Sun has expressly
+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
+"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 Version 2 cover the whole combination.
+License cover the whole combination.
 
 As a special exception, the copyright holders of this
 library give you permission to link this library with
@@ -428,4 +430,4 @@ 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.
\ No newline at end of file
+your version.
diff --git a/libs.nashorn/nbproject/project.properties b/libs.nashorn/nbproject/project.properties
index b6f4b38..6aa6895 100644
--- a/libs.nashorn/nbproject/project.properties
+++ b/libs.nashorn/nbproject/project.properties
@@ -18,4 +18,5 @@
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 is.autoload=true
-release.external/com.oracle.js.parser.jar=modules/ext/com.oracle.js.parser.jar
+# Temporary solution, see NETBEANS-1159, NETBEANS-1160.
+release.external/com.oracle.js.parser-ba7a8bc42268.jar=modules/ext/com.oracle.js.parser.jar
diff --git a/libs.nashorn/nbproject/project.xml b/libs.nashorn/nbproject/project.xml
index 96f5923..58cac6f 100644
--- a/libs.nashorn/nbproject/project.xml
+++ b/libs.nashorn/nbproject/project.xml
@@ -28,9 +28,12 @@
             <public-packages>
                 <subpackages>com.oracle.js.parser</subpackages>
             </public-packages>
+<!--
+            Temporary solution, see NETBEANS-1159, NETBEANS-1160.
+-->
             <class-path-extension>
                 <runtime-relative-path>ext/com.oracle.js.parser.jar</runtime-relative-path>
-                <binary-origin>external/com.oracle.js.parser.jar</binary-origin>
+                <binary-origin>external/com.oracle.js.parser-ba7a8bc42268.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


Mime
View raw message