Skip to content

Commit

Permalink
Update JavaFX to 17
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasblaesing committed Sep 23, 2021
1 parent ad9e73c commit 021ebd3
Show file tree
Hide file tree
Showing 57 changed files with 210 additions and 195 deletions.
5 changes: 5 additions & 0 deletions extra/libs.javafx.linux/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,9 @@
<project basedir="." default="build" name="extra/libs.javafx.linux">
<description>Builds, tests, and runs the project org.netbeans.libs.javafx.linux</description>
<import file="../../nbbuild/templates/projectized.xml"/>

<target name="createExternalFile">
<taskdef name="createExternalFile" classname="org.netbeans.nbbuild.extlibs.CreateExternalFile" classpath="${nbantext.jar}"/>
<createExternalFile manifest="external/binaries-list"/>
</target>
</project>
12 changes: 6 additions & 6 deletions extra/libs.javafx.linux/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.

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
476C7640C2320244D3156EDBBC19A7EDA275C1ED org.openjfx:javafx-base:17:linux
851A1896FBD8548FB3671AA689B305B2CFAD956A org.openjfx:javafx-controls:17:linux
88DC59568C14EC37EA1C42B3BA472D78B4B1030A org.openjfx:javafx-graphics:17:linux
E3BB829CE1447A37A8B0B669A446E0414E54E5C7 org.openjfx:javafx-media:17:linux
BBD71BEAF561B72F0D3EB6268D3114573B7799C3 org.openjfx:javafx-web:17:linux
8DEE489B0FAECF27568BFE64EFDC7AA01410DEFA org.openjfx:javafx-swing:17:linux

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 3314879537
URL: m2:/org.openjfx:javafx-base:17:jar:linux
MessageDigest: SHA-256 243cda86369314c34bb10be0023f3c98568235ca4ded4a59e0781dd640bc4962
MessageDigest: SHA-512 a273426ff217dbfb536e4eb8581a54b6c1a2f5e7971d46c06e61f87216c3360603184aa601475e17d170ce4c47e0324a07b14cfa44e450ea4c181c75be829404

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 4280438415
URL: m2:/org.openjfx:javafx-controls:17:jar:linux
MessageDigest: SHA-256 a5ad3ce46330fda88f8f1e3fb9ef04d644763ba0b69a95e497ae894e359dad08
MessageDigest: SHA-512 729eec003400723be4b55edaa7b74bfe8b2953a97fa86ee524bc1136010dec825da08ae846fdadbb40455e8ba592b2754d149fd94328e262243bb3ce70bc57b3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 2057874440
URL: m2:/org.openjfx:javafx-graphics:17:jar:linux
MessageDigest: SHA-256 60802717d8b04f0136e6b2cd4b9046890052566977df6f0c17f753fb4789fda6
MessageDigest: SHA-512 f482529e14504f2d730cf0a5a6d6403653bf6a69057d23a3e450027e1c5caf89913b0e3549191a6d125ffd02be71b1438685e1cde3f2f09f55955c9230dac470
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Name: JavaFX
Description: JavaFX API and Implementation
Version: 13
Version: 17
License: GPL-2-CP
Origin: https://github.com/javafxports/openjdk-jfx/
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
Origin: https://github.com/openjdk/jfx
Source: https://github.com/openjdk/jfx/commit/14b23bcf69a321c44b09e584b30f39e1fa3e6948
Files: javafx-base-17-linux.jar, javafx-controls-17-linux.jar, javafx-graphics-17-linux.jar, javafx-media-17-linux.jar, javafx-swing-17-linux.jar, javafx-web-17-linux.jar
Type: compile-time,optional
Comment: Used at compile. Possibly downloaded later.

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 3193818180
URL: m2:/org.openjfx:javafx-media:17:jar:linux
MessageDigest: SHA-256 4d83e701795a40cc07ff3cf443147ef8b6c55fdda9dc8f043ee40dce982c7b7c
MessageDigest: SHA-512 674b2c242c11c887623743841b49abf240da0b8c54fa886145fd8f422bb31e8ce69254d3d440642bbc7372723f33d10081c0724619a15ec56c4fc07653e9abf9

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 1100138927
URL: m2:/org.openjfx:javafx-swing:17:jar:linux
MessageDigest: SHA-256 ec45393341dda5193d1ec63641498f8bffc1aec6a96184a498606cc6b2144018
MessageDigest: SHA-512 c63b799f61048c033ef51e5294c57d8700a5b6bf5fb424f253f8d3c35d48325459bc34f2b7eabfa4db146f291ae68158877276fe5f3250c4e31d87ba4c27c066

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 2692122387
URL: m2:/org.openjfx:javafx-web:17:jar:linux
MessageDigest: SHA-256 bbb317435b9b6321e5a5b3b68628b0494e708e152d08099ed5ae1b41713ed595
MessageDigest: SHA-512 ebfd689e360a7a2fb1073a1116e9e51f4e3050ed180e13579b01c6ac44a384325e30d21cde5770e64ea314a3bed04a8d69aacda4456ecc3e1f7f375c94f2142d
12 changes: 6 additions & 6 deletions extra/libs.javafx.linux/licenseinfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
-->
<licenseinfo>
<fileset>
<file>external/javafx-base-13-linux.jar.external</file>
<file>external/javafx-controls-13-linux.jar.external</file>
<file>external/javafx-graphics-13-linux.jar.external</file>
<file>external/javafx-media-13-linux.jar.external</file>
<file>external/javafx-swing-13-linux.jar.external</file>
<file>external/javafx-web-13-linux.jar.external</file>
<file>external/javafx-base-17-linux.jar.external</file>
<file>external/javafx-controls-17-linux.jar.external</file>
<file>external/javafx-graphics-17-linux.jar.external</file>
<file>external/javafx-media-17-linux.jar.external</file>
<file>external/javafx-swing-17-linux.jar.external</file>
<file>external/javafx-web-17-linux.jar.external</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
Expand Down
2 changes: 1 addition & 1 deletion extra/libs.javafx.linux/manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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: 13.9
OpenIDE-Module-Specification-Version: 17.1
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Requires: org.openide.modules.os.Linux
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
24 changes: 12 additions & 12 deletions extra/libs.javafx.linux/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ javac.target=1.8
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true

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
release.external/javafx-base-17-linux.jar=modules/ext/javafx-base-17-linux.jar
release.external/javafx-base-17-linux.jar.external=modules/ext/javafx-base-17-linux.jar.external
release.external/javafx-controls-17-linux.jar=modules/ext/javafx-controls-17-linux.jar
release.external/javafx-controls-17-linux.jar.external=modules/ext/javafx-controls-17-linux.jar.external
release.external/javafx-graphics-17-linux.jar=modules/ext/javafx-graphics-17-linux.jar
release.external/javafx-graphics-17-linux.jar.external=modules/ext/javafx-graphics-17-linux.jar.external
release.external/javafx-media-17-linux.jar=modules/ext/javafx-media-17-linux.jar
release.external/javafx-media-17-linux.jar.external=modules/ext/javafx-media-17-linux.jar.external
release.external/javafx-swing-17-linux.jar=modules/ext/javafx-swing-17-linux.jar
release.external/javafx-swing-17-linux.jar.external=modules/ext/javafx-swing-17-linux.jar.external
release.external/javafx-web-17-linux.jar=modules/ext/javafx-web-17-linux.jar
release.external/javafx-web-17-linux.jar.external=modules/ext/javafx-web-17-linux.jar.external

