apache · geertjanw · Oct 27, 2017 · Oct 26, 2017 · Oct 26, 2017 · Oct 26, 2017
diff --git a/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
@@ -16,5 +16,4 @@
 # under the License.
 D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
 A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar
-20D826CC819A5A969CF3F7204E2E26CB6263EC43 jnlp-servlet.jar
-6FF4C411EE231AB8042C9047373F87FC64D0299D harness-launchers.zip
+6FF4C411EE231AB8042C9047373F87FC64D0299D harness-launchers-8.2.zip
diff --git a/...ss/external/harness-launchers-license.txt → ...xternal/harness-launchers-8.2-license.txt b/...ss/external/harness-launchers-license.txt → ...xternal/harness-launchers-8.2-license.txt
@@ -1,8 +1,9 @@
 Name: NetBeans Platform Applications Launchers
+Description: Windows Launchers for the NetBeans Platform Applications
 Version: 8.2
 License: CDDL-GPL-2-CP
+Source: https://netbeans.org/
 Origin: NetBeans
-Comment: Windows Launchers for the NetBeans Platform Applications
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 

diff --git a/apisupport.harness/external/jnlp-servlet-license.txt b/apisupport.harness/external/jnlp-servlet-license.txt
diff --git a/apisupport.harness/nbproject/project.properties b/apisupport.harness/nbproject/project.properties
@@ -29,11 +29,11 @@ release.../nbbuild/templates/no-testcoverage.xml=no-testcoverage.xml
 release.../nbbuild/jdk.xml=jdk.xml
 release.external/jsearch-2.0_05.jar=antlib/jsearch-2.0_05.jar
 release.external/bindex-2.2.jar=antlib/bindex-2.2.jar
-release.external/jnlp-servlet.jar=jnlp/jnlp-servlet.jar
-release.external/harness-launchers.zip!/app.exe=launchers/app.exe
-release.external/harness-launchers.zip!/app64.exe=launchers/app64.exe
-release.external/harness-launchers.zip!/pre7_app.exe=launchers/pre7_app.exe
-release.external/harness-launchers.zip!/pre7_app_w.exe=launchers/pre7_app_w.exe
+#release.external/jnlp-servlet.jar=jnlp/jnlp-servlet.jar
+release.external/harness-launchers-8.2.zip!/app.exe=launchers/app.exe
+release.external/harness-launchers-8.2.zip!/app64.exe=launchers/app64.exe
+release.external/harness-launchers-8.2.zip!/pre7_app.exe=launchers/pre7_app.exe
+release.external/harness-launchers-8.2.zip!/pre7_app_w.exe=launchers/pre7_app_w.exe
 nbm.executable.files=launchers/app.sh
 extra.module.files=\
     jnlp/jnlp-launcher.jar,\

diff --git a/applemenu/build.xml b/applemenu/build.xml
@@ -25,7 +25,7 @@
 
   <target name="build-init" depends="projectized.build-init">
         <mkdir dir="${build.dir}/desktop-classes-src" />
-        <unzip src="external/applemenu-external-desktop-classes.zip" dest="${build.dir}/desktop-classes-src"/>
+        <unzip src="external/applemenu-external-desktop-classes-8.2.zip" dest="${build.dir}/desktop-classes-src"/>
         <mkdir dir="${build.dir}/desktop-classes-classes" />
         <javac srcdir="${build.dir}/desktop-classes-src" destdir="${build.dir}/desktop-classes-classes" />
   </target>

diff --git a/...bootstrap/external/nbexec.exe-license.txt → ...-external-desktop-classes-8.2-license.txt b/...bootstrap/external/nbexec.exe-license.txt → ...-external-desktop-classes-8.2-license.txt
@@ -1,3 +1,11 @@
+Name: External Desktop Classes
+Description: Provides java.awt.desktop classes to support compilation on JDK 8.
+Version: 8.2
+License: CDDL-GPL-2-CP
+Source: file://applemenu-external-desktop-classes-8.2.zip
+Origin: NetBeans
+Type: compile-time
+
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
 1. Definitions.

diff --git a/applemenu/external/binaries-list b/applemenu/external/binaries-list
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-1D14F4B56AD34841339698565B17BBAE755B0E61 applemenu-external-desktop-classes.zip
+1D14F4B56AD34841339698565B17BBAE755B0E61 applemenu-external-desktop-classes-8.2.zip
 9A7C8D43E0ECC6ACED43970512FF42EF0717DC7C com.massisframework:orange-extensions:1.3.1
diff --git a/applemenu/external/orange-extensions-1.3.1-license.txt b/applemenu/external/orange-extensions-1.3.1-license.txt
@@ -1,6 +1,6 @@
 Name: Orange Extensions
 Version: 1.3.1
-License: BSD
+License: BSD-Masory
 Description: com.apple classes for cross-compilation.
 Origin: Yuvi Masory
 Type: compile-time
@@ -9,7 +9,7 @@ This jar was created by decompiling AppleJavaExtensions.jar (completely consiste
 with its BSD-like license), and adding the new Java 5 methods.
 
 Apple's license does not specify that their copyright notice should be included
-in modified versions (only complete, unmodified ones), so I'm putting it under 3-clause 
+in modified versions (only complete, unmodified ones), so I'm putting it under 3-clause
 BSD just to protect myself from liability.
 
 Copyright (c) 2010, Yuvi Masory

diff --git a/core.browser.webview/nbproject/project.properties b/core.browser.webview/nbproject/project.properties
@@ -18,3 +18,4 @@ javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 spec.version.base=1.16.0
 is.eager=true
+cp.extra=../libs.javafx/build/openjfx.zip
diff --git a/core.network/external/binaries-list b/core.network/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.
-22C41D62B7BD70C00603B2CAE75406414224CF9F nsProxyAutoConfig.js
+22C41D62B7BD70C00603B2CAE75406414224CF9F nsProxyAutoConfig-mozilla2.0.js
diff --git a/core.network/external/nsProxyAutoConfig-license.txt b/core.network/external/nsProxyAutoConfig-license.txt