This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 4ba064d Update OpenJFX dependency to 13
new 71615b5 Merge pull request #1512 from matthiasblaesing/openjfx13
4ba064d is described below
commit 4ba064d14205f9092c3e032f637da1326341cfd1
Author: Matthias Bläsing <[email protected]>
AuthorDate: Tue Sep 10 19:27:30 2019 +0200
Update OpenJFX dependency to 13
OpenJFX 13 contains several bugfixes and at least one fix for a crasher bug:
https://bugs.openjdk.java.net/browse/JDK-8223377
In addition to bumping the version, this commit also exposes
the OpenJFX modules as user installable modules. This way
the end-user can easily install them, although Apache Netbeans
can't be bundled with OpenJFX (license: GPLv2-CPE).
---
.../modules/ide/ergonomics/DynamicVerifyTest.java | 34 ++++++++++++++++++++--
extra/libs.javafx.linux/external/binaries-list | 14 ++++-----
.../external/javafx-base-11-linux.jar.external | 2 --
.../external/javafx-base-13-linux.jar.external | 2 ++
.../external/javafx-controls-11-linux.jar.external | 2 --
.../external/javafx-controls-13-linux.jar.external | 2 ++
.../external/javafx-graphics-11-linux.jar.external | 2 --
.../external/javafx-graphics-13-linux.jar.external | 2 ++
...-11-license.txt => javafx-linux-13-license.txt} | 6 ++--
.../external/javafx-media-11-linux.jar.external | 2 --
.../external/javafx-media-13-linux.jar.external | 2 ++
.../external/javafx-swing-11-linux.jar.external | 2 --
.../external/javafx-swing-13-linux.jar.external | 2 ++
.../external/javafx-web-11-linux.jar.external | 2 --
.../external/javafx-web-13-linux.jar.external | 2 ++
extra/libs.javafx.linux/manifest.mf | 3 +-
.../libs.javafx.linux/nbproject/project.properties | 24 +++++++--------
extra/libs.javafx.linux/nbproject/project.xml | 24 +++++++--------
extra/libs.javafx.macosx/external/binaries-list | 14 ++++-----
.../external/javafx-base-11-mac.jar.external | 2 --
.../external/javafx-base-13-mac.jar.external | 2 ++
.../external/javafx-controls-11-mac.jar.external | 2 --
.../external/javafx-controls-13-mac.jar.external | 2 ++
.../external/javafx-graphics-11-mac.jar.external | 2 --
.../external/javafx-graphics-13-mac.jar.external | 2 ++
...ac-11-license.txt => javafx-mac-13-license.txt} | 6 ++--
.../external/javafx-media-11-mac.jar.external | 2 --
.../external/javafx-media-13-mac.jar.external | 2 ++
.../external/javafx-swing-11-mac.jar.external | 2 --
.../external/javafx-swing-13-mac.jar.external | 2 ++
.../external/javafx-web-11-mac.jar.external | 2 --
.../external/javafx-web-13-mac.jar.external | 2 ++
extra/libs.javafx.macosx/manifest.mf | 3 +-
.../nbproject/project.properties | 24 +++++++--------
extra/libs.javafx.macosx/nbproject/project.xml | 24 +++++++--------
extra/libs.javafx.win/external/binaries-list | 14 ++++-----
.../external/javafx-base-11-win.jar.external | 2 --
.../external/javafx-base-13-win.jar.external | 2 ++
.../external/javafx-controls-11-win.jar.external | 2 --
.../external/javafx-controls-13-win.jar.external | 2 ++
.../external/javafx-graphics-11-win.jar.external | 2 --
.../external/javafx-graphics-13-win.jar.external | 2 ++
.../external/javafx-media-11-win.jar.external | 2 --
.../external/javafx-media-13-win.jar.external | 2 ++
.../external/javafx-swing-11-win.jar.external | 2 --
.../external/javafx-swing-13-win.jar.external | 2 ++
.../external/javafx-web-11-win.jar.external | 2 --
.../external/javafx-web-13-win.jar.external | 2 ++
...in-11-license.txt => javafx-win-13-license.txt} | 6 ++--
extra/libs.javafx.win/manifest.mf | 3 +-
extra/libs.javafx.win/nbproject/project.properties | 24 +++++++--------
extra/libs.javafx.win/nbproject/project.xml | 24 +++++++--------
52 files changed, 172 insertions(+), 147 deletions(-)
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 3c391e7..8c1c196 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
@@ -20,16 +20,20 @@
package org.netbeans.modules.ide.ergonomics;
import java.lang.reflect.Method;
+import java.util.Arrays;
import java.util.Map;
+import java.util.Set;
import junit.framework.Test;
import org.netbeans.junit.NbModuleSuite;
import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.NbTestSuite;
+import org.netbeans.modules.autoupdate.services.Trampoline;
+import org.netbeans.modules.autoupdate.updateprovider.FeatureItem;
+import org.netbeans.modules.autoupdate.updateprovider.UpdateItemImpl;
import org.netbeans.modules.ide.ergonomics.fod.FeatureManager;
import org.netbeans.modules.ide.ergonomics.fod.FoDUpdateUnitProvider;
import org.netbeans.spi.autoupdate.UpdateItem;
import org.netbeans.spi.project.ProjectFactory;
-import org.openide.modules.ModuleInfo;
import org.openide.util.Lookup;
/**
@@ -101,11 +105,35 @@ public class DynamicVerifyTest extends NbTestCase {
FoDUpdateUnitProvider instance = new FoDUpdateUnitProvider();
Map<String, UpdateItem> items = instance.getUpdateItems();
- assertNull("No user installed modules should be in standard build. If
this happens,\n" +
+ UpdateItem updateItem = items.get("fod.user.installed");
+ if(updateItem == null) {
+ return; // The best case
+ }
+ UpdateItemImpl updateItemImpl = Trampoline.SPI.impl(updateItem);
+ assertTrue("Unexpected UpdateItemImpl: " +
updateItemImpl.getClass().getName(), updateItemImpl instanceof FeatureItem);
+ FeatureItem featureItem = (FeatureItem) updateItemImpl;
+
+ Set<String> moduleNames = featureItem.getModuleCodeNames();
+
+ // OpenJFX can't be distributed with netbeans as GPL2-CP is not
+ // whitelisted by Apache legal. To make it easier update items with
+ // only references to maven central are provided, that make it easy
+ // for the end user to install the necessary dependencies
+ //
+ // This results in these modules to be reported as user installable
+ // from a base installation:
+ moduleNames.removeAll(Arrays.asList(
+ "org.netbeans.libs.javafx.linux",
+ "org.netbeans.libs.javafx.macosx",
+ "org.netbeans.libs.javafx.win"));
+
+ System.out.println(featureItem.getModuleCodeNames());
+ assertTrue(
+ "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"; +
"then you probably added new module and did not categorize it
properly,\n" +
"or you have additional modules (not part of regular build) " +
- "in your installation.", items.get("fod.user.installed"));
+ "in your installation. Found: " + moduleNames,
moduleNames.isEmpty());
}
public void testGetAllProjectFactories() throws Exception {
diff --git a/extra/libs.javafx.linux/external/binaries-list
b/extra/libs.javafx.linux/external/binaries-list
index 4931c8b..cd8f450 100644
--- a/extra/libs.javafx.linux/external/binaries-list
+++ b/extra/libs.javafx.linux/external/binaries-list
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-F8D1CED6047B010F1E3BB92DC060862179CE5897 org.openjfx:javafx-base:11:linux
-794488E3B1F4635D9A1B842BDC872A5EB8FD54CA org.openjfx:javafx-controls:11:linux
-4AB9EDD8D481A420044C473FDB5718CCDD35C836 org.openjfx:javafx-graphics:11:linux
-F65E90798210A9FF1CAD3E7686AF8C1DB138477F org.openjfx:javafx-media:11:linux
-5F50385BC156B2E3BD478F9FDED919F9D8AE8801 org.openjfx:javafx-web:11:linux
-86E2C4FEB81F5147BBB5E662B0892A61535A7472 org.openjfx:javafx-swing:11:linux
-
-
+828B1E1A35104BB0F26A347C2716D553CA4CF4D2 org.openjfx:javafx-base:13:linux
+BCEDF8EB6E11C2A7908B3126004D41274F6334F3 org.openjfx:javafx-controls:13:linux
+D853D12684F60037DFEEA1A47E61396E0FEBFDFD org.openjfx:javafx-graphics:13:linux
+D3626EF7290012A1E55A32532977ED78EDC02548 org.openjfx:javafx-media:13:linux
+B62DE9D7C7F32656A8E23D674C522BCB838F5165 org.openjfx:javafx-web:13:linux
+6FD1A7229849D3B2B6B6E44E29D263383D39FF10 org.openjfx:javafx-swing:13:linux
\ No newline at end of file
diff --git a/extra/libs.javafx.linux/external/javafx-base-11-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-base-11-linux.jar.external
deleted file mode 100644
index 09566c0..0000000
--- a/extra/libs.javafx.linux/external/javafx-base-11-linux.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1981012727
-URL: m2:/org.openjfx:javafx-base:11:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-base-13-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-base-13-linux.jar.external
new file mode 100644
index 0000000..0590fc6
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-base-13-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 2492020953
+URL: m2:/org.openjfx:javafx-base:13:jar:linux
diff --git
a/extra/libs.javafx.linux/external/javafx-controls-11-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-controls-11-linux.jar.external
deleted file mode 100644
index a1aed93..0000000
--- a/extra/libs.javafx.linux/external/javafx-controls-11-linux.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1480075818
-URL: m2:/org.openjfx:javafx-controls:11:jar:linux
diff --git
a/extra/libs.javafx.linux/external/javafx-controls-13-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-controls-13-linux.jar.external
new file mode 100644
index 0000000..752a89e
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-controls-13-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1135077984
+URL: m2:/org.openjfx:javafx-controls:13:jar:linux
diff --git
a/extra/libs.javafx.linux/external/javafx-graphics-11-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-graphics-11-linux.jar.external
deleted file mode 100644
index aae93c7..0000000
--- a/extra/libs.javafx.linux/external/javafx-graphics-11-linux.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1795026346
-URL: m2:/org.openjfx:javafx-graphics:11:jar:linux
diff --git
a/extra/libs.javafx.linux/external/javafx-graphics-13-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-graphics-13-linux.jar.external
new file mode 100644
index 0000000..a0c77ca
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-graphics-13-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 336589674
+URL: m2:/org.openjfx:javafx-graphics:13:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-linux-11-license.txt
b/extra/libs.javafx.linux/external/javafx-linux-13-license.txt
similarity index 98%
rename from extra/libs.javafx.linux/external/javafx-linux-11-license.txt
rename to extra/libs.javafx.linux/external/javafx-linux-13-license.txt
index a059d6b..6e8b796 100644
--- a/extra/libs.javafx.linux/external/javafx-linux-11-license.txt
+++ b/extra/libs.javafx.linux/external/javafx-linux-13-license.txt
@@ -1,10 +1,10 @@
Name: JavaFX
Description: JavaFX API and Implementation
-Version: 11
+Version: 13
License: GPL-2-CP
Origin: https://github.com/javafxports/openjdk-jfx/
-Source:
https://github.com/javafxports/openjdk-jfx/blob/2b92eb2cd7d5676411276c6734369cc19dff8c57/LICENSE
-Files: javafx-base-11-linux.jar, javafx-controls-11-linux.jar,
javafx-graphics-11-linux.jar, javafx-media-11-linux.jar,
javafx-swing-11-linux.jar, javafx-web-11-linux.jar
+Source:
https://github.com/javafxports/openjdk-jfx/commit/4d761fef36644d007c595fdc21f3d36b9709a672
+Files: javafx-base-13-linux.jar, javafx-controls-13-linux.jar,
javafx-graphics-13-linux.jar, javafx-media-13-linux.jar,
javafx-swing-13-linux.jar, javafx-web-13-linux.jar
Type: compile-time,optional
Comment: Used at compile. Possibly downloaded later.
diff --git
a/extra/libs.javafx.linux/external/javafx-media-11-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-media-11-linux.jar.external
deleted file mode 100644
index bc3ef40..0000000
--- a/extra/libs.javafx.linux/external/javafx-media-11-linux.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 4234379255
-URL: m2:/org.openjfx:javafx-media:11:jar:linux
\ No newline at end of file
diff --git
a/extra/libs.javafx.linux/external/javafx-media-13-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-media-13-linux.jar.external
new file mode 100644
index 0000000..41e87bf
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-media-13-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1287643879
+URL: m2:/org.openjfx:javafx-media:13:jar:linux
\ No newline at end of file
diff --git
a/extra/libs.javafx.linux/external/javafx-swing-11-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-swing-11-linux.jar.external
deleted file mode 100644
index 7f328e3..0000000
--- a/extra/libs.javafx.linux/external/javafx-swing-11-linux.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1450029661
-URL: m2:/org.openjfx:javafx-swing:11:jar:linux
diff --git
a/extra/libs.javafx.linux/external/javafx-swing-13-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-swing-13-linux.jar.external
new file mode 100644
index 0000000..802403b
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-swing-13-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 2544041311
+URL: m2:/org.openjfx:javafx-swing:13:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-web-11-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-web-11-linux.jar.external
deleted file mode 100644
index 4c8cc82..0000000
--- a/extra/libs.javafx.linux/external/javafx-web-11-linux.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 227437070
-URL: m2:/org.openjfx:javafx-web:11:jar:linux
\ No newline at end of file
diff --git a/extra/libs.javafx.linux/external/javafx-web-13-linux.jar.external
b/extra/libs.javafx.linux/external/javafx-web-13-linux.jar.external
new file mode 100644
index 0000000..a4bf1ba
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-web-13-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1028977454
+URL: m2:/org.openjfx:javafx-web:13:jar:linux
\ No newline at end of file
diff --git a/extra/libs.javafx.linux/manifest.mf
b/extra/libs.javafx.linux/manifest.mf
index 763e7b9..63436f2 100644
--- a/extra/libs.javafx.linux/manifest.mf
+++ b/extra/libs.javafx.linux/manifest.mf
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.javafx.linux
OpenIDE-Module-Localizing-Bundle:
org/netbeans/libs/javafx/linux/Bundle.properties
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
-OpenIDE-Module-Specification-Version: 11.2
+OpenIDE-Module-Specification-Version: 13.1
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Needs: org.openide.modules.os.Linux
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.linux/nbproject/project.properties
b/extra/libs.javafx.linux/nbproject/project.properties
index 2e207a1..33ffdbd 100644
--- a/extra/libs.javafx.linux/nbproject/project.properties
+++ b/extra/libs.javafx.linux/nbproject/project.properties
@@ -20,17 +20,17 @@ javac.target=1.7
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true
-release.external/javafx-base-11-linux.jar=modules/ext/javafx-base-11-linux.jar
-release.external/javafx-base-11-linux.jar.external=modules/ext/javafx-base-11-linux.jar.external
-release.external/javafx-controls-11-linux.jar=modules/ext/javafx-controls-11-linux.jar
-release.external/javafx-controls-11-linux.jar.external=modules/ext/javafx-controls-11-linux.jar.external
-release.external/javafx-graphics-11-linux.jar=modules/ext/javafx-graphics-11-linux.jar
-release.external/javafx-graphics-11-linux.jar.external=modules/ext/javafx-graphics-11-linux.jar.external
-release.external/javafx-media-11-linux.jar=modules/ext/javafx-media-11-linux.jar
-release.external/javafx-media-11-linux.jar.external=modules/ext/javafx-media-11-linux.jar.external
-release.external/javafx-swing-11-linux.jar=modules/ext/javafx-swing-11-linux.jar
-release.external/javafx-swing-11-linux.jar.external=modules/ext/javafx-swing-11-linux.jar.external
-release.external/javafx-web-11-linux.jar=modules/ext/javafx-web-11-linux.jar
-release.external/javafx-web-11-linux.jar.external=modules/ext/javafx-web-11-linux.jar.external
+release.external/javafx-base-13-linux.jar=modules/ext/javafx-base-13-linux.jar
+release.external/javafx-base-13-linux.jar.external=modules/ext/javafx-base-13-linux.jar.external
+release.external/javafx-controls-13-linux.jar=modules/ext/javafx-controls-13-linux.jar
+release.external/javafx-controls-13-linux.jar.external=modules/ext/javafx-controls-13-linux.jar.external
+release.external/javafx-graphics-13-linux.jar=modules/ext/javafx-graphics-13-linux.jar
+release.external/javafx-graphics-13-linux.jar.external=modules/ext/javafx-graphics-13-linux.jar.external
+release.external/javafx-media-13-linux.jar=modules/ext/javafx-media-13-linux.jar
+release.external/javafx-media-13-linux.jar.external=modules/ext/javafx-media-13-linux.jar.external
+release.external/javafx-swing-13-linux.jar=modules/ext/javafx-swing-13-linux.jar
+release.external/javafx-swing-13-linux.jar.external=modules/ext/javafx-swing-13-linux.jar.external
+release.external/javafx-web-13-linux.jar=modules/ext/javafx-web-13-linux.jar
+release.external/javafx-web-13-linux.jar.external=modules/ext/javafx-web-13-linux.jar.external
license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
diff --git a/extra/libs.javafx.linux/nbproject/project.xml
b/extra/libs.javafx.linux/nbproject/project.xml
index 47ae566..849ea24 100644
--- a/extra/libs.javafx.linux/nbproject/project.xml
+++ b/extra/libs.javafx.linux/nbproject/project.xml
@@ -44,28 +44,28 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-base-11-linux.jar</runtime-relative-path>
-
<binary-origin>external/javafx-base-11-linux.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-base-13-linux.jar</runtime-relative-path>
+
<binary-origin>external/javafx-base-13-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-controls-11-linux.jar</runtime-relative-path>
-
<binary-origin>external/javafx-controls-11-linux.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-controls-13-linux.jar</runtime-relative-path>
+
<binary-origin>external/javafx-controls-13-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-graphics-11-linux.jar</runtime-relative-path>
-
<binary-origin>external/javafx-graphics-11-linux.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-graphics-13-linux.jar</runtime-relative-path>
+
<binary-origin>external/javafx-graphics-13-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-media-11-linux.jar</runtime-relative-path>
-
<binary-origin>external/javafx-media-11-linux.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-media-13-linux.jar</runtime-relative-path>
+
<binary-origin>external/javafx-media-13-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-swing-11-linux.jar</runtime-relative-path>
-
<binary-origin>external/javafx-swing-11-linux.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-swing-13-linux.jar</runtime-relative-path>
+
<binary-origin>external/javafx-swing-13-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-web-11-linux.jar</runtime-relative-path>
- <binary-origin>external/javafx-web-11-linux.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-web-13-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-web-13-linux.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/extra/libs.javafx.macosx/external/binaries-list
b/extra/libs.javafx.macosx/external/binaries-list
index cbf9aae..711ffde 100644
--- a/extra/libs.javafx.macosx/external/binaries-list
+++ b/extra/libs.javafx.macosx/external/binaries-list
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-4B060DAD0AFFD866DF9D959E064FAA8A1A2F4AF0 org.openjfx:javafx-base:11:mac
-E3A24A14E8732ABC6DC173F15872DC63E2A32E16 org.openjfx:javafx-controls:11:mac
-0AF47A6D3668D3CE1C61E1FE13C44471B6F8D469 org.openjfx:javafx-graphics:11:mac
-96340B87188E18FAD90BA9673C45FBB942E8A11A org.openjfx:javafx-media:11:mac
-85122D46916C3ECBCB1202C7509C4AEC972EA10B org.openjfx:javafx-web:11:mac
-6FD6F4E3C5F59FA30CA61204877101ED978005AA org.openjfx:javafx-swing:11:mac
-
-
+9F96E954CC0488AC854D5BEAF2B37A106B6CBFC2 org.openjfx:javafx-base:13:mac
+778A9F735B379E97833D6B5ED56D6744746F8007 org.openjfx:javafx-controls:13:mac
+D6B0CDDB2D9F5C46CF78365B3683B147981321E0 org.openjfx:javafx-graphics:13:mac
+1737CEB25BBFDE2EBC701F3EF9D2709D00EA6957 org.openjfx:javafx-media:13:mac
+7E9DB22A36E139D9BFF15C36B748693C28B03DDB org.openjfx:javafx-web:13:mac
+E1DB8D4E88E9B4AF47E7960BE0A2F1266C8D2744 org.openjfx:javafx-swing:13:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/external/javafx-base-11-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-base-11-mac.jar.external
deleted file mode 100644
index 8bdd7a9..0000000
--- a/extra/libs.javafx.macosx/external/javafx-base-11-mac.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1709767977
-URL: m2:/org.openjfx:javafx-base:11:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-base-13-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-base-13-mac.jar.external
new file mode 100644
index 0000000..4243df1
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-base-13-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 2557569889
+URL: m2:/org.openjfx:javafx-base:13:jar:mac
diff --git
a/extra/libs.javafx.macosx/external/javafx-controls-11-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-controls-11-mac.jar.external
deleted file mode 100644
index f6a363d..0000000
--- a/extra/libs.javafx.macosx/external/javafx-controls-11-mac.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 2491711113
-URL: m2:/org.openjfx:javafx-controls:11:jar:mac
diff --git
a/extra/libs.javafx.macosx/external/javafx-controls-13-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-controls-13-mac.jar.external
new file mode 100644
index 0000000..a89579f
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-controls-13-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 1838405604
+URL: m2:/org.openjfx:javafx-controls:13:jar:mac
diff --git
a/extra/libs.javafx.macosx/external/javafx-graphics-11-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-graphics-11-mac.jar.external
deleted file mode 100644
index c40cdce..0000000
--- a/extra/libs.javafx.macosx/external/javafx-graphics-11-mac.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 3503809833
-URL: m2:/org.openjfx:javafx-graphics:11:jar:mac
diff --git
a/extra/libs.javafx.macosx/external/javafx-graphics-13-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-graphics-13-mac.jar.external
new file mode 100644
index 0000000..14d8a85
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-graphics-13-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 1786347828
+URL: m2:/org.openjfx:javafx-graphics:13:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-mac-11-license.txt
b/extra/libs.javafx.macosx/external/javafx-mac-13-license.txt
similarity index 98%
rename from extra/libs.javafx.macosx/external/javafx-mac-11-license.txt
rename to extra/libs.javafx.macosx/external/javafx-mac-13-license.txt
index 158fa3e..f3ae009 100644
--- a/extra/libs.javafx.macosx/external/javafx-mac-11-license.txt
+++ b/extra/libs.javafx.macosx/external/javafx-mac-13-license.txt
@@ -1,10 +1,10 @@
Name: JavaFX
Description: JavaFX API and Implementation
-Version: 11
+Version: 13
License: GPL-2-CP
Origin: https://github.com/javafxports/openjdk-jfx/
-Source:
https://github.com/javafxports/openjdk-jfx/blob/2b92eb2cd7d5676411276c6734369cc19dff8c57/LICENSE
-Files: javafx-base-11-mac.jar, javafx-controls-11-mac.jar,
javafx-graphics-11-mac.jar, javafx-media-11-mac.jar, javafx-swing-11-mac.jar,
javafx-web-11-mac.jar
+Source:
https://github.com/javafxports/openjdk-jfx/commit/4d761fef36644d007c595fdc21f3d36b9709a672
+Files: javafx-base-13-mac.jar, javafx-controls-13-mac.jar,
javafx-graphics-13-mac.jar, javafx-media-13-mac.jar, javafx-swing-13-mac.jar,
javafx-web-13-mac.jar
Type: compile-time,optional
Comment: Used at compile. Possibly downloaded later.
diff --git a/extra/libs.javafx.macosx/external/javafx-media-11-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-media-11-mac.jar.external
deleted file mode 100644
index 3332207..0000000
--- a/extra/libs.javafx.macosx/external/javafx-media-11-mac.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1205665924
-URL: m2:/org.openjfx:javafx-media:11:jar:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/external/javafx-media-13-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-media-13-mac.jar.external
new file mode 100644
index 0000000..7ff49c6
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-media-13-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 1123366205
+URL: m2:/org.openjfx:javafx-media:13:jar:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/external/javafx-swing-11-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-swing-11-mac.jar.external
deleted file mode 100644
index 09f4842..0000000
--- a/extra/libs.javafx.macosx/external/javafx-swing-11-mac.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 712623308
-URL: m2:/org.openjfx:javafx-swing:11:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-swing-13-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-swing-13-mac.jar.external
new file mode 100644
index 0000000..d348928
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-swing-13-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 4273544274
+URL: m2:/org.openjfx:javafx-swing:13:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-web-11-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-web-11-mac.jar.external
deleted file mode 100644
index 96182f5..0000000
--- a/extra/libs.javafx.macosx/external/javafx-web-11-mac.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 1328872996
-URL: m2:/org.openjfx:javafx-web:11:jar:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/external/javafx-web-13-mac.jar.external
b/extra/libs.javafx.macosx/external/javafx-web-13-mac.jar.external
new file mode 100644
index 0000000..a5b193f
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-web-13-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 115429231
+URL: m2:/org.openjfx:javafx-web:13:jar:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/manifest.mf
b/extra/libs.javafx.macosx/manifest.mf
index ee5b68e..20eaf5b 100644
--- a/extra/libs.javafx.macosx/manifest.mf
+++ b/extra/libs.javafx.macosx/manifest.mf
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.javafx.macosx
OpenIDE-Module-Localizing-Bundle:
org/netbeans/libs/javafx/macosx/Bundle.properties
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
-OpenIDE-Module-Specification-Version: 11.2
+OpenIDE-Module-Specification-Version: 13.1
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Needs: org.openide.modules.os.MacOSX
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.macosx/nbproject/project.properties
b/extra/libs.javafx.macosx/nbproject/project.properties
index b6cf0d2..d6899f8 100644
--- a/extra/libs.javafx.macosx/nbproject/project.properties
+++ b/extra/libs.javafx.macosx/nbproject/project.properties
@@ -20,17 +20,17 @@ javac.target=1.7
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true
-release.external/javafx-base-11-mac.jar=modules/ext/javafx-base-11-mac.jar
-release.external/javafx-base-11-mac.jar.external=modules/ext/javafx-base-11-mac.jar.external
-release.external/javafx-controls-11-mac.jar=modules/ext/javafx-controls-11-mac.jar
-release.external/javafx-controls-11-mac.jar.external=modules/ext/javafx-controls-11-mac.jar.external
-release.external/javafx-graphics-11-mac.jar=modules/ext/javafx-graphics-11-mac.jar
-release.external/javafx-graphics-11-mac.jar.external=modules/ext/javafx-graphics-11-mac.jar.external
-release.external/javafx-media-11-mac.jar=modules/ext/javafx-media-11-mac.jar
-release.external/javafx-media-11-mac.jar.external=modules/ext/javafx-media-11-mac.jar.external
-release.external/javafx-swing-11-mac.jar=modules/ext/javafx-swing-11-mac.jar
-release.external/javafx-swing-11-mac.jar.external=modules/ext/javafx-swing-11-mac.jar.external
-release.external/javafx-web-11-mac.jar=modules/ext/javafx-web-11-mac.jar
-release.external/javafx-web-11-mac.jar.external=modules/ext/javafx-web-11-mac.jar.external
+release.external/javafx-base-13-mac.jar=modules/ext/javafx-base-13-mac.jar
+release.external/javafx-base-13-mac.jar.external=modules/ext/javafx-base-13-mac.jar.external
+release.external/javafx-controls-13-mac.jar=modules/ext/javafx-controls-13-mac.jar
+release.external/javafx-controls-13-mac.jar.external=modules/ext/javafx-controls-13-mac.jar.external
+release.external/javafx-graphics-13-mac.jar=modules/ext/javafx-graphics-13-mac.jar
+release.external/javafx-graphics-13-mac.jar.external=modules/ext/javafx-graphics-13-mac.jar.external
+release.external/javafx-media-13-mac.jar=modules/ext/javafx-media-13-mac.jar
+release.external/javafx-media-13-mac.jar.external=modules/ext/javafx-media-13-mac.jar.external
+release.external/javafx-swing-13-mac.jar=modules/ext/javafx-swing-13-mac.jar
+release.external/javafx-swing-13-mac.jar.external=modules/ext/javafx-swing-13-mac.jar.external
+release.external/javafx-web-13-mac.jar=modules/ext/javafx-web-13-mac.jar
+release.external/javafx-web-13-mac.jar.external=modules/ext/javafx-web-13-mac.jar.external
license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
diff --git a/extra/libs.javafx.macosx/nbproject/project.xml
b/extra/libs.javafx.macosx/nbproject/project.xml
index a2f7b90..4bdd9c0 100644
--- a/extra/libs.javafx.macosx/nbproject/project.xml
+++ b/extra/libs.javafx.macosx/nbproject/project.xml
@@ -44,28 +44,28 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-base-11-mac.jar</runtime-relative-path>
- <binary-origin>external/javafx-base-11-mac.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-base-13-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-base-13-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-controls-11-mac.jar</runtime-relative-path>
-
<binary-origin>external/javafx-controls-11-mac.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-controls-13-mac.jar</runtime-relative-path>
+
<binary-origin>external/javafx-controls-13-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-graphics-11-mac.jar</runtime-relative-path>
-
<binary-origin>external/javafx-graphics-11-mac.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-graphics-13-mac.jar</runtime-relative-path>
+
<binary-origin>external/javafx-graphics-13-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-media-11-mac.jar</runtime-relative-path>
- <binary-origin>external/javafx-media-11-mac.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-media-13-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-media-13-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-swing-11-mac.jar</runtime-relative-path>
- <binary-origin>external/javafx-swing-11-mac.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-swing-13-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-swing-13-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-web-11-mac.jar</runtime-relative-path>
- <binary-origin>external/javafx-web-11-mac.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-web-13-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-web-13-mac.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/extra/libs.javafx.win/external/binaries-list
b/extra/libs.javafx.win/external/binaries-list
index 57f2cda..6089eb3 100644
--- a/extra/libs.javafx.win/external/binaries-list
+++ b/extra/libs.javafx.win/external/binaries-list
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-AD3A4ACFAA28B484D30C40C1F009445CC3F6E68B org.openjfx:javafx-base:11:win
-AF8D24DE44E16A19AE959028EB23A48C145FB682 org.openjfx:javafx-controls:11:win
-9345C7EA43DBCC73A62ECA5332717B4CE617E6C6 org.openjfx:javafx-graphics:11:win
-B7A33F3FF0CAD17AF71E883C0921BC6819CAD9C8 org.openjfx:javafx-media:11:win
-5C8A3B6CACDE832437DFF8E21A82749B5F66C1CF org.openjfx:javafx-web:11:win
-6D34FC92FBEA9AB95966380C29B06672A94F4A3E org.openjfx:javafx-swing:11:win
-
-
+6386F02A2B71D8B503C6CA3CD2D2DCB382CE86B4 org.openjfx:javafx-base:13:win
+7524FD4AB57DE51637ADB0E99F0220A1AE0AE4DD org.openjfx:javafx-controls:13:win
+BBCBC616702A086567585183EFCB0AB8EB22A66B org.openjfx:javafx-graphics:13:win
+FBDD1014600563E9F8950F8BA3D52264966E5C7B org.openjfx:javafx-media:13:win
+77019F6896CC76B421289C7666F692F758610E32 org.openjfx:javafx-web:13:win
+A8531F7B83595165B8307A40B2854B72D001CCD5 org.openjfx:javafx-swing:13:win
\ No newline at end of file
diff --git a/extra/libs.javafx.win/external/javafx-base-11-win.jar.external
b/extra/libs.javafx.win/external/javafx-base-11-win.jar.external
deleted file mode 100644
index b4ce50c..0000000
--- a/extra/libs.javafx.win/external/javafx-base-11-win.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC:2160969281
-URL: m2:/org.openjfx:javafx-base:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-base-13-win.jar.external
b/extra/libs.javafx.win/external/javafx-base-13-win.jar.external
new file mode 100644
index 0000000..66361c2
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-base-13-win.jar.external
@@ -0,0 +1,2 @@
+CRC:414360450
+URL: m2:/org.openjfx:javafx-base:13:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-controls-11-win.jar.external
b/extra/libs.javafx.win/external/javafx-controls-11-win.jar.external
deleted file mode 100644
index 00bbc17..0000000
--- a/extra/libs.javafx.win/external/javafx-controls-11-win.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC:1720323982
-URL: m2:/org.openjfx:javafx-controls:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-controls-13-win.jar.external
b/extra/libs.javafx.win/external/javafx-controls-13-win.jar.external
new file mode 100644
index 0000000..6e70953
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-controls-13-win.jar.external
@@ -0,0 +1,2 @@
+CRC:3243990194
+URL: m2:/org.openjfx:javafx-controls:13:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-graphics-11-win.jar.external
b/extra/libs.javafx.win/external/javafx-graphics-11-win.jar.external
deleted file mode 100644
index ea575b8..0000000
--- a/extra/libs.javafx.win/external/javafx-graphics-11-win.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 2670942550
-URL: m2:/org.openjfx:javafx-graphics:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-graphics-13-win.jar.external
b/extra/libs.javafx.win/external/javafx-graphics-13-win.jar.external
new file mode 100644
index 0000000..a88bbee
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-graphics-13-win.jar.external
@@ -0,0 +1,2 @@
+CRC: 651621548
+URL: m2:/org.openjfx:javafx-graphics:13:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-media-11-win.jar.external
b/extra/libs.javafx.win/external/javafx-media-11-win.jar.external
deleted file mode 100644
index f8e4abc..0000000
--- a/extra/libs.javafx.win/external/javafx-media-11-win.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 2529014611
-URL: m2:/org.openjfx:javafx-media:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-media-13-win.jar.external
b/extra/libs.javafx.win/external/javafx-media-13-win.jar.external
new file mode 100644
index 0000000..cfeebd6
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-media-13-win.jar.external
@@ -0,0 +1,2 @@
+CRC: 2392976199
+URL: m2:/org.openjfx:javafx-media:13:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-swing-11-win.jar.external
b/extra/libs.javafx.win/external/javafx-swing-11-win.jar.external
deleted file mode 100644
index 031e09b..0000000
--- a/extra/libs.javafx.win/external/javafx-swing-11-win.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC:3324970534
-URL: m2:/org.openjfx:javafx-swing:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-swing-13-win.jar.external
b/extra/libs.javafx.win/external/javafx-swing-13-win.jar.external
new file mode 100644
index 0000000..2ccbb3f
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-swing-13-win.jar.external
@@ -0,0 +1,2 @@
+CRC:3322528332
+URL: m2:/org.openjfx:javafx-swing:13:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-web-11-win.jar.external
b/extra/libs.javafx.win/external/javafx-web-11-win.jar.external
deleted file mode 100644
index 9523f77..0000000
--- a/extra/libs.javafx.win/external/javafx-web-11-win.jar.external
+++ /dev/null
@@ -1,2 +0,0 @@
-CRC: 2985225211
-URL: m2:/org.openjfx:javafx-web:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-web-13-win.jar.external
b/extra/libs.javafx.win/external/javafx-web-13-win.jar.external
new file mode 100644
index 0000000..3542f84
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-web-13-win.jar.external
@@ -0,0 +1,2 @@
+CRC: 1813955042
+URL: m2:/org.openjfx:javafx-web:13:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-win-11-license.txt
b/extra/libs.javafx.win/external/javafx-win-13-license.txt
similarity index 98%
rename from extra/libs.javafx.win/external/javafx-win-11-license.txt
rename to extra/libs.javafx.win/external/javafx-win-13-license.txt
index 1864be8..d5030e1 100644
--- a/extra/libs.javafx.win/external/javafx-win-11-license.txt
+++ b/extra/libs.javafx.win/external/javafx-win-13-license.txt
@@ -1,10 +1,10 @@
Name: JavaFX
Description: JavaFX API and Implementation
-Version: 11
+Version: 13
License: GPL-2-CP
Origin: https://github.com/javafxports/openjdk-jfx/
-Source:
https://github.com/javafxports/openjdk-jfx/blob/2b92eb2cd7d5676411276c6734369cc19dff8c57/LICENSE
-Files: javafx-base-11-win.jar, javafx-controls-11-win.jar,
javafx-graphics-11-win.jar, javafx-media-11-win.jar, javafx-swing-11-win.jar,
javafx-web-11-win.jar
+Source:
https://github.com/javafxports/openjdk-jfx/commit/4d761fef36644d007c595fdc21f3d36b9709a672
+Files: javafx-base-13-win.jar, javafx-controls-13-win.jar,
javafx-graphics-13-win.jar, javafx-media-13-win.jar, javafx-swing-13-win.jar,
javafx-web-13-win.jar
Type: compile-time,optional
Comment: Used at compile. Possibly downloaded later.
diff --git a/extra/libs.javafx.win/manifest.mf
b/extra/libs.javafx.win/manifest.mf
index 19a2faa..2eb9e87 100644
--- a/extra/libs.javafx.win/manifest.mf
+++ b/extra/libs.javafx.win/manifest.mf
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.javafx.win
OpenIDE-Module-Localizing-Bundle:
org/netbeans/libs/javafx/win/Bundle.properties
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
-OpenIDE-Module-Specification-Version: 11.2
+OpenIDE-Module-Specification-Version: 13.1
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Needs: org.openide.modules.os.Windows
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.win/nbproject/project.properties
b/extra/libs.javafx.win/nbproject/project.properties
index 205dff8..a64c36f 100644
--- a/extra/libs.javafx.win/nbproject/project.properties
+++ b/extra/libs.javafx.win/nbproject/project.properties
@@ -20,17 +20,17 @@ javac.target=1.7
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true
-release.external/javafx-base-11-win.jar=modules/ext/javafx-base-11-win.jar
-release.external/javafx-base-11-win.jar.external=modules/ext/javafx-base-11-win.jar.external
-release.external/javafx-controls-11-win.jar=modules/ext/javafx-controls-11-win.jar
-release.external/javafx-controls-11-win.jar.external=modules/ext/javafx-controls-11-win.jar.external
-release.external/javafx-graphics-11-win.jar=modules/ext/javafx-graphics-11-win.jar
-release.external/javafx-graphics-11-win.jar.external=modules/ext/javafx-graphics-11-win.jar.external
-release.external/javafx-media-11-win.jar=modules/ext/javafx-media-11-win.jar
-release.external/javafx-media-11-win.jar.external=modules/ext/javafx-media-11-win.jar.external
-release.external/javafx-swing-11-win.jar=modules/ext/javafx-swing-11-win.jar
-release.external/javafx-swing-11-win.jar.external=modules/ext/javafx-swing-11-win.jar.external
-release.external/javafx-web-11-win.jar=modules/ext/javafx-web-11-win.jar
-release.external/javafx-web-11-win.jar.external=modules/ext/javafx-web-11-win.jar.external
+release.external/javafx-base-13-win.jar=modules/ext/javafx-base-13-win.jar
+release.external/javafx-base-13-win.jar.external=modules/ext/javafx-base-13-win.jar.external
+release.external/javafx-controls-13-win.jar=modules/ext/javafx-controls-13-win.jar
+release.external/javafx-controls-13-win.jar.external=modules/ext/javafx-controls-13-win.jar.external
+release.external/javafx-graphics-13-win.jar=modules/ext/javafx-graphics-13-win.jar
+release.external/javafx-graphics-13-win.jar.external=modules/ext/javafx-graphics-13-win.jar.external
+release.external/javafx-media-13-win.jar=modules/ext/javafx-media-13-win.jar
+release.external/javafx-media-13-win.jar.external=modules/ext/javafx-media-13-win.jar.external
+release.external/javafx-swing-13-win.jar=modules/ext/javafx-swing-13-win.jar
+release.external/javafx-swing-13-win.jar.external=modules/ext/javafx-swing-13-win.jar.external
+release.external/javafx-web-13-win.jar=modules/ext/javafx-web-13-win.jar
+release.external/javafx-web-13-win.jar.external=modules/ext/javafx-web-13-win.jar.external
license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
diff --git a/extra/libs.javafx.win/nbproject/project.xml
b/extra/libs.javafx.win/nbproject/project.xml
index 62b8afb..9cc53ab 100644
--- a/extra/libs.javafx.win/nbproject/project.xml
+++ b/extra/libs.javafx.win/nbproject/project.xml
@@ -44,28 +44,28 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-base-11-win.jar</runtime-relative-path>
- <binary-origin>external/javafx-base-11-win.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-base-13-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-base-13-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-controls-11-win.jar</runtime-relative-path>
-
<binary-origin>external/javafx-controls-11-win.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-controls-13-win.jar</runtime-relative-path>
+
<binary-origin>external/javafx-controls-13-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-graphics-11-win.jar</runtime-relative-path>
-
<binary-origin>external/javafx-graphics-11-win.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-graphics-13-win.jar</runtime-relative-path>
+
<binary-origin>external/javafx-graphics-13-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-media-11-win.jar</runtime-relative-path>
- <binary-origin>external/javafx-media-11-win.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-media-13-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-media-13-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-swing-11-win.jar</runtime-relative-path>
- <binary-origin>external/javafx-swing-11-win.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-swing-13-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-swing-13-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/javafx-web-11-win.jar</runtime-relative-path>
- <binary-origin>external/javafx-web-11-win.jar</binary-origin>
+
<runtime-relative-path>ext/javafx-web-13-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-web-13-win.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