license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
24 changes: 12 additions & 12 deletions extra/libs.javafx.linux/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,28 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
<runtime-relative-path>ext/javafx-base-13-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-base-13-linux.jar</binary-origin>
<runtime-relative-path>ext/javafx-base-17-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-base-17-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-controls-13-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-controls-13-linux.jar</binary-origin>
<runtime-relative-path>ext/javafx-controls-17-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-controls-17-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-graphics-13-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-graphics-13-linux.jar</binary-origin>
<runtime-relative-path>ext/javafx-graphics-17-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-graphics-17-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-media-13-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-media-13-linux.jar</binary-origin>
<runtime-relative-path>ext/javafx-media-17-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-media-17-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-swing-13-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-swing-13-linux.jar</binary-origin>
<runtime-relative-path>ext/javafx-swing-17-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-swing-17-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-web-13-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-web-13-linux.jar</binary-origin>
<runtime-relative-path>ext/javafx-web-17-linux.jar</runtime-relative-path>
<binary-origin>external/javafx-web-17-linux.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
5 changes: 5 additions & 0 deletions extra/libs.javafx.macosx/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,9 @@
<project basedir="." default="build" name="extra/libs.javafx.macosx">
<description>Builds, tests, and runs the project org.netbeans.libs.javafx.macosx</description>
<import file="../../nbbuild/templates/projectized.xml"/>

<target name="createExternalFile">
<taskdef name="createExternalFile" classname="org.netbeans.nbbuild.extlibs.CreateExternalFile" classpath="${nbantext.jar}"/>
<createExternalFile manifest="external/binaries-list"/>
</target>
</project>
12 changes: 6 additions & 6 deletions extra/libs.javafx.macosx/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.

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
61D52392B063BE78F7CC1B0FBFC04DDA7A835A15 org.openjfx:javafx-base:17:mac
E73ACF695FFCCB4F904FF7B76DE8999EEFB547C2 org.openjfx:javafx-controls:17:mac
8B1D1124CE83E874DB390016913FBA7708F3592D org.openjfx:javafx-graphics:17:mac
EF463CAF627C4C97B8E5C6A5AE16050C56AED966 org.openjfx:javafx-media:17:mac
BF188C003E54FFB4CFF6A9BE7CE437FA269964FE org.openjfx:javafx-web:17:mac
9DB4AF0939F1A1F82D727D3F6D133BA4096C5AAD org.openjfx:javafx-swing:17:mac

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 1547888292
URL: m2:/org.openjfx:javafx-base:17:jar:mac
MessageDigest: SHA-256 d759cf81ad3fa8c20448080c1eaf1dae60e37e70c3daa4e8b0cb5b7505df4033
MessageDigest: SHA-512 ed201aafacf31b8bedcc1be2562a70766bd09e81f2f0ef34ed6a73f1c1696a24a5c750598c08a3806748bfa267f66179a8b19d7991279d62e9ed3cf15fdf46e3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 3302120630
URL: m2:/org.openjfx:javafx-controls:17:jar:mac
MessageDigest: SHA-256 a07f964d1e93a54919d27db8bf1e08ed32c57309fd08897e206b97188c961a23
MessageDigest: SHA-512 8ecfe06ad19f01fa08c74ffd6ccb31a649dbc68c7cd88e7111e3a187ceb436b5a5a83f748ee904beef9a4191f7bdabb5b8dd987601b3cbca7358fa09c1c0f654

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 86241164
URL: m2:/org.openjfx:javafx-graphics:17:jar:mac
MessageDigest: SHA-256 0f3c7dc75bf71bd3e09ec04043e6bcf0bc2708a5fd25e3384e95d65c24deea97
MessageDigest: SHA-512 36592b3bdfdc3505e4a983aae70ea4fc9c2b8dff5aae1dee1a61dd6b867a6255d4249f45580c56b773f4cdfd7764c3ff2a1a5c0ab8e56674ca621528f634363f
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Name: JavaFX
Description: JavaFX API and Implementation
Version: 13
Version: 17
License: GPL-2-CP
Origin: https://github.com/javafxports/openjdk-jfx/
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
Origin: https://github.com/openjdk/jfx
Source: https://github.com/openjdk/jfx/commit/14b23bcf69a321c44b09e584b30f39e1fa3e6948
Files: javafx-base-17-mac.jar, javafx-controls-17-mac.jar, javafx-graphics-17-mac.jar, javafx-media-17-mac.jar, javafx-swing-17-mac.jar, javafx-web-17-mac.jar
Type: compile-time,optional
Comment: Used at compile. Possibly downloaded later.

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 4103086483
URL: m2:/org.openjfx:javafx-media:17:jar:mac
MessageDigest: SHA-256 a5b1f6149a907ab9373f69d520f5c95b6a028bef96d14619ed7d8594a49fd46d
MessageDigest: SHA-512 fda555f4cfebb76772c6e370f3fbdc2566af2884ddda8fe3a51a0a2bf2ab9bade6244469358fb1c25a0bea13a6bd35a55645df36ce4f7064456607ef712d2b3c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 3386812390
URL: m2:/org.openjfx:javafx-swing:17:jar:mac
MessageDigest: SHA-256 3ad9760ab5172da0c29eac286b9230694264d28c3abf26244920b756e9de4e7e
MessageDigest: SHA-512 478995c7d8b09c282a3baa79fe24c052f0e4cdda1101f251d31b810b2a041015a05c458b134f09362494a7b4b1c0848430f7ee5743b6e6392709f7555495078d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CRC: 3394508059
URL: m2:/org.openjfx:javafx-web:17:jar:mac
MessageDigest: SHA-256 e68e554d40667732a164d2e8b7718abb80a01ca7da75575f7408e04aaaa67786
MessageDigest: SHA-512 b3978987ee2856c306453f82079a9ffaffe5ef8847581c8ff3ade431b2c0c798fe5abaf45c84a60b641e6c6b902addef6b4d1251d7e96fefc17027155fb923d7
12 changes: 6 additions & 6 deletions extra/libs.javafx.macosx/licenseinfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
-->
<licenseinfo>
<fileset>
<file>external/javafx-base-13-mac.jar.external</file>
<file>external/javafx-controls-13-mac.jar.external</file>
<file>external/javafx-graphics-13-mac.jar.external</file>
<file>external/javafx-media-13-mac.jar.external</file>
<file>external/javafx-swing-13-mac.jar.external</file>
<file>external/javafx-web-13-mac.jar.external</file>
<file>external/javafx-base-17-mac.jar.external</file>
<file>external/javafx-controls-17-mac.jar.external</file>
<file>external/javafx-graphics-17-mac.jar.external</file>
<file>external/javafx-media-17-mac.jar.external</file>
<file>external/javafx-swing-17-mac.jar.external</file>
<file>external/javafx-web-17-mac.jar.external</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
Expand Down
Loading

0 comments on commit 021ebd3

Please sign in to comment.