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 ab59a90ca719..d17492fb3c93 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 @@ -129,7 +129,8 @@ public void testNoUserDefinedFeaturesInStandardBuild() throws Exception { "org.netbeans.libs.javafx.linux.aarch64", "org.netbeans.libs.javafx.macosx", "org.netbeans.libs.javafx.macosx.aarch64", - "org.netbeans.libs.javafx.win")); + "org.netbeans.libs.javafx.win", + "org.netbeans.libs.jsobject")); System.out.println(featureItem.getModuleCodeNames()); assertTrue( diff --git a/extra/libs.javafx.linux.aarch64/external/binaries-list b/extra/libs.javafx.linux.aarch64/external/binaries-list index 9d9cdfef2b37..cb643efc7e55 100644 --- a/extra/libs.javafx.linux.aarch64/external/binaries-list +++ b/extra/libs.javafx.linux.aarch64/external/binaries-list @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. -4A15A86C8836EBE7DFA4224C67C33A6E998255A3 org.openjfx:javafx-base:21:linux-aarch64 -5F1BCC010534D0A3E9B40216450A5F840F35B570 org.openjfx:javafx-controls:21:linux-aarch64 -BA2FD911F95BA2DFB2150B57F8A9D29EFF5E2755 org.openjfx:javafx-graphics:21:linux-aarch64 -117A580DCEA8BC6B1500148A5E21A578466EAE0C org.openjfx:javafx-media:21:linux-aarch64 -6FC79F94A653746F078BC79593D29E5CF951C17F org.openjfx:javafx-web:21:linux-aarch64 -685DF92AC03BC913625C29788493827CEF83BF3B org.openjfx:javafx-swing:21:linux-aarch64 \ No newline at end of file +FB4CD69DFA45921E3F9F6C337A3D4A0D5F6CE1A6 org.openjfx:javafx-base:23.0.2:linux-aarch64 +B46495584DD01AE5703C1298B8A17B9411C4361A org.openjfx:javafx-controls:23.0.2:linux-aarch64 +1D3577B85BB5AD480D67FDD301F4E96F3BB264DE org.openjfx:javafx-graphics:23.0.2:linux-aarch64 +B5CD6AD4A4E3CC8A4D857B8D35F5FB72BCD11F22 org.openjfx:javafx-media:23.0.2:linux-aarch64 +5C42B3610F74317D2CF59F8DCC27B3446C650742 org.openjfx:javafx-web:23.0.2:linux-aarch64 +1101AF2275A869A4FEBA2BF413F4A6773ED3C306 org.openjfx:javafx-swing:23.0.2:linux-aarch64 \ No newline at end of file diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-base-21-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-base-21-linux-aarch64.jar.external deleted file mode 100644 index 4221d753440b..000000000000 --- a/extra/libs.javafx.linux.aarch64/external/javafx-base-21-linux-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 456957322 -URL: m2:/org.openjfx:javafx-base:21:jar:linux-aarch64 -MessageDigest: SHA-256 44e493f304df40a94ddb1b6e99dd4c712740cf3e44627f2c8b4b8e6e1deda15a -MessageDigest: SHA-512 772b0ec2b9c077ac34741607c52f314a8d22c72132fc51e1f2e301ba5fac5fa4829fa45154a730b3333284d8a07fad0bdece27fb9b75054912d7a6197283fb95 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-base-23.0.2-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-base-23.0.2-linux-aarch64.jar.external new file mode 100644 index 000000000000..2ce4a4c5c92c --- /dev/null +++ b/extra/libs.javafx.linux.aarch64/external/javafx-base-23.0.2-linux-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 1672283012 +URL: m2:/org.openjfx:javafx-base:23.0.2:jar:linux-aarch64 +MessageDigest: SHA-256 795cf65dd7ad05fac9e7b3812fb212b9acb8f791d7a94c8893ecd828d29c1f2b +MessageDigest: SHA-512 a96194437aa17d13fe344945a5cb35dc25e6cec2dfc3f71f040b9b6327b51c07def138567a76d9912afd42851a2a163b8f3a36d40916b4864d6d59522e3fe4d3 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-controls-21-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-controls-21-linux-aarch64.jar.external deleted file mode 100644 index 481e7b24f2be..000000000000 --- a/extra/libs.javafx.linux.aarch64/external/javafx-controls-21-linux-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1695618138 -URL: m2:/org.openjfx:javafx-controls:21:jar:linux-aarch64 -MessageDigest: SHA-256 876b369035edfb34172b1a92c078787557a2b110a9e62a8506186f01cdfbf2e8 -MessageDigest: SHA-512 ae054aa371be3b194453696f5ca922b89f326864674096a0820b7ce7392bd36b5f3582ebce5da5d056643f6ccec26712e2f26a2e4a8dac697f44a76b82960bd4 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-controls-23.0.2-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-controls-23.0.2-linux-aarch64.jar.external new file mode 100644 index 000000000000..c9dffc4b0944 --- /dev/null +++ b/extra/libs.javafx.linux.aarch64/external/javafx-controls-23.0.2-linux-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 2563516155 +URL: m2:/org.openjfx:javafx-controls:23.0.2:jar:linux-aarch64 +MessageDigest: SHA-256 5a8bbe316abad3bde0173ba0a7ca5a72d9117786696c21e8809bf958cad48238 +MessageDigest: SHA-512 15e9c48041a42169d23473903c4f77a20ef136f0f76909a03d58f4b8d0e204319ce676e30b95dd8c395b6e608e0c4561be94b5a9ffba081c57c81a012f473545 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-graphics-21-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-graphics-21-linux-aarch64.jar.external deleted file mode 100644 index 6f68c225c189..000000000000 --- a/extra/libs.javafx.linux.aarch64/external/javafx-graphics-21-linux-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 422887575 -URL: m2:/org.openjfx:javafx-graphics:21:jar:linux-aarch64 -MessageDigest: SHA-256 250372088e36876c04984570cdd5873a2cc7e3ea90a2bc44868c018234bdf33b -MessageDigest: SHA-512 0f9d35f4a96730f055c53f3c20db966c8f67a6eb04cef1f36aa9b0c34f210552df61e218f8dfd16a83f5623e09910a854a9f9d2e48adf633b3f8798bb5861863 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-graphics-23.0.2-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-graphics-23.0.2-linux-aarch64.jar.external new file mode 100644 index 000000000000..1cb77ff6f751 --- /dev/null +++ b/extra/libs.javafx.linux.aarch64/external/javafx-graphics-23.0.2-linux-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 1439950677 +URL: m2:/org.openjfx:javafx-graphics:23.0.2:jar:linux-aarch64 +MessageDigest: SHA-256 b379010b2933a57a3a277f87111dfffa99af37a43250029916dc8d331599ae96 +MessageDigest: SHA-512 bed045e694035e283c1e560ecf7f7e8d45731312cf401870dec68fda6e33abaa999a3133adfa1ebd92094071d7d2438a4694d8a0afbfee0ac60262111b4fdd8d diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-mac-aarch64-21.0.9-license.txt b/extra/libs.javafx.linux.aarch64/external/javafx-linux-aarch64-23.0.2-license.txt similarity index 98% rename from extra/libs.javafx.macosx.aarch64/external/javafx-mac-aarch64-21.0.9-license.txt rename to extra/libs.javafx.linux.aarch64/external/javafx-linux-aarch64-23.0.2-license.txt index 70804ea6b543..b27b445dd622 100644 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-mac-aarch64-21.0.9-license.txt +++ b/extra/libs.javafx.linux.aarch64/external/javafx-linux-aarch64-23.0.2-license.txt @@ -1,10 +1,10 @@ Name: JavaFX Description: JavaFX API and Implementation -Version: 21.0.9 +Version: 23.0.2 License: GPL-2-CP Origin: https://github.com/openjdk/jfx -Source: https://github.com/openjdk/jfx21u/tree/21.0.9%2B1 -Files: javafx-base-21.0.9-mac-aarch64.jar, javafx-controls-21.0.9-mac-aarch64.jar, javafx-graphics-21.0.9-mac-aarch64.jar, javafx-media-21.0.9-mac-aarch64.jar, javafx-swing-21.0.9-mac-aarch64.jar, javafx-web-21.0.9-mac-aarch64.jar +Source: https://github.com/openjdk/jfx23u/tree/23.0.2-ga +Files: javafx-base-23.0.2-linux-aarch64.jar, javafx-controls-23.0.2-linux-aarch64.jar, javafx-graphics-23.0.2-linux-aarch64.jar, javafx-media-23.0.2-linux-aarch64.jar, javafx-swing-23.0.2-linux-aarch64.jar, javafx-web-23.0.2-linux-aarch64.jar Type: compile-time,optional Comment: Used at compile. Possibly downloaded later. diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-media-21-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-media-21-linux-aarch64.jar.external deleted file mode 100644 index b825ade38668..000000000000 --- a/extra/libs.javafx.linux.aarch64/external/javafx-media-21-linux-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 2854084762 -URL: m2:/org.openjfx:javafx-media:21:jar:linux-aarch64 -MessageDigest: SHA-256 a6d2c5e71d886703d7df2fbd7b5a06134523506c07697660ef1bd11d904be06b -MessageDigest: SHA-512 3f2b5ee9224af4ac8077a7a857663dc29f253160ca0aaed5505e92cbc248f631125023a4b990633fb46023c25349caf2a5734bb38413cf5af0bb7ff16dd23991 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-media-23.0.2-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-media-23.0.2-linux-aarch64.jar.external new file mode 100644 index 000000000000..7a25fbd5c1e0 --- /dev/null +++ b/extra/libs.javafx.linux.aarch64/external/javafx-media-23.0.2-linux-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 2245211842 +URL: m2:/org.openjfx:javafx-media:23.0.2:jar:linux-aarch64 +MessageDigest: SHA-256 7dc01f692c66c68e005e8ca0e37e0581df5db2abb3c7f0bab041b13bf3e69bf6 +MessageDigest: SHA-512 e4d050fc7d4c88b5e1c3cfd9f792611bfa24a9f4d01ac09470d1d336c9ea8ea4a9cdb7a1d86bff94a99cc92f60b285992c54be4a08eacd26175ec7de14844cc5 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-swing-21-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-swing-21-linux-aarch64.jar.external deleted file mode 100644 index 0fedfedf91e3..000000000000 --- a/extra/libs.javafx.linux.aarch64/external/javafx-swing-21-linux-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 965978383 -URL: m2:/org.openjfx:javafx-swing:21:jar:linux-aarch64 -MessageDigest: SHA-256 6b511949b39cd6f68eb9aae57d1c1a0fa29ad725ebc966093c31bca7efed7ec2 -MessageDigest: SHA-512 67cf96f355eb8c27f44fc9613e485c5a6e780220c94870921c80aef8a8808a43a4ffc3d3fa11610364d185ee07c6e1c22f4b3476096cc96fa599731481d83f0f diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-swing-23.0.2-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-swing-23.0.2-linux-aarch64.jar.external new file mode 100644 index 000000000000..b83b996c7c15 --- /dev/null +++ b/extra/libs.javafx.linux.aarch64/external/javafx-swing-23.0.2-linux-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 224950374 +URL: m2:/org.openjfx:javafx-swing:23.0.2:jar:linux-aarch64 +MessageDigest: SHA-256 6eafc71a8db3bd7ca4cbae25dc69cd34fa8e91208ed4681f89d7585eed5e4bdc +MessageDigest: SHA-512 7d135d40360874323c6caad8ba07f053dfa0aeeab79a3aae7fdd8dde66c400e574329e73326fbc125f216874ce6fddb4168b9c0767d383b99f932ca44a5b5c14 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-web-21-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-web-21-linux-aarch64.jar.external deleted file mode 100644 index 7f966a4ff2f3..000000000000 --- a/extra/libs.javafx.linux.aarch64/external/javafx-web-21-linux-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 3166261818 -URL: m2:/org.openjfx:javafx-web:21:jar:linux-aarch64 -MessageDigest: SHA-256 46d530c6c0c9a3060ade04befde8f35d5f2108ef0fb13701d1a49c8655b12629 -MessageDigest: SHA-512 6180087944093eaa115d5899ab3dc08ce6724efddcb374b38af870a308f25b6eb65034df8dff32129222644e355fb4708e43cabc3bdf491150237ff9c6604557 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-web-23.0.2-linux-aarch64.jar.external b/extra/libs.javafx.linux.aarch64/external/javafx-web-23.0.2-linux-aarch64.jar.external new file mode 100644 index 000000000000..85913ce9f7c8 --- /dev/null +++ b/extra/libs.javafx.linux.aarch64/external/javafx-web-23.0.2-linux-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 2123493530 +URL: m2:/org.openjfx:javafx-web:23.0.2:jar:linux-aarch64 +MessageDigest: SHA-256 5546532623239a4cd5a5f45053f78caf19fa3922055e14b77f3f72ddf0899309 +MessageDigest: SHA-512 7dd822beeb854ff13d54998cdac03abb8b6f4fc8a179f1a6c7ede35281975a700522973381120f160a0242d4057773cfa56b9d3d0ea564c9481e8d80b208b861 diff --git a/extra/libs.javafx.linux.aarch64/licenseinfo.xml b/extra/libs.javafx.linux.aarch64/licenseinfo.xml index 9b6d4d067dbe..a2c2d88f4a44 100644 --- a/extra/libs.javafx.linux.aarch64/licenseinfo.xml +++ b/extra/libs.javafx.linux.aarch64/licenseinfo.xml @@ -21,12 +21,12 @@ --> - external/javafx-base-21-linux-aarch64.jar.external - external/javafx-controls-21-linux-aarch64.jar.external - external/javafx-graphics-21-linux-aarch64.jar.external - external/javafx-media-21-linux-aarch64.jar.external - external/javafx-swing-21-linux-aarch64.jar.external - external/javafx-web-21-linux-aarch64.jar.external + external/javafx-base-23.0.2-linux-aarch64.jar.external + external/javafx-controls-23.0.2-linux-aarch64.jar.external + external/javafx-graphics-23.0.2-linux-aarch64.jar.external + external/javafx-media-23.0.2-linux-aarch64.jar.external + external/javafx-swing-23.0.2-linux-aarch64.jar.external + external/javafx-web-23.0.2-linux-aarch64.jar.external diff --git a/extra/libs.javafx.linux.aarch64/manifest.mf b/extra/libs.javafx.linux.aarch64/manifest.mf index b90a9483b852..a9db4ff050f9 100644 --- a/extra/libs.javafx.linux.aarch64/manifest.mf +++ b/extra/libs.javafx.linux.aarch64/manifest.mf @@ -3,6 +3,6 @@ AutoUpdate-Show-In-Client: true OpenIDE-Module: org.netbeans.libs.javafx.linux.aarch64 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/linux/aarch64/Bundle.properties OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx -OpenIDE-Module-Specification-Version: 21.2 +OpenIDE-Module-Specification-Version: 23.0 OpenIDE-Module-Requires: org.openide.modules.os.Linux, org.openide.modules.arch.aarch64 OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX diff --git a/extra/libs.javafx.linux.aarch64/nbproject/project.properties b/extra/libs.javafx.linux.aarch64/nbproject/project.properties index 85a97a6c3d04..2d58607209b0 100644 --- a/extra/libs.javafx.linux.aarch64/nbproject/project.properties +++ b/extra/libs.javafx.linux.aarch64/nbproject/project.properties @@ -15,21 +15,21 @@ # specific language governing permissions and limitations # under the License. -javac.release=17 +javac.release=21 javac.compilerargs=-Xlint -Xlint:-serial is.autoload=true -release.external/javafx-base-21-linux-aarch64.jar=modules/ext/javafx-base-21-linux-aarch64.jar -release.external/javafx-base-21-linux-aarch64.jar.external=modules/ext/javafx-base-21-linux-aarch64.jar.external -release.external/javafx-controls-21-linux-aarch64.jar=modules/ext/javafx-controls-21-linux-aarch64.jar -release.external/javafx-controls-21-linux-aarch64.jar.external=modules/ext/javafx-controls-21-linux-aarch64.jar.external -release.external/javafx-graphics-21-linux-aarch64.jar=modules/ext/javafx-graphics-21-linux-aarch64.jar -release.external/javafx-graphics-21-linux-aarch64.jar.external=modules/ext/javafx-graphics-21-linux-aarch64.jar.external -release.external/javafx-media-21-linux-aarch64.jar=modules/ext/javafx-media-21-linux-aarch64.jar -release.external/javafx-media-21-linux-aarch64.jar.external=modules/ext/javafx-media-21-linux-aarch64.jar.external -release.external/javafx-swing-21-linux-aarch64.jar=modules/ext/javafx-swing-21-linux-aarch64.jar -release.external/javafx-swing-21-linux-aarch64.jar.external=modules/ext/javafx-swing-21-linux-aarch64.jar.external -release.external/javafx-web-21-linux-aarch64.jar=modules/ext/javafx-web-21-linux-aarch64.jar -release.external/javafx-web-21-linux-aarch64.jar.external=modules/ext/javafx-web-21-linux-aarch64.jar.external +release.external/javafx-base-23.0.2-linux-aarch64.jar=modules/ext/javafx-base-23.0.2-linux-aarch64.jar +release.external/javafx-base-23.0.2-linux-aarch64.jar.external=modules/ext/javafx-base-23.0.2-linux-aarch64.jar.external +release.external/javafx-controls-23.0.2-linux-aarch64.jar=modules/ext/javafx-controls-23.0.2-linux-aarch64.jar +release.external/javafx-controls-23.0.2-linux-aarch64.jar.external=modules/ext/javafx-controls-23.0.2-linux-aarch64.jar.external +release.external/javafx-graphics-23.0.2-linux-aarch64.jar=modules/ext/javafx-graphics-23.0.2-linux-aarch64.jar +release.external/javafx-graphics-23.0.2-linux-aarch64.jar.external=modules/ext/javafx-graphics-23.0.2-linux-aarch64.jar.external +release.external/javafx-media-23.0.2-linux-aarch64.jar=modules/ext/javafx-media-23.0.2-linux-aarch64.jar +release.external/javafx-media-23.0.2-linux-aarch64.jar.external=modules/ext/javafx-media-23.0.2-linux-aarch64.jar.external +release.external/javafx-swing-23.0.2-linux-aarch64.jar=modules/ext/javafx-swing-23.0.2-linux-aarch64.jar +release.external/javafx-swing-23.0.2-linux-aarch64.jar.external=modules/ext/javafx-swing-23.0.2-linux-aarch64.jar.external +release.external/javafx-web-23.0.2-linux-aarch64.jar=modules/ext/javafx-web-23.0.2-linux-aarch64.jar +release.external/javafx-web-23.0.2-linux-aarch64.jar.external=modules/ext/javafx-web-23.0.2-linux-aarch64.jar.external license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP diff --git a/extra/libs.javafx.linux.aarch64/nbproject/project.xml b/extra/libs.javafx.linux.aarch64/nbproject/project.xml index ef0a977a0766..dfea5aab1f95 100644 --- a/extra/libs.javafx.linux.aarch64/nbproject/project.xml +++ b/extra/libs.javafx.linux.aarch64/nbproject/project.xml @@ -26,46 +26,54 @@ org.netbeans.libs.javafx.linux.aarch64 - org.openide.modules + org.netbeans.libs.javafx - 7.40 + 2.10 - org.netbeans.libs.javafx + org.netbeans.libs.jsobject - 2.10 + 25.0 + + + + org.openide.modules + + + + 7.40 - ext/javafx-base-21-linux-aarch64.jar - external/javafx-base-21-linux-aarch64.jar + ext/javafx-base-23.0.2-linux-aarch64.jar + external/javafx-base-23.0.2-linux-aarch64.jar - ext/javafx-controls-21-linux-aarch64.jar - external/javafx-controls-21-linux-aarch64.jar + ext/javafx-controls-23.0.2-linux-aarch64.jar + external/javafx-controls-23.0.2-linux-aarch64.jar - ext/javafx-graphics-21-linux-aarch64.jar - external/javafx-graphics-21-linux-aarch64.jar + ext/javafx-graphics-23.0.2-linux-aarch64.jar + external/javafx-graphics-23.0.2-linux-aarch64.jar - ext/javafx-media-21-linux-aarch64.jar - external/javafx-media-21-linux-aarch64.jar + ext/javafx-media-23.0.2-linux-aarch64.jar + external/javafx-media-23.0.2-linux-aarch64.jar - ext/javafx-swing-21-linux-aarch64.jar - external/javafx-swing-21-linux-aarch64.jar + ext/javafx-swing-23.0.2-linux-aarch64.jar + external/javafx-swing-23.0.2-linux-aarch64.jar - ext/javafx-web-21-linux-aarch64.jar - external/javafx-web-21-linux-aarch64.jar + ext/javafx-web-23.0.2-linux-aarch64.jar + external/javafx-web-23.0.2-linux-aarch64.jar diff --git a/extra/libs.javafx.linux/external/binaries-list b/extra/libs.javafx.linux/external/binaries-list index 9a1f554a0b1a..16e14f551153 100644 --- a/extra/libs.javafx.linux/external/binaries-list +++ b/extra/libs.javafx.linux/external/binaries-list @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. -719A905A9CF5339DB51278470857A3705E1CC73E org.openjfx:javafx-base:21.0.9:linux -D1F38F9E358248D75F63C7041AAA3B11612F954D org.openjfx:javafx-controls:21.0.9:linux -DEEB8F29C9A45BCA8E7AA9D0D3767D25142830E9 org.openjfx:javafx-graphics:21.0.9:linux -5589DA5B5DE35ABD26F19AF09D8FEC097E040559 org.openjfx:javafx-media:21.0.9:linux -95A2E575CC28D8FA9021025F749D9BF5462B6CE2 org.openjfx:javafx-web:21.0.9:linux -E565C440DAB228EA0F3CC3F55D0EEEA45901A12A org.openjfx:javafx-swing:21.0.9:linux \ No newline at end of file +3491430B720983619F03AFD204CF43ED933244C2 org.openjfx:javafx-base:23.0.2:linux +F6C2F4DD5A72E0338876B45C32AAB93218FAC644 org.openjfx:javafx-controls:23.0.2:linux +4B8F3472EFEC5D300AB49777BA2092276667AAA6 org.openjfx:javafx-graphics:23.0.2:linux +BF8CD4FE71C3C6C319529A26A7738ECD65AF336F org.openjfx:javafx-media:23.0.2:linux +452BC0655F6816D1E58ADBEADE80CCEB1E5EF766 org.openjfx:javafx-web:23.0.2:linux +9D1D677FDD6287320440ABF25EABF9CDC9C9B6F5 org.openjfx:javafx-swing:23.0.2:linux \ No newline at end of file diff --git a/extra/libs.javafx.linux/external/javafx-base-21.0.9-linux.jar.external b/extra/libs.javafx.linux/external/javafx-base-21.0.9-linux.jar.external deleted file mode 100644 index 7aa013a35ce6..000000000000 --- a/extra/libs.javafx.linux/external/javafx-base-21.0.9-linux.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 3755363890 -URL: m2:/org.openjfx:javafx-base:21.0.9:jar:linux -MessageDigest: SHA-256 c31ce9b91ae005b461f1839d1e0d39ebf1872e71dad12672961b099f7fb25db7 -MessageDigest: SHA-512 423598c5b609c84541f8e109af0d2ddc1b64a45ede81c96765fb8df7c3613c4b263dea8daeda46e0a3f5e85455d9d0620df1ade60d32261f45c7d271bc6b8f22 diff --git a/extra/libs.javafx.linux/external/javafx-base-23.0.2-linux.jar.external b/extra/libs.javafx.linux/external/javafx-base-23.0.2-linux.jar.external new file mode 100644 index 000000000000..2d666b0830f6 --- /dev/null +++ b/extra/libs.javafx.linux/external/javafx-base-23.0.2-linux.jar.external @@ -0,0 +1,4 @@ +CRC: 2916816378 +URL: m2:/org.openjfx:javafx-base:23.0.2:jar:linux +MessageDigest: SHA-256 93cf67fe6f0e2c0b6f6b3134aa218b576b144cb5e114d210651b2594a9d15640 +MessageDigest: SHA-512 2aa7a69328e6616de07c9421bf21a2e0348cd9275301fdbf778dc47bea9a085c57a8b61ee8eca762a895f1c1e7f9850ddbfdcc31bbd56d14a01ad02888cdf27d diff --git a/extra/libs.javafx.linux/external/javafx-controls-21.0.9-linux.jar.external b/extra/libs.javafx.linux/external/javafx-controls-21.0.9-linux.jar.external deleted file mode 100644 index fbafb1ffcc46..000000000000 --- a/extra/libs.javafx.linux/external/javafx-controls-21.0.9-linux.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 4045172284 -URL: m2:/org.openjfx:javafx-controls:21.0.9:jar:linux -MessageDigest: SHA-256 1ccf2346e15fed71e8ca93ad6201789c26723fb50baf65209627430a24991c15 -MessageDigest: SHA-512 8f9c94c536430945b6a1883b40c245161e9e9b39a75016c3de04aa480ccaf66d54205a4c8f6ab10b119fe71e951280ba0ec9adf917aef6e88d0b4804c7b3b3c2 diff --git a/extra/libs.javafx.linux/external/javafx-controls-23.0.2-linux.jar.external b/extra/libs.javafx.linux/external/javafx-controls-23.0.2-linux.jar.external new file mode 100644 index 000000000000..c4ef7a845d73 --- /dev/null +++ b/extra/libs.javafx.linux/external/javafx-controls-23.0.2-linux.jar.external @@ -0,0 +1,4 @@ +CRC: 818245427 +URL: m2:/org.openjfx:javafx-controls:23.0.2:jar:linux +MessageDigest: SHA-256 2c10d1e7e9354e1cd573bde2e47a16c72cfb8e86604830ac29cd2b65523fd1ec +MessageDigest: SHA-512 e24ee4915a9c78aaed26bbcba068b40f213adfc8072f49d508493b47f980cf17b2736f2f46237023e78eda543d5a809ece77a1dd52d47531aa454e1e86e0455f diff --git a/extra/libs.javafx.linux/external/javafx-graphics-21.0.9-linux.jar.external b/extra/libs.javafx.linux/external/javafx-graphics-21.0.9-linux.jar.external deleted file mode 100644 index 9fc59e6039c6..000000000000 --- a/extra/libs.javafx.linux/external/javafx-graphics-21.0.9-linux.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1348644052 -URL: m2:/org.openjfx:javafx-graphics:21.0.9:jar:linux -MessageDigest: SHA-256 5e68feb4acd2012ceafe5d2fe2f9eacae868936283c6f0de1ca3c83fbe0e34a3 -MessageDigest: SHA-512 512e008af7f2f5c17b5de1e32dc3e9cedd02f157fb584ddb0de6a2077bcf7be2eda6f49621c6402b8a7f1981d7662c2950f98e237e2af9b9155b98e47d6583b3 diff --git a/extra/libs.javafx.linux/external/javafx-graphics-23.0.2-linux.jar.external b/extra/libs.javafx.linux/external/javafx-graphics-23.0.2-linux.jar.external new file mode 100644 index 000000000000..1239b8681608 --- /dev/null +++ b/extra/libs.javafx.linux/external/javafx-graphics-23.0.2-linux.jar.external @@ -0,0 +1,4 @@ +CRC: 1991675692 +URL: m2:/org.openjfx:javafx-graphics:23.0.2:jar:linux +MessageDigest: SHA-256 809376faff637c5bbbacbdff710e2e1f9d523c1e344020124a2735aca04daa28 +MessageDigest: SHA-512 c2430b332a71df8c8431b150c9e50440da7dff1468b783d0a3a59994c7030784750ccf05d2dca555219793bb2f8fbb157d07d0acabe61eba1ede6e3610eede43 diff --git a/extra/libs.javafx.linux/external/javafx-linux-21.0.9-license.txt b/extra/libs.javafx.linux/external/javafx-linux-23.0.2-license.txt similarity index 98% rename from extra/libs.javafx.linux/external/javafx-linux-21.0.9-license.txt rename to extra/libs.javafx.linux/external/javafx-linux-23.0.2-license.txt index 1cdd2d73dc28..81b0ebdeccf8 100644 --- a/extra/libs.javafx.linux/external/javafx-linux-21.0.9-license.txt +++ b/extra/libs.javafx.linux/external/javafx-linux-23.0.2-license.txt @@ -1,10 +1,10 @@ Name: JavaFX Description: JavaFX API and Implementation -Version: 21.0.9 +Version: 23.0.2 License: GPL-2-CP Origin: https://github.com/openjdk/jfx -Source: https://github.com/openjdk/jfx21u/tree/21.0.9%2B1 -Files: javafx-base-21.0.9-linux.jar, javafx-controls-21.0.9-linux.jar, javafx-graphics-21.0.9-linux.jar, javafx-media-21.0.9-linux.jar, javafx-swing-21.0.9-linux.jar, javafx-web-21.0.9-linux.jar +Source: https://github.com/openjdk/jfx23u/tree/23.0.2-ga +Files: javafx-base-23.0.2-linux.jar, javafx-controls-23.0.2-linux.jar, javafx-graphics-23.0.2-linux.jar, javafx-media-23.0.2-linux.jar, javafx-swing-23.0.2-linux.jar, javafx-web-23.0.2-linux.jar Type: compile-time,optional Comment: Used at compile. Possibly downloaded later. diff --git a/extra/libs.javafx.linux/external/javafx-media-21.0.9-linux.jar.external b/extra/libs.javafx.linux/external/javafx-media-21.0.9-linux.jar.external deleted file mode 100644 index 5f1a0d08441b..000000000000 --- a/extra/libs.javafx.linux/external/javafx-media-21.0.9-linux.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 4084465233 -URL: m2:/org.openjfx:javafx-media:21.0.9:jar:linux -MessageDigest: SHA-256 ee42c4207013f684ab454c1f1fc02c84f5e270e2d20fce332d27df91c5a06b70 -MessageDigest: SHA-512 f317a8916567818c11ab8ae2c63381dd92064905cc4297abb90284546ee96f8a528fa05fa7a9bc7d1ef05f6ccfabcc46b1ac2b552bb5d494e77c31948e2eadde diff --git a/extra/libs.javafx.linux/external/javafx-media-23.0.2-linux.jar.external b/extra/libs.javafx.linux/external/javafx-media-23.0.2-linux.jar.external new file mode 100644 index 000000000000..256a7b0c9013 --- /dev/null +++ b/extra/libs.javafx.linux/external/javafx-media-23.0.2-linux.jar.external @@ -0,0 +1,4 @@ +CRC: 2595247753 +URL: m2:/org.openjfx:javafx-media:23.0.2:jar:linux +MessageDigest: SHA-256 b842a02e08221793615bac8bc3bfeb1be5e079474fbf6e815b45571fdf0c4a34 +MessageDigest: SHA-512 3e1c9f7a2c7d2ed9471fcfdd4862d030e37d5fef2c2023b3be048e3c24f7b01e3d0f9a25b5d3d98a72ffceddfb12b7f672ea0f1c53cd7a7ca93cac1083f8a71f diff --git a/extra/libs.javafx.linux/external/javafx-swing-21.0.9-linux.jar.external b/extra/libs.javafx.linux/external/javafx-swing-21.0.9-linux.jar.external deleted file mode 100644 index ce67cc7e2188..000000000000 --- a/extra/libs.javafx.linux/external/javafx-swing-21.0.9-linux.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 2690648723 -URL: m2:/org.openjfx:javafx-swing:21.0.9:jar:linux -MessageDigest: SHA-256 fa86819f94a900ff723e12f878ad28e6233b1d881101f846abe992b53935fc5f -MessageDigest: SHA-512 38452e0490a4cb20f6b982d3c8b1252fb8f03379db3b92fe04a45f8b8f41476c339a8bb890161a3416eedf8638b601b38c0abc51e3027b5e8f60302ca5b78a20 diff --git a/extra/libs.javafx.linux/external/javafx-swing-23.0.2-linux.jar.external b/extra/libs.javafx.linux/external/javafx-swing-23.0.2-linux.jar.external new file mode 100644 index 000000000000..7d5b8cb86f48 --- /dev/null +++ b/extra/libs.javafx.linux/external/javafx-swing-23.0.2-linux.jar.external @@ -0,0 +1,4 @@ +CRC: 3403936535 +URL: m2:/org.openjfx:javafx-swing:23.0.2:jar:linux +MessageDigest: SHA-256 c55286b39f996e53390920a9839293c74eb360650ed38bbe6ecc7fb74ea5160c +MessageDigest: SHA-512 9ff81cf8a6d53adb8fab85f38f0e46369a172067a1994d819c322e737a58e6123dce5e17d6c1d42944ab0e367e4befd19de5dea5977e4003b294d896339dfe16 diff --git a/extra/libs.javafx.linux/external/javafx-web-21.0.9-linux.jar.external b/extra/libs.javafx.linux/external/javafx-web-21.0.9-linux.jar.external deleted file mode 100644 index c2cff5e30280..000000000000 --- a/extra/libs.javafx.linux/external/javafx-web-21.0.9-linux.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 3512499996 -URL: m2:/org.openjfx:javafx-web:21.0.9:jar:linux -MessageDigest: SHA-256 4cb262da8b7587a104883ea415038dc5c454afc781c4a7b02adbc70e28679f0e -MessageDigest: SHA-512 4beb19d872ec3afa95fc555d754d64a7c05ce71bf541ccc3ed8a7abd8ee9c98fd3a6698e6fcf750e3fc2e2637214fa6098ae6aa7c28fc32445af68452ef4ed7e diff --git a/extra/libs.javafx.linux/external/javafx-web-23.0.2-linux.jar.external b/extra/libs.javafx.linux/external/javafx-web-23.0.2-linux.jar.external new file mode 100644 index 000000000000..d6472c44b6fb --- /dev/null +++ b/extra/libs.javafx.linux/external/javafx-web-23.0.2-linux.jar.external @@ -0,0 +1,4 @@ +CRC: 4113358470 +URL: m2:/org.openjfx:javafx-web:23.0.2:jar:linux +MessageDigest: SHA-256 c06f091ee6413efe1deb707f0487c99a254661ded162dc13a96b3f36ef578605 +MessageDigest: SHA-512 7f9ce80877bde97313d0bc90940c50a16a57d2396c51cb1a3729d7137152d17419c7bd4c57fe41600e11b9544e2e210952568c961ac30c55ef546cb327fa769b diff --git a/extra/libs.javafx.linux/licenseinfo.xml b/extra/libs.javafx.linux/licenseinfo.xml index 383ce5206a08..226e35434710 100644 --- a/extra/libs.javafx.linux/licenseinfo.xml +++ b/extra/libs.javafx.linux/licenseinfo.xml @@ -21,12 +21,12 @@ --> - external/javafx-base-21.0.9-linux.jar.external - external/javafx-controls-21.0.9-linux.jar.external - external/javafx-graphics-21.0.9-linux.jar.external - external/javafx-media-21.0.9-linux.jar.external - external/javafx-swing-21.0.9-linux.jar.external - external/javafx-web-21.0.9-linux.jar.external + external/javafx-base-23.0.2-linux.jar.external + external/javafx-controls-23.0.2-linux.jar.external + external/javafx-graphics-23.0.2-linux.jar.external + external/javafx-media-23.0.2-linux.jar.external + external/javafx-swing-23.0.2-linux.jar.external + external/javafx-web-23.0.2-linux.jar.external diff --git a/extra/libs.javafx.linux/manifest.mf b/extra/libs.javafx.linux/manifest.mf index bbc5f86ac16d..73c36925c6dc 100644 --- a/extra/libs.javafx.linux/manifest.mf +++ b/extra/libs.javafx.linux/manifest.mf @@ -3,6 +3,6 @@ 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: 21.2 +OpenIDE-Module-Specification-Version: 23.0 OpenIDE-Module-Requires: org.openide.modules.os.Linux, org.openide.modules.arch.amd64 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 d5ef9a5d5a49..46859c39e524 100644 --- a/extra/libs.javafx.linux/nbproject/project.properties +++ b/extra/libs.javafx.linux/nbproject/project.properties @@ -15,21 +15,21 @@ # specific language governing permissions and limitations # under the License. -javac.release=17 +javac.release=21 javac.compilerargs=-Xlint -Xlint:-serial is.autoload=true -release.external/javafx-base-21.0.9-linux.jar=modules/ext/javafx-base-21.0.9-linux.jar -release.external/javafx-base-21.0.9-linux.jar.external=modules/ext/javafx-base-21.0.9-linux.jar.external -release.external/javafx-controls-21.0.9-linux.jar=modules/ext/javafx-controls-21.0.9-linux.jar -release.external/javafx-controls-21.0.9-linux.jar.external=modules/ext/javafx-controls-21.0.9-linux.jar.external -release.external/javafx-graphics-21.0.9-linux.jar=modules/ext/javafx-graphics-21.0.9-linux.jar -release.external/javafx-graphics-21.0.9-linux.jar.external=modules/ext/javafx-graphics-21.0.9-linux.jar.external -release.external/javafx-media-21.0.9-linux.jar=modules/ext/javafx-media-21.0.9-linux.jar -release.external/javafx-media-21.0.9-linux.jar.external=modules/ext/javafx-media-21.0.9-linux.jar.external -release.external/javafx-swing-21.0.9-linux.jar=modules/ext/javafx-swing-21.0.9-linux.jar -release.external/javafx-swing-21.0.9-linux.jar.external=modules/ext/javafx-swing-21.0.9-linux.jar.external -release.external/javafx-web-21.0.9-linux.jar=modules/ext/javafx-web-21.0.9-linux.jar -release.external/javafx-web-21.0.9-linux.jar.external=modules/ext/javafx-web-21.0.9-linux.jar.external +release.external/javafx-base-23.0.2-linux.jar=modules/ext/javafx-base-23.0.2-linux.jar +release.external/javafx-base-23.0.2-linux.jar.external=modules/ext/javafx-base-23.0.2-linux.jar.external +release.external/javafx-controls-23.0.2-linux.jar=modules/ext/javafx-controls-23.0.2-linux.jar +release.external/javafx-controls-23.0.2-linux.jar.external=modules/ext/javafx-controls-23.0.2-linux.jar.external +release.external/javafx-graphics-23.0.2-linux.jar=modules/ext/javafx-graphics-23.0.2-linux.jar +release.external/javafx-graphics-23.0.2-linux.jar.external=modules/ext/javafx-graphics-23.0.2-linux.jar.external +release.external/javafx-media-23.0.2-linux.jar=modules/ext/javafx-media-23.0.2-linux.jar +release.external/javafx-media-23.0.2-linux.jar.external=modules/ext/javafx-media-23.0.2-linux.jar.external +release.external/javafx-swing-23.0.2-linux.jar=modules/ext/javafx-swing-23.0.2-linux.jar +release.external/javafx-swing-23.0.2-linux.jar.external=modules/ext/javafx-swing-23.0.2-linux.jar.external +release.external/javafx-web-23.0.2-linux.jar=modules/ext/javafx-web-23.0.2-linux.jar +release.external/javafx-web-23.0.2-linux.jar.external=modules/ext/javafx-web-23.0.2-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 14bc719f2ceb..2a4330596b1d 100644 --- a/extra/libs.javafx.linux/nbproject/project.xml +++ b/extra/libs.javafx.linux/nbproject/project.xml @@ -26,46 +26,54 @@ org.netbeans.libs.javafx.linux - org.openide.modules + org.netbeans.libs.javafx - 7.40 + 2.10 - org.netbeans.libs.javafx + org.netbeans.libs.jsobject - 2.10 + 25.0 + + + + org.openide.modules + + + + 7.40 - ext/javafx-base-21.0.9-linux.jar - external/javafx-base-21.0.9-linux.jar + ext/javafx-base-23.0.2-linux.jar + external/javafx-base-23.0.2-linux.jar - ext/javafx-controls-21.0.9-linux.jar - external/javafx-controls-21.0.9-linux.jar + ext/javafx-controls-23.0.2-linux.jar + external/javafx-controls-23.0.2-linux.jar - ext/javafx-graphics-21.0.9-linux.jar - external/javafx-graphics-21.0.9-linux.jar + ext/javafx-graphics-23.0.2-linux.jar + external/javafx-graphics-23.0.2-linux.jar - ext/javafx-media-21.0.9-linux.jar - external/javafx-media-21.0.9-linux.jar + ext/javafx-media-23.0.2-linux.jar + external/javafx-media-23.0.2-linux.jar - ext/javafx-swing-21.0.9-linux.jar - external/javafx-swing-21.0.9-linux.jar + ext/javafx-swing-23.0.2-linux.jar + external/javafx-swing-23.0.2-linux.jar - ext/javafx-web-21.0.9-linux.jar - external/javafx-web-21.0.9-linux.jar + ext/javafx-web-23.0.2-linux.jar + external/javafx-web-23.0.2-linux.jar diff --git a/extra/libs.javafx.macosx.aarch64/external/binaries-list b/extra/libs.javafx.macosx.aarch64/external/binaries-list index 5e8148e426cd..ff0ea74d9e86 100644 --- a/extra/libs.javafx.macosx.aarch64/external/binaries-list +++ b/extra/libs.javafx.macosx.aarch64/external/binaries-list @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. -0A3AFDC2A221297FED8E600B2515639330EF48FA org.openjfx:javafx-base:21.0.9:mac-aarch64 -CBD43260A7D52855DE3B7B5B97914FEAA76622C5 org.openjfx:javafx-controls:21.0.9:mac-aarch64 -8D4B302B66E7146D71E05B004158927FC5BB2C33 org.openjfx:javafx-graphics:21.0.9:mac-aarch64 -AF802111B7BB4A95DB11FB0FE7A98142EC70C413 org.openjfx:javafx-media:21.0.9:mac-aarch64 -01E9B259291DA71E4B2135E6C13F153D1277ECFA org.openjfx:javafx-web:21.0.9:mac-aarch64 -4329639383E64C92462D230ACDFC5B2E98D7B524 org.openjfx:javafx-swing:21.0.9:mac-aarch64 \ No newline at end of file +2102971F774411BFA700065292502DA6B8BBFF36 org.openjfx:javafx-base:23.0.2:mac-aarch64 +F17565955B614E6F1A7BC4BB4A81AB764A1D7126 org.openjfx:javafx-controls:23.0.2:mac-aarch64 +974BD044704F4DB84D041488E387369E09190363 org.openjfx:javafx-graphics:23.0.2:mac-aarch64 +D8D24541DF99DD7FACCC86C13570D88F553C63F7 org.openjfx:javafx-media:23.0.2:mac-aarch64 +0D963484C7F71305C81F68308AA7DFD3A22EF9E7 org.openjfx:javafx-web:23.0.2:mac-aarch64 +D6406FB857AB77732DEC3992B6C45C1DFDEEF957 org.openjfx:javafx-swing:23.0.2:mac-aarch64 \ No newline at end of file diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-base-21.0.9-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-base-21.0.9-mac-aarch64.jar.external deleted file mode 100644 index d15ef6c2d4ee..000000000000 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-base-21.0.9-mac-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 282218809 -URL: m2:/org.openjfx:javafx-base:21.0.9:jar:mac-aarch64 -MessageDigest: SHA-256 eb41a8159be86e3e76ee0f2e18b2bce85e8613da3188fdce13527a7dda644222 -MessageDigest: SHA-512 64190544229df43c1813bf0ead8b876bfcad6823f8b03233a3775b6d01080e535aee38edadb1ee7017a20d18216c2ef426070f0b02df6a887e855293ebaa949e diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-base-23.0.2-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-base-23.0.2-mac-aarch64.jar.external new file mode 100644 index 000000000000..2ad1ad758216 --- /dev/null +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-base-23.0.2-mac-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 173070098 +URL: m2:/org.openjfx:javafx-base:23.0.2:jar:mac-aarch64 +MessageDigest: SHA-256 1e0b22c5a79239df71f7658379d896acc6f37411ce78d1235d6c3839defdfbeb +MessageDigest: SHA-512 b7308e3613d6f6dcb29b7c91612af99a326a54d743c0ddce7b7bf1d7f43855bab77f8c45eae32262e308c4cd88afe4945db44286bd0e9bf83a4ca871f7b5676a diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-controls-21.0.9-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-controls-21.0.9-mac-aarch64.jar.external deleted file mode 100644 index d0fcd4a7eb63..000000000000 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-controls-21.0.9-mac-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 767857060 -URL: m2:/org.openjfx:javafx-controls:21.0.9:jar:mac-aarch64 -MessageDigest: SHA-256 d5abb1fbfccf5cd678e13ff79446f4b4bf306413b3147e8df78dccd1c98a43f1 -MessageDigest: SHA-512 80b8d5a0a375a38e77589f02ddc099216920c6d03780aa104ec6b846f499888475fcaac54cb19698d6652d816042804193bce0eeed79035748abd928f87376a9 diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-controls-23.0.2-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-controls-23.0.2-mac-aarch64.jar.external new file mode 100644 index 000000000000..cb1aa10a32ab --- /dev/null +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-controls-23.0.2-mac-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 2351314974 +URL: m2:/org.openjfx:javafx-controls:23.0.2:jar:mac-aarch64 +MessageDigest: SHA-256 39d923ab76f456784f189ff022a5437994726c79f40680540060a16cb259631f +MessageDigest: SHA-512 2e1dc4a24783158489191c3fdb2e7911ce15e38603a0347f86e8ab889a1a923db587aceaa27e3b18a1ae08148e8119aeffadfa1338db0e4621652a77f3ad73cf diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-graphics-21.0.9-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-graphics-21.0.9-mac-aarch64.jar.external deleted file mode 100644 index 8155a358fcda..000000000000 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-graphics-21.0.9-mac-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 245061202 -URL: m2:/org.openjfx:javafx-graphics:21.0.9:jar:mac-aarch64 -MessageDigest: SHA-256 e78affd7b4b2c3704716fa4097a7427152e23de353e384618ca87747068646df -MessageDigest: SHA-512 821d759552fc2bfc96f2d1396a7cf3134d5b7bfd11a35cf669ea0bda3ec659a8f1d4af41e97437c9608a1461f610ffd0b8f4ee1db7f9f37879de69a4ed50367f diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-graphics-23.0.2-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-graphics-23.0.2-mac-aarch64.jar.external new file mode 100644 index 000000000000..f59a1737f086 --- /dev/null +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-graphics-23.0.2-mac-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 1684426460 +URL: m2:/org.openjfx:javafx-graphics:23.0.2:jar:mac-aarch64 +MessageDigest: SHA-256 774f9d4980980730573e5b56f335203507522b7961953d8ed9a7a32b064c201e +MessageDigest: SHA-512 719b2b8a2b10b1962f06585090a3c138341c8d72ee1160e587818d0b652545aefc3f25cc231feb1101c9f44898a0b3872b76a3c73524a545ccbfd3313e233bf3 diff --git a/extra/libs.javafx.linux.aarch64/external/javafx-linux-aarch64-21-license.txt b/extra/libs.javafx.macosx.aarch64/external/javafx-mac-aarch64-23.0.2-license.txt similarity index 98% rename from extra/libs.javafx.linux.aarch64/external/javafx-linux-aarch64-21-license.txt rename to extra/libs.javafx.macosx.aarch64/external/javafx-mac-aarch64-23.0.2-license.txt index 1e6d3658c758..7e54424150f0 100644 --- a/extra/libs.javafx.linux.aarch64/external/javafx-linux-aarch64-21-license.txt +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-mac-aarch64-23.0.2-license.txt @@ -1,10 +1,10 @@ Name: JavaFX Description: JavaFX API and Implementation -Version: 21 +Version: 23.0.2 License: GPL-2-CP Origin: https://github.com/openjdk/jfx -Source: https://github.com/openjdk/jfx/tree/jfx21 -Files: javafx-base-21-linux-aarch64.jar, javafx-controls-21-linux-aarch64.jar, javafx-graphics-21-linux-aarch64.jar, javafx-media-21-linux-aarch64.jar, javafx-swing-21-linux-aarch64.jar, javafx-web-21-linux-aarch64.jar +Source: https://github.com/openjdk/jfx23u/tree/23.0.2-ga +Files: javafx-base-23.0.2-mac-aarch64.jar, javafx-controls-23.0.2-mac-aarch64.jar, javafx-graphics-23.0.2-mac-aarch64.jar, javafx-media-23.0.2-mac-aarch64.jar, javafx-swing-23.0.2-mac-aarch64.jar, javafx-web-23.0.2-mac-aarch64.jar Type: compile-time,optional Comment: Used at compile. Possibly downloaded later. diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-media-21.0.9-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-media-21.0.9-mac-aarch64.jar.external deleted file mode 100644 index 55387723d080..000000000000 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-media-21.0.9-mac-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1389397508 -URL: m2:/org.openjfx:javafx-media:21.0.9:jar:mac-aarch64 -MessageDigest: SHA-256 41128c2011b61deb609c37a98e672248ed143ce64415a1934af7663a39e80e94 -MessageDigest: SHA-512 1c464fffa45d7c551c8b4cc79a87d4c6c720084cfdda2d52776150e58bf50e14db4502d90a6c0df6ad65874ac10dbda77ce70aae4b4e166d64d4615795cac869 diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-media-23.0.2-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-media-23.0.2-mac-aarch64.jar.external new file mode 100644 index 000000000000..b9b0821ec4c0 --- /dev/null +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-media-23.0.2-mac-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 1207145089 +URL: m2:/org.openjfx:javafx-media:23.0.2:jar:mac-aarch64 +MessageDigest: SHA-256 3f7499c1551d873cadaa94e7f4445bbe71ca4326d7578d8aeea9ceccb395b1de +MessageDigest: SHA-512 4fa6cb9f64831ca6671637c5ca685298d40cf2da8260c956d776d5715c5f84069640235fdf5b94ec1ac9937b5593c2a8d1977ed481418cc3213a1f7b54608d62 diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-swing-21.0.9-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-swing-21.0.9-mac-aarch64.jar.external deleted file mode 100644 index 93010ee5c0c4..000000000000 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-swing-21.0.9-mac-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1558164446 -URL: m2:/org.openjfx:javafx-swing:21.0.9:jar:mac-aarch64 -MessageDigest: SHA-256 9559ca8feda141d60511a72b832a3e50d5aaa8ecbcf01fefcb629f13ed690065 -MessageDigest: SHA-512 0f2d92aecac7d361164eb4390ca269a67b3aa054604e156b88e2a86fe29de46a3dc7c309919012008c9eb19da238f4350a2e227e2bb9933a854892a3ba3228cf diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-swing-23.0.2-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-swing-23.0.2-mac-aarch64.jar.external new file mode 100644 index 000000000000..c85b196e54b4 --- /dev/null +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-swing-23.0.2-mac-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 182371616 +URL: m2:/org.openjfx:javafx-swing:23.0.2:jar:mac-aarch64 +MessageDigest: SHA-256 660c433d078bcf86b3f08110558c6e727529ef666e82f87802673a2ef9c5aee1 +MessageDigest: SHA-512 9311b86100c0d7dd03077fb2204f1aff7baee7c8681f5b41c05acd1fb45b45d9050ebaf7ef7684237c93ec07e4100fdf69f67ce4cbf080afd7e5c60a04feeae7 diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-web-21.0.9-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-web-21.0.9-mac-aarch64.jar.external deleted file mode 100644 index b8d32ea94b00..000000000000 --- a/extra/libs.javafx.macosx.aarch64/external/javafx-web-21.0.9-mac-aarch64.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 4098006075 -URL: m2:/org.openjfx:javafx-web:21.0.9:jar:mac-aarch64 -MessageDigest: SHA-256 808882d235afa10e3a5369781f426617b50ad1b55ccb9f03a0a34bec5f8a6d04 -MessageDigest: SHA-512 5739a90dfcaaca6952ba53c38f1a66c7894693759d1c40399dd65b8b3ff4d50e66675cbcd0ac26f224589acc4ec8f1ac6a813c89031f469edba2fef2345c32a1 diff --git a/extra/libs.javafx.macosx.aarch64/external/javafx-web-23.0.2-mac-aarch64.jar.external b/extra/libs.javafx.macosx.aarch64/external/javafx-web-23.0.2-mac-aarch64.jar.external new file mode 100644 index 000000000000..3bdabcbc0481 --- /dev/null +++ b/extra/libs.javafx.macosx.aarch64/external/javafx-web-23.0.2-mac-aarch64.jar.external @@ -0,0 +1,4 @@ +CRC: 358024989 +URL: m2:/org.openjfx:javafx-web:23.0.2:jar:mac-aarch64 +MessageDigest: SHA-256 e837a157aa0cb6874818f09d9dbb32faa7affd03c247c537f9340c26e419325a +MessageDigest: SHA-512 6d12ecc69a56f987f2d0fc9f27687480375401d178a72cf286cfe1e8b53f47357eeddabd268b5f1ff5eeaa8604281c369a193281316a9c39577cd6d0ebd94b70 diff --git a/extra/libs.javafx.macosx.aarch64/licenseinfo.xml b/extra/libs.javafx.macosx.aarch64/licenseinfo.xml index cc030cdfa3fe..2825df898411 100644 --- a/extra/libs.javafx.macosx.aarch64/licenseinfo.xml +++ b/extra/libs.javafx.macosx.aarch64/licenseinfo.xml @@ -21,12 +21,12 @@ --> - external/javafx-base-21.0.9-mac-aarch64.jar.external - external/javafx-controls-21.0.9-mac-aarch64.jar.external - external/javafx-graphics-21.0.9-mac-aarch64.jar.external - external/javafx-media-21.0.9-mac-aarch64.jar.external - external/javafx-swing-21.0.9-mac-aarch64.jar.external - external/javafx-web-21.0.9-mac-aarch64.jar.external + external/javafx-base-23.0.2-mac-aarch64.jar.external + external/javafx-controls-23.0.2-mac-aarch64.jar.external + external/javafx-graphics-23.0.2-mac-aarch64.jar.external + external/javafx-media-23.0.2-mac-aarch64.jar.external + external/javafx-swing-23.0.2-mac-aarch64.jar.external + external/javafx-web-23.0.2-mac-aarch64.jar.external diff --git a/extra/libs.javafx.macosx.aarch64/manifest.mf b/extra/libs.javafx.macosx.aarch64/manifest.mf index 4af35181480b..9639fc8acbc2 100644 --- a/extra/libs.javafx.macosx.aarch64/manifest.mf +++ b/extra/libs.javafx.macosx.aarch64/manifest.mf @@ -3,6 +3,6 @@ AutoUpdate-Show-In-Client: true OpenIDE-Module: org.netbeans.libs.javafx.macosx.aarch64 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/macosx/aarch64/Bundle.properties OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx -OpenIDE-Module-Specification-Version: 21.2 +OpenIDE-Module-Specification-Version: 23.0 OpenIDE-Module-Requires: org.openide.modules.os.MacOSX, org.openide.modules.arch.aarch64 OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX diff --git a/extra/libs.javafx.macosx.aarch64/nbproject/project.properties b/extra/libs.javafx.macosx.aarch64/nbproject/project.properties index 662f5cdee443..1bb55da78e23 100644 --- a/extra/libs.javafx.macosx.aarch64/nbproject/project.properties +++ b/extra/libs.javafx.macosx.aarch64/nbproject/project.properties @@ -15,21 +15,21 @@ # specific language governing permissions and limitations # under the License. -javac.release=17 +javac.release=21 javac.compilerargs=-Xlint -Xlint:-serial is.autoload=true -release.external/javafx-base-21.0.9-mac-aarch64.jar=modules/ext/javafx-base-21.0.9-mac-aarch64.jar -release.external/javafx-base-21.0.9-mac-aarch64.jar.external=modules/ext/javafx-base-21.0.9-mac-aarch64.jar.external -release.external/javafx-controls-21.0.9-mac-aarch64.jar=modules/ext/javafx-controls-21.0.9-mac-aarch64.jar -release.external/javafx-controls-21.0.9-mac-aarch64.jar.external=modules/ext/javafx-controls-21.0.9-mac-aarch64.jar.external -release.external/javafx-graphics-21.0.9-mac-aarch64.jar=modules/ext/javafx-graphics-21.0.9-mac-aarch64.jar -release.external/javafx-graphics-21.0.9-mac-aarch64.jar.external=modules/ext/javafx-graphics-21.0.9-mac-aarch64.jar.external -release.external/javafx-media-21.0.9-mac-aarch64.jar=modules/ext/javafx-media-21.0.9-mac-aarch64.jar -release.external/javafx-media-21.0.9-mac-aarch64.jar.external=modules/ext/javafx-media-21.0.9-mac-aarch64.jar.external -release.external/javafx-swing-21.0.9-mac-aarch64.jar=modules/ext/javafx-swing-21.0.9-mac-aarch64.jar -release.external/javafx-swing-21.0.9-mac-aarch64.jar.external=modules/ext/javafx-swing-21.0.9-mac-aarch64.jar.external -release.external/javafx-web-21.0.9-mac-aarch64.jar=modules/ext/javafx-web-21.0.9-mac-aarch64.jar -release.external/javafx-web-21.0.9-mac-aarch64.jar.external=modules/ext/javafx-web-21.0.9-mac-aarch64.jar.external +release.external/javafx-base-23.0.2-mac-aarch64.jar=modules/ext/javafx-base-23.0.2-mac-aarch64.jar +release.external/javafx-base-23.0.2-mac-aarch64.jar.external=modules/ext/javafx-base-23.0.2-mac-aarch64.jar.external +release.external/javafx-controls-23.0.2-mac-aarch64.jar=modules/ext/javafx-controls-23.0.2-mac-aarch64.jar +release.external/javafx-controls-23.0.2-mac-aarch64.jar.external=modules/ext/javafx-controls-23.0.2-mac-aarch64.jar.external +release.external/javafx-graphics-23.0.2-mac-aarch64.jar=modules/ext/javafx-graphics-23.0.2-mac-aarch64.jar +release.external/javafx-graphics-23.0.2-mac-aarch64.jar.external=modules/ext/javafx-graphics-23.0.2-mac-aarch64.jar.external +release.external/javafx-media-23.0.2-mac-aarch64.jar=modules/ext/javafx-media-23.0.2-mac-aarch64.jar +release.external/javafx-media-23.0.2-mac-aarch64.jar.external=modules/ext/javafx-media-23.0.2-mac-aarch64.jar.external +release.external/javafx-swing-23.0.2-mac-aarch64.jar=modules/ext/javafx-swing-23.0.2-mac-aarch64.jar +release.external/javafx-swing-23.0.2-mac-aarch64.jar.external=modules/ext/javafx-swing-23.0.2-mac-aarch64.jar.external +release.external/javafx-web-23.0.2-mac-aarch64.jar=modules/ext/javafx-web-23.0.2-mac-aarch64.jar +release.external/javafx-web-23.0.2-mac-aarch64.jar.external=modules/ext/javafx-web-23.0.2-mac-aarch64.jar.external license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP diff --git a/extra/libs.javafx.macosx.aarch64/nbproject/project.xml b/extra/libs.javafx.macosx.aarch64/nbproject/project.xml index 2545da5868d9..0c55f1c3e10e 100644 --- a/extra/libs.javafx.macosx.aarch64/nbproject/project.xml +++ b/extra/libs.javafx.macosx.aarch64/nbproject/project.xml @@ -26,46 +26,54 @@ org.netbeans.libs.javafx.macosx.aarch64 - org.openide.modules + org.netbeans.libs.javafx - 7.40 + 2.10 - org.netbeans.libs.javafx + org.netbeans.libs.jsobject - 2.10 + 25.0 + + + + org.openide.modules + + + + 7.40 - ext/javafx-base-21.0.9-mac-aarch64.jar - external/javafx-base-21.0.9-mac-aarch64.jar + ext/javafx-base-23.0.2-mac-aarch64.jar + external/javafx-base-23.0.2-mac-aarch64.jar - ext/javafx-controls-21.0.9-mac-aarch64.jar - external/javafx-controls-21.0.9-mac-aarch64.jar + ext/javafx-controls-23.0.2-mac-aarch64.jar + external/javafx-controls-23.0.2-mac-aarch64.jar - ext/javafx-graphics-21.0.9-mac-aarch64.jar - external/javafx-graphics-21.0.9-mac-aarch64.jar + ext/javafx-graphics-23.0.2-mac-aarch64.jar + external/javafx-graphics-23.0.2-mac-aarch64.jar - ext/javafx-media-21.0.9-mac-aarch64.jar - external/javafx-media-21.0.9-mac-aarch64.jar + ext/javafx-media-23.0.2-mac-aarch64.jar + external/javafx-media-23.0.2-mac-aarch64.jar - ext/javafx-swing-21.0.9-mac-aarch64.jar - external/javafx-swing-21.0.9-mac-aarch64.jar + ext/javafx-swing-23.0.2-mac-aarch64.jar + external/javafx-swing-23.0.2-mac-aarch64.jar - ext/javafx-web-21.0.9-mac-aarch64.jar - external/javafx-web-21.0.9-mac-aarch64.jar + ext/javafx-web-23.0.2-mac-aarch64.jar + external/javafx-web-23.0.2-mac-aarch64.jar diff --git a/extra/libs.javafx.macosx/external/binaries-list b/extra/libs.javafx.macosx/external/binaries-list index af14b783b483..145bee195ffa 100644 --- a/extra/libs.javafx.macosx/external/binaries-list +++ b/extra/libs.javafx.macosx/external/binaries-list @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. -6F2624207F25BA298B932442E98958F0448B3162 org.openjfx:javafx-base:21.0.9:mac -2F81DE0300C770DBB69C8F7FA04A82E37D2F4ADA org.openjfx:javafx-controls:21.0.9:mac -364129A31DB42C116510562A4759EDE190CC2FB5 org.openjfx:javafx-graphics:21.0.9:mac -C9409DF3B35307DBE7BEB990641525F77C34D438 org.openjfx:javafx-media:21.0.9:mac -57078207547FB2853522197E4E348AF7DB229188 org.openjfx:javafx-web:21.0.9:mac -60DF4680CB01B3DBFB0EC20D5D79F32421B6A38A org.openjfx:javafx-swing:21.0.9:mac \ No newline at end of file +7E554E1BCA86D36F63AAC872D6082AC9787B1891 org.openjfx:javafx-base:23.0.2:mac +11860DC0CA73484B4AAD8199D697D7BC2D2EDBFF org.openjfx:javafx-controls:23.0.2:mac +E7EE216581EF0B3D1122761CA11B910637EC5B7E org.openjfx:javafx-graphics:23.0.2:mac +121DA0FEC2FACC42709B1CD231CC731AD9C7DB4A org.openjfx:javafx-media:23.0.2:mac +F24B9D92B76E85EE74DC9FA29FB7EFBDD27CD484 org.openjfx:javafx-web:23.0.2:mac +9B199A19987DDB87DA67F0C789F5A4F54DBCD4B7 org.openjfx:javafx-swing:23.0.2:mac \ No newline at end of file diff --git a/extra/libs.javafx.macosx/external/javafx-base-21.0.9-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-base-21.0.9-mac.jar.external deleted file mode 100644 index 3743454ce3aa..000000000000 --- a/extra/libs.javafx.macosx/external/javafx-base-21.0.9-mac.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1613781829 -URL: m2:/org.openjfx:javafx-base:21.0.9:jar:mac -MessageDigest: SHA-256 77563ef0a587cb61069253e793bda6db6c05e7a08024b3a21ced2f0d8a5130c9 -MessageDigest: SHA-512 b95513e1e38203860cc914a73beedcaff5f168a702f8bd1f56c0ad3b439cfa8ad0ef472e5c9fb2c3d2eb8c980b881ed54d814a0e3b00095cae69c3079fe2474a diff --git a/extra/libs.javafx.macosx/external/javafx-base-23.0.2-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-base-23.0.2-mac.jar.external new file mode 100644 index 000000000000..db9d8beea9e5 --- /dev/null +++ b/extra/libs.javafx.macosx/external/javafx-base-23.0.2-mac.jar.external @@ -0,0 +1,4 @@ +CRC: 3640460330 +URL: m2:/org.openjfx:javafx-base:23.0.2:jar:mac +MessageDigest: SHA-256 a1296803c18445df196cca1a54608a99f5a85f5d69971e6d55cb891f67932ee8 +MessageDigest: SHA-512 04aee3daa29b3cdf33e7d6497e5e66ca192f6d551c6704449d72bfaa96076c41b61001b84bfc76fc0c6ee0f65131fa00b8fceb169cbc7a30095ad8f6603300e9 diff --git a/extra/libs.javafx.macosx/external/javafx-controls-21.0.9-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-controls-21.0.9-mac.jar.external deleted file mode 100644 index 2190a7bfa52a..000000000000 --- a/extra/libs.javafx.macosx/external/javafx-controls-21.0.9-mac.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 3608029297 -URL: m2:/org.openjfx:javafx-controls:21.0.9:jar:mac -MessageDigest: SHA-256 5d32885166eba7f8e6d347ea9f95844b2f3e5f8acdb6b51bd8be92727a98d38e -MessageDigest: SHA-512 fb69ee3a05a233f0dbf17fd6af8db6da1d4bf15f9f5c5a3de31f819e72989981b542cf2f18ed0252e758fe3403cb4ba56bf111aed10c0cf2667a91bd2a37221d diff --git a/extra/libs.javafx.macosx/external/javafx-controls-23.0.2-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-controls-23.0.2-mac.jar.external new file mode 100644 index 000000000000..351dcaddef1f --- /dev/null +++ b/extra/libs.javafx.macosx/external/javafx-controls-23.0.2-mac.jar.external @@ -0,0 +1,4 @@ +CRC: 332862269 +URL: m2:/org.openjfx:javafx-controls:23.0.2:jar:mac +MessageDigest: SHA-256 48d3bc4c260cc59f34dbd589df347d002416ac6835b2d5dda6d8453924de645e +MessageDigest: SHA-512 88c927869def6d1cb7d119b046d99b46b0938747e8d9134385419af17fdd3c2abeaf451f4d0cd4b6671baa206b7479c213cd7aaaffd2607c37adf32d55567ca4 diff --git a/extra/libs.javafx.macosx/external/javafx-graphics-21.0.9-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-graphics-21.0.9-mac.jar.external deleted file mode 100644 index 88caa5d99340..000000000000 --- a/extra/libs.javafx.macosx/external/javafx-graphics-21.0.9-mac.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 497390751 -URL: m2:/org.openjfx:javafx-graphics:21.0.9:jar:mac -MessageDigest: SHA-256 b18362d022a0071a8b5c21ec906d0a27587ed300eec7c0e8cd46beba5879b9a8 -MessageDigest: SHA-512 96416251c72db6de53cbb2b54b82d145eca55651c72ccf3bc36569f95ebc2811ad8e2f01b7d7c0d5130ed0e0a30eacd7811dd62a1164d176655a77d3f112c0fa diff --git a/extra/libs.javafx.macosx/external/javafx-graphics-23.0.2-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-graphics-23.0.2-mac.jar.external new file mode 100644 index 000000000000..9b6a99ad76ee --- /dev/null +++ b/extra/libs.javafx.macosx/external/javafx-graphics-23.0.2-mac.jar.external @@ -0,0 +1,4 @@ +CRC: 1195379238 +URL: m2:/org.openjfx:javafx-graphics:23.0.2:jar:mac +MessageDigest: SHA-256 b7e1185342dc9a32df7a5ebe9bdee3f4172b619653eb744a3271f64faa1202dc +MessageDigest: SHA-512 3399a1dfc807d55a085e001eee28079760e0218072f8f1dfa036397ccb87dadc2eeda240ce6d393ca10b8b7149263decaa6e201e4fc204b6ba699c9d35c4dc77 diff --git a/extra/libs.javafx.win/external/javafx-win-21.0.9-license.txt b/extra/libs.javafx.macosx/external/javafx-mac-23.0.2-license.txt similarity index 98% rename from extra/libs.javafx.win/external/javafx-win-21.0.9-license.txt rename to extra/libs.javafx.macosx/external/javafx-mac-23.0.2-license.txt index 1bf972489af0..7aefd0fb7e7c 100644 --- a/extra/libs.javafx.win/external/javafx-win-21.0.9-license.txt +++ b/extra/libs.javafx.macosx/external/javafx-mac-23.0.2-license.txt @@ -1,10 +1,10 @@ Name: JavaFX Description: JavaFX API and Implementation -Version: 21.0.9 +Version: 23.0.2 License: GPL-2-CP Origin: https://github.com/openjdk/jfx -Source: https://github.com/openjdk/jfx21u/tree/21.0.9%2B1 -Files: javafx-base-21.0.9-win.jar, javafx-controls-21.0.9-win.jar, javafx-graphics-21.0.9-win.jar, javafx-media-21.0.9-win.jar, javafx-swing-21.0.9-win.jar, javafx-web-21.0.9-win.jar +Source: https://github.com/openjdk/jfx23u/tree/23.0.2-ga +Files: javafx-base-23.0.2-mac.jar, javafx-controls-23.0.2-mac.jar, javafx-graphics-23.0.2-mac.jar, javafx-media-23.0.2-mac.jar, javafx-swing-23.0.2-mac.jar, javafx-web-23.0.2-mac.jar Type: compile-time,optional Comment: Used at compile. Possibly downloaded later. diff --git a/extra/libs.javafx.macosx/external/javafx-media-21.0.9-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-media-21.0.9-mac.jar.external deleted file mode 100644 index b0e04aa7acc6..000000000000 --- a/extra/libs.javafx.macosx/external/javafx-media-21.0.9-mac.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 2992533312 -URL: m2:/org.openjfx:javafx-media:21.0.9:jar:mac -MessageDigest: SHA-256 75ad8ed3f24123f6957f5e354fbb490a3e122c656d06849a8880cc66c31eb7fd -MessageDigest: SHA-512 f2db4dc29a76ae2f451231f359abcd5ae5409d5721e653f911076f0b01b206d38218203d1145753c713c5ae24de02560043961c4bf3eaac2d570b530492e44d2 diff --git a/extra/libs.javafx.macosx/external/javafx-media-23.0.2-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-media-23.0.2-mac.jar.external new file mode 100644 index 000000000000..7a8ecbf055a4 --- /dev/null +++ b/extra/libs.javafx.macosx/external/javafx-media-23.0.2-mac.jar.external @@ -0,0 +1,4 @@ +CRC: 3851233848 +URL: m2:/org.openjfx:javafx-media:23.0.2:jar:mac +MessageDigest: SHA-256 b76e2a3b1f09b05ed1b1841e31aa8a7c77d7a5a3a9b835aae8dc1e9349e354b5 +MessageDigest: SHA-512 00709d34f60bd4b41496f05d1378acf72d7f9b60876413cab26b16cb29da49e5d39bba4121ac4d37d5f605bb0d9798b02a8560c5d17dc15a86054aa3e65c6261 diff --git a/extra/libs.javafx.macosx/external/javafx-swing-21.0.9-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-swing-21.0.9-mac.jar.external deleted file mode 100644 index 6c9c8d2a623a..000000000000 --- a/extra/libs.javafx.macosx/external/javafx-swing-21.0.9-mac.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 3422209572 -URL: m2:/org.openjfx:javafx-swing:21.0.9:jar:mac -MessageDigest: SHA-256 e3b3933b0d065e3a650c9ebb18b2a47146cfab390542b0464bcd87329af07054 -MessageDigest: SHA-512 1c8d2d73ef73217dfe20e694836242fad46c9b55ea9938cea0d7082a5b1a7e967d946955619d27fd4ab7d33d4157d25854d81130985920ad8f336d31c2aae002 diff --git a/extra/libs.javafx.macosx/external/javafx-swing-23.0.2-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-swing-23.0.2-mac.jar.external new file mode 100644 index 000000000000..4c6905c44d16 --- /dev/null +++ b/extra/libs.javafx.macosx/external/javafx-swing-23.0.2-mac.jar.external @@ -0,0 +1,4 @@ +CRC: 2430170727 +URL: m2:/org.openjfx:javafx-swing:23.0.2:jar:mac +MessageDigest: SHA-256 f6f510dcd080addbeb7e294b80d05b45341001f36df032204285d00ec5845fba +MessageDigest: SHA-512 222eb304bef3e47da6362267edc082f64df0041f0d2a0a26ae8582f71af51acb4e6f1e4711e8537183a486542454eb46f66b2d3b9dd7c409e9e00d543ebcfd81 diff --git a/extra/libs.javafx.macosx/external/javafx-web-21.0.9-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-web-21.0.9-mac.jar.external deleted file mode 100644 index 558f9acf661a..000000000000 --- a/extra/libs.javafx.macosx/external/javafx-web-21.0.9-mac.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1396733443 -URL: m2:/org.openjfx:javafx-web:21.0.9:jar:mac -MessageDigest: SHA-256 b7f2b04eb25da55d2f58159777b715834bbd4463e179f372edd6dd9ede5d6d42 -MessageDigest: SHA-512 bae94de8aa0dcfcc437c4058d4db5b5dfee1323308544f8affe711bf1e1e15126db85f00fc9ef6062aab3344c8ebcd33895082aeefa7e52622922ec85121ab1d diff --git a/extra/libs.javafx.macosx/external/javafx-web-23.0.2-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-web-23.0.2-mac.jar.external new file mode 100644 index 000000000000..2bd070292f35 --- /dev/null +++ b/extra/libs.javafx.macosx/external/javafx-web-23.0.2-mac.jar.external @@ -0,0 +1,4 @@ +CRC: 1049561677 +URL: m2:/org.openjfx:javafx-web:23.0.2:jar:mac +MessageDigest: SHA-256 1458af5b9eda13628bd68fcbdd5bbbb0269cf6c85eb8c54160ab4d2537b8c60d +MessageDigest: SHA-512 8458c750305094955719b61e964d7008172c9b9be12c53ad6717336d4848d5b246b6c8567e7c4aed3139715cf1048dbcee2efd0c70054f4cfff645940a12467a diff --git a/extra/libs.javafx.macosx/licenseinfo.xml b/extra/libs.javafx.macosx/licenseinfo.xml index e1fd724c27dd..432487384a37 100644 --- a/extra/libs.javafx.macosx/licenseinfo.xml +++ b/extra/libs.javafx.macosx/licenseinfo.xml @@ -21,12 +21,12 @@ --> - external/javafx-base-21.0.9-mac.jar.external - external/javafx-controls-21.0.9-mac.jar.external - external/javafx-graphics-21.0.9-mac.jar.external - external/javafx-media-21.0.9-mac.jar.external - external/javafx-swing-21.0.9-mac.jar.external - external/javafx-web-21.0.9-mac.jar.external + external/javafx-base-23.0.2-mac.jar.external + external/javafx-controls-23.0.2-mac.jar.external + external/javafx-graphics-23.0.2-mac.jar.external + external/javafx-media-23.0.2-mac.jar.external + external/javafx-swing-23.0.2-mac.jar.external + external/javafx-web-23.0.2-mac.jar.external diff --git a/extra/libs.javafx.macosx/manifest.mf b/extra/libs.javafx.macosx/manifest.mf index 5149d46624d4..8cd5a9e79802 100644 --- a/extra/libs.javafx.macosx/manifest.mf +++ b/extra/libs.javafx.macosx/manifest.mf @@ -3,6 +3,6 @@ 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: 21.2 +OpenIDE-Module-Specification-Version: 23.0 OpenIDE-Module-Requires: org.openide.modules.os.MacOSX, org.openide.modules.arch.x86_64 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 6b0772103187..c2c6d650a01f 100644 --- a/extra/libs.javafx.macosx/nbproject/project.properties +++ b/extra/libs.javafx.macosx/nbproject/project.properties @@ -15,21 +15,21 @@ # specific language governing permissions and limitations # under the License. -javac.release=17 +javac.release=21 javac.compilerargs=-Xlint -Xlint:-serial is.autoload=true -release.external/javafx-base-21.0.9-mac.jar=modules/ext/javafx-base-21.0.9-mac.jar -release.external/javafx-base-21.0.9-mac.jar.external=modules/ext/javafx-base-21.0.9-mac.jar.external -release.external/javafx-controls-21.0.9-mac.jar=modules/ext/javafx-controls-21.0.9-mac.jar -release.external/javafx-controls-21.0.9-mac.jar.external=modules/ext/javafx-controls-21.0.9-mac.jar.external -release.external/javafx-graphics-21.0.9-mac.jar=modules/ext/javafx-graphics-21.0.9-mac.jar -release.external/javafx-graphics-21.0.9-mac.jar.external=modules/ext/javafx-graphics-21.0.9-mac.jar.external -release.external/javafx-media-21.0.9-mac.jar=modules/ext/javafx-media-21.0.9-mac.jar -release.external/javafx-media-21.0.9-mac.jar.external=modules/ext/javafx-media-21.0.9-mac.jar.external -release.external/javafx-swing-21.0.9-mac.jar=modules/ext/javafx-swing-21.0.9-mac.jar -release.external/javafx-swing-21.0.9-mac.jar.external=modules/ext/javafx-swing-21.0.9-mac.jar.external -release.external/javafx-web-21.0.9-mac.jar=modules/ext/javafx-web-21.0.9-mac.jar -release.external/javafx-web-21.0.9-mac.jar.external=modules/ext/javafx-web-21.0.9-mac.jar.external +release.external/javafx-base-23.0.2-mac.jar=modules/ext/javafx-base-23.0.2-mac.jar +release.external/javafx-base-23.0.2-mac.jar.external=modules/ext/javafx-base-23.0.2-mac.jar.external +release.external/javafx-controls-23.0.2-mac.jar=modules/ext/javafx-controls-23.0.2-mac.jar +release.external/javafx-controls-23.0.2-mac.jar.external=modules/ext/javafx-controls-23.0.2-mac.jar.external +release.external/javafx-graphics-23.0.2-mac.jar=modules/ext/javafx-graphics-23.0.2-mac.jar +release.external/javafx-graphics-23.0.2-mac.jar.external=modules/ext/javafx-graphics-23.0.2-mac.jar.external +release.external/javafx-media-23.0.2-mac.jar=modules/ext/javafx-media-23.0.2-mac.jar +release.external/javafx-media-23.0.2-mac.jar.external=modules/ext/javafx-media-23.0.2-mac.jar.external +release.external/javafx-swing-23.0.2-mac.jar=modules/ext/javafx-swing-23.0.2-mac.jar +release.external/javafx-swing-23.0.2-mac.jar.external=modules/ext/javafx-swing-23.0.2-mac.jar.external +release.external/javafx-web-23.0.2-mac.jar=modules/ext/javafx-web-23.0.2-mac.jar +release.external/javafx-web-23.0.2-mac.jar.external=modules/ext/javafx-web-23.0.2-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 68b6ea6d0745..4888734ec485 100644 --- a/extra/libs.javafx.macosx/nbproject/project.xml +++ b/extra/libs.javafx.macosx/nbproject/project.xml @@ -26,46 +26,54 @@ org.netbeans.libs.javafx.macosx - org.openide.modules + org.netbeans.libs.javafx - 7.40 + 2.10 - org.netbeans.libs.javafx + org.netbeans.libs.jsobject - 2.10 + 25.0 + + + + org.openide.modules + + + + 7.40 - ext/javafx-base-21.0.9-mac.jar - external/javafx-base-21.0.9-mac.jar + ext/javafx-base-23.0.2-mac.jar + external/javafx-base-23.0.2-mac.jar - ext/javafx-controls-21.0.9-mac.jar - external/javafx-controls-21.0.9-mac.jar + ext/javafx-controls-23.0.2-mac.jar + external/javafx-controls-23.0.2-mac.jar - ext/javafx-graphics-21.0.9-mac.jar - external/javafx-graphics-21.0.9-mac.jar + ext/javafx-graphics-23.0.2-mac.jar + external/javafx-graphics-23.0.2-mac.jar - ext/javafx-media-21.0.9-mac.jar - external/javafx-media-21.0.9-mac.jar + ext/javafx-media-23.0.2-mac.jar + external/javafx-media-23.0.2-mac.jar - ext/javafx-swing-21.0.9-mac.jar - external/javafx-swing-21.0.9-mac.jar + ext/javafx-swing-23.0.2-mac.jar + external/javafx-swing-23.0.2-mac.jar - ext/javafx-web-21.0.9-mac.jar - external/javafx-web-21.0.9-mac.jar + ext/javafx-web-23.0.2-mac.jar + external/javafx-web-23.0.2-mac.jar diff --git a/extra/libs.javafx.win/external/binaries-list b/extra/libs.javafx.win/external/binaries-list index 32f3ad1f8862..c0b9939906b6 100644 --- a/extra/libs.javafx.win/external/binaries-list +++ b/extra/libs.javafx.win/external/binaries-list @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. -DA9D0F5CDB97E548097B7923F7F2E130FBB91319 org.openjfx:javafx-base:21.0.9:win -0865427A8056BE6B92882D20C6084593DAB84DD0 org.openjfx:javafx-controls:21.0.9:win -3B8EAA9115140E5B4FF7C82B6A4482F5922947BD org.openjfx:javafx-graphics:21.0.9:win -65B5F5291CD6B7D963FAB258DE46B2A982676159 org.openjfx:javafx-media:21.0.9:win -3BFEE03B64001EC60DA7D731FA8E08E2873A9228 org.openjfx:javafx-web:21.0.9:win -C8B50341213C6A0D37473122091F7AC1C9E6900A org.openjfx:javafx-swing:21.0.9:win \ No newline at end of file +E44E750005596DC44CE37C07FC3B8C10DA9AB354 org.openjfx:javafx-base:23.0.2:win +EA7A2048CE6B344273AFFB916713120FE77FB1E8 org.openjfx:javafx-controls:23.0.2:win +21ED994C9BA8A9D30099204C556E6DBA3A23F169 org.openjfx:javafx-graphics:23.0.2:win +B27F12B417DE89F6FD6180A6540F6F26AB98A0EE org.openjfx:javafx-media:23.0.2:win +9513D540DA2E54CF7DB3AC6CA1EF980CA91F25F5 org.openjfx:javafx-web:23.0.2:win +1D61C77AF59FA5179EF2671772BE10A8D0689A93 org.openjfx:javafx-swing:23.0.2:win \ No newline at end of file diff --git a/extra/libs.javafx.win/external/javafx-base-21.0.9-win.jar.external b/extra/libs.javafx.win/external/javafx-base-21.0.9-win.jar.external deleted file mode 100644 index f4655a8a7c65..000000000000 --- a/extra/libs.javafx.win/external/javafx-base-21.0.9-win.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 3360518620 -URL: m2:/org.openjfx:javafx-base:21.0.9:jar:win -MessageDigest: SHA-256 95d680b5d0b1ed9358376b12fc2f30f10e813f04f929e51698eb5507867cd408 -MessageDigest: SHA-512 d40695703d1ce037b4748a0e02ebeb6e4ccbca1e9d0dbdc9c8e7dbf2a384c9b909852d150b42a17a1a3ee06eff879bb1293cea40da65da59ac62af6d83c732b3 diff --git a/extra/libs.javafx.win/external/javafx-base-23.0.2-win.jar.external b/extra/libs.javafx.win/external/javafx-base-23.0.2-win.jar.external new file mode 100644 index 000000000000..3bf85b940b17 --- /dev/null +++ b/extra/libs.javafx.win/external/javafx-base-23.0.2-win.jar.external @@ -0,0 +1,4 @@ +CRC: 1853946012 +URL: m2:/org.openjfx:javafx-base:23.0.2:jar:win +MessageDigest: SHA-256 72f8958b4a552fca14ab3628c672f399aa68bbe6b4cd45107fe174b4670c7cb6 +MessageDigest: SHA-512 af754022c45ea3803dac8861948389982d046416afbdf01571492f9d12c521cce2e173175e43f5947aec304087422489a763c4fddf837c049b1258cbd32d1a05 diff --git a/extra/libs.javafx.win/external/javafx-controls-21.0.9-win.jar.external b/extra/libs.javafx.win/external/javafx-controls-21.0.9-win.jar.external deleted file mode 100644 index 1f4fd6c4dd7f..000000000000 --- a/extra/libs.javafx.win/external/javafx-controls-21.0.9-win.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 1236412947 -URL: m2:/org.openjfx:javafx-controls:21.0.9:jar:win -MessageDigest: SHA-256 991a8fbdcb289e717b3f5ada39d2c948d9a7cd8c798a9e2311a4b574274dd1e2 -MessageDigest: SHA-512 4446e56ec696d215a739f39d2458e5590c980d0d260e9768154fc592a5de35ad6796959ab42ea8efb6a14bf42fb1d67b07c1774a0e3b239ade7b3cc1f899d7fa diff --git a/extra/libs.javafx.win/external/javafx-controls-23.0.2-win.jar.external b/extra/libs.javafx.win/external/javafx-controls-23.0.2-win.jar.external new file mode 100644 index 000000000000..dbca8dbd4abe --- /dev/null +++ b/extra/libs.javafx.win/external/javafx-controls-23.0.2-win.jar.external @@ -0,0 +1,4 @@ +CRC: 1549361110 +URL: m2:/org.openjfx:javafx-controls:23.0.2:jar:win +MessageDigest: SHA-256 874daf48b0ec01e4eb0caf24cdb85b32d951999837f8e1c285f6d1e1e34870ba +MessageDigest: SHA-512 05f850ecba083319f23783c6953bfaf69bc72b6fd8b06cf156c1e9ec7080343a35ed95ca255c3c2b1b80111e515c0919c8bc188c2a5d4865b8007f76a0fc6f1a diff --git a/extra/libs.javafx.win/external/javafx-graphics-21.0.9-win.jar.external b/extra/libs.javafx.win/external/javafx-graphics-21.0.9-win.jar.external deleted file mode 100644 index 5973842fa9d3..000000000000 --- a/extra/libs.javafx.win/external/javafx-graphics-21.0.9-win.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 205267165 -URL: m2:/org.openjfx:javafx-graphics:21.0.9:jar:win -MessageDigest: SHA-256 97d85e83cf16964ab015ff735df6f7f11fe115f78144ca8f1949e89a8bfddd78 -MessageDigest: SHA-512 1ead130ac3eb0c2e637b186ce9968b078962ef23d6259ba424e83d46deaaaaec0abfdb23835243b1c1cb71f12da74782698d2259cfc6eda751bf8446ef150045 diff --git a/extra/libs.javafx.win/external/javafx-graphics-23.0.2-win.jar.external b/extra/libs.javafx.win/external/javafx-graphics-23.0.2-win.jar.external new file mode 100644 index 000000000000..df8b740ad867 --- /dev/null +++ b/extra/libs.javafx.win/external/javafx-graphics-23.0.2-win.jar.external @@ -0,0 +1,4 @@ +CRC: 3482008887 +URL: m2:/org.openjfx:javafx-graphics:23.0.2:jar:win +MessageDigest: SHA-256 6b5b3041f2735508a8aad23c5795e745d5bf78a0a6aa920bae43ab41ec22d8c2 +MessageDigest: SHA-512 7824d75cd2aa71c906beea4a99c262a960ab3e8f690a4f044b05f06c36c5d564264eb9a57faf65e4f462058b52a298ee58b37f9c6511a0b9ee1dba3bb204f9a1 diff --git a/extra/libs.javafx.win/external/javafx-media-21.0.9-win.jar.external b/extra/libs.javafx.win/external/javafx-media-21.0.9-win.jar.external deleted file mode 100644 index 90104b1bb059..000000000000 --- a/extra/libs.javafx.win/external/javafx-media-21.0.9-win.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 520056875 -URL: m2:/org.openjfx:javafx-media:21.0.9:jar:win -MessageDigest: SHA-256 2bde9e768cf62f2e38f6e509173d04f284c011dd20ff3ca49fa3ed2a00afd6dd -MessageDigest: SHA-512 5954c3e8e6ccb1b854436f8e432f4d21754aec47533c7819af3138e7056a1264877fc1fc5a6cc668fb1e5f494b0dce96d4a5efbb3996d1adcda6f9d948a1e510 diff --git a/extra/libs.javafx.win/external/javafx-media-23.0.2-win.jar.external b/extra/libs.javafx.win/external/javafx-media-23.0.2-win.jar.external new file mode 100644 index 000000000000..cbc3548ca488 --- /dev/null +++ b/extra/libs.javafx.win/external/javafx-media-23.0.2-win.jar.external @@ -0,0 +1,4 @@ +CRC: 18599532 +URL: m2:/org.openjfx:javafx-media:23.0.2:jar:win +MessageDigest: SHA-256 eb2ae99397333094172ad73c7689b6a48ae59b2b7a0d80d571521214f4a770ec +MessageDigest: SHA-512 719b3b5fbec161bb15d469aa590a9771c9fa099fefacad3da68fe9421ce48945b3d0efcfa076e15afd741160808a1c1c2fcea068648fd434d13d259148ad5480 diff --git a/extra/libs.javafx.win/external/javafx-swing-21.0.9-win.jar.external b/extra/libs.javafx.win/external/javafx-swing-21.0.9-win.jar.external deleted file mode 100644 index e23b0ada44f4..000000000000 --- a/extra/libs.javafx.win/external/javafx-swing-21.0.9-win.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 992382097 -URL: m2:/org.openjfx:javafx-swing:21.0.9:jar:win -MessageDigest: SHA-256 66a8a72f6ac586c016d2372fb94dec509b5fdc6816d38d96586d8349b67e1e4f -MessageDigest: SHA-512 72db56db269d66954c67833c22749f95c7d609189b7be6e040486da10428e6d22ee735b07e5b0b93baa8bb460a540ce38b874516b9c187e49b283680c6cf7f99 diff --git a/extra/libs.javafx.win/external/javafx-swing-23.0.2-win.jar.external b/extra/libs.javafx.win/external/javafx-swing-23.0.2-win.jar.external new file mode 100644 index 000000000000..5b302e5c7177 --- /dev/null +++ b/extra/libs.javafx.win/external/javafx-swing-23.0.2-win.jar.external @@ -0,0 +1,4 @@ +CRC: 55256777 +URL: m2:/org.openjfx:javafx-swing:23.0.2:jar:win +MessageDigest: SHA-256 875d14a5c2cf8ce04e5c48c39b5c9a3ff1d794820b8a473ec010af1c631afcb3 +MessageDigest: SHA-512 992583397946b925d2842d3db32f7ffc6d22c1aec6a251f42fc3ca1c01388b9cc6094e7775fce11c102810275972a190d0311b1ec6b2465a64777e5d3d8057c3 diff --git a/extra/libs.javafx.win/external/javafx-web-21.0.9-win.jar.external b/extra/libs.javafx.win/external/javafx-web-21.0.9-win.jar.external deleted file mode 100644 index 9470c23ede41..000000000000 --- a/extra/libs.javafx.win/external/javafx-web-21.0.9-win.jar.external +++ /dev/null @@ -1,4 +0,0 @@ -CRC: 634920556 -URL: m2:/org.openjfx:javafx-web:21.0.9:jar:win -MessageDigest: SHA-256 577d2893d521ba89f7afd3742e1f8082c3a10b1fd090a16ca2bfab45ca22a2f3 -MessageDigest: SHA-512 e111c1aab7a336826dbdd313c34a89798262449c1412b954f23a7c0977301ceb5ba92b73a67f4319df7783763c95db9cbe30d69b9440786132c88056803fecd8 diff --git a/extra/libs.javafx.win/external/javafx-web-23.0.2-win.jar.external b/extra/libs.javafx.win/external/javafx-web-23.0.2-win.jar.external new file mode 100644 index 000000000000..ff6b5d0d63d1 --- /dev/null +++ b/extra/libs.javafx.win/external/javafx-web-23.0.2-win.jar.external @@ -0,0 +1,4 @@ +CRC: 3563790898 +URL: m2:/org.openjfx:javafx-web:23.0.2:jar:win +MessageDigest: SHA-256 a18008ae0d3df1b8046a99d44f761dd01cce279ae1539a7e4685263aec2ea5fc +MessageDigest: SHA-512 42ad9a9770036ec5652dff5e50f593dcc1ff1d229ae3f5e148a177b9e85b4938175e45cc7646b2aea19b38a9a0313ebea7c45faca94ca685e9017114e277ce22 diff --git a/extra/libs.javafx.macosx/external/javafx-mac-21.0.9-license.txt b/extra/libs.javafx.win/external/javafx-win-23.0.2-license.txt similarity index 98% rename from extra/libs.javafx.macosx/external/javafx-mac-21.0.9-license.txt rename to extra/libs.javafx.win/external/javafx-win-23.0.2-license.txt index 2728ff24e3a5..d06c4547c6fc 100644 --- a/extra/libs.javafx.macosx/external/javafx-mac-21.0.9-license.txt +++ b/extra/libs.javafx.win/external/javafx-win-23.0.2-license.txt @@ -1,10 +1,10 @@ Name: JavaFX Description: JavaFX API and Implementation -Version: 21.0.9 +Version: 23.0.2 License: GPL-2-CP Origin: https://github.com/openjdk/jfx -Source: https://github.com/openjdk/jfx21u/tree/21.0.9%2B1 -Files: javafx-base-21.0.9-mac.jar, javafx-controls-21.0.9-mac.jar, javafx-graphics-21.0.9-mac.jar, javafx-media-21.0.9-mac.jar, javafx-swing-21.0.9-mac.jar, javafx-web-21.0.9-mac.jar +Source: https://github.com/openjdk/jfx23u/tree/23.0.2-ga +Files: javafx-base-23.0.2-win.jar, javafx-controls-23.0.2-win.jar, javafx-graphics-23.0.2-win.jar, javafx-media-23.0.2-win.jar, javafx-swing-23.0.2-win.jar, javafx-web-23.0.2-win.jar Type: compile-time,optional Comment: Used at compile. Possibly downloaded later. diff --git a/extra/libs.javafx.win/licenseinfo.xml b/extra/libs.javafx.win/licenseinfo.xml index 1fb06532b75b..c368e02a82e6 100644 --- a/extra/libs.javafx.win/licenseinfo.xml +++ b/extra/libs.javafx.win/licenseinfo.xml @@ -21,12 +21,12 @@ --> - external/javafx-base-21.0.9-win.jar.external - external/javafx-controls-21.0.9-win.jar.external - external/javafx-graphics-21.0.9-win.jar.external - external/javafx-media-21.0.9-win.jar.external - external/javafx-swing-21.0.9-win.jar.external - external/javafx-web-21.0.9-win.jar.external + external/javafx-base-23.0.2-win.jar.external + external/javafx-controls-23.0.2-win.jar.external + external/javafx-graphics-23.0.2-win.jar.external + external/javafx-media-23.0.2-win.jar.external + external/javafx-swing-23.0.2-win.jar.external + external/javafx-web-23.0.2-win.jar.external diff --git a/extra/libs.javafx.win/manifest.mf b/extra/libs.javafx.win/manifest.mf index 77878b834ef4..8f6ce5c9bb13 100644 --- a/extra/libs.javafx.win/manifest.mf +++ b/extra/libs.javafx.win/manifest.mf @@ -3,6 +3,6 @@ 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: 21.2 +OpenIDE-Module-Specification-Version: 23.0 OpenIDE-Module-Requires: org.openide.modules.os.Windows, org.openide.modules.arch.amd64 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 24cef5e8b73e..11ba0433b9d0 100644 --- a/extra/libs.javafx.win/nbproject/project.properties +++ b/extra/libs.javafx.win/nbproject/project.properties @@ -15,21 +15,21 @@ # specific language governing permissions and limitations # under the License. -javac.release=17 +javac.release=21 javac.compilerargs=-Xlint -Xlint:-serial is.autoload=true -release.external/javafx-base-21.0.9-win.jar=modules/ext/javafx-base-21.0.9-win.jar -release.external/javafx-base-21.0.9-win.jar.external=modules/ext/javafx-base-21.0.9-win.jar.external -release.external/javafx-controls-21.0.9-win.jar=modules/ext/javafx-controls-21.0.9-win.jar -release.external/javafx-controls-21.0.9-win.jar.external=modules/ext/javafx-controls-21.0.9-win.jar.external -release.external/javafx-graphics-21.0.9-win.jar=modules/ext/javafx-graphics-21.0.9-win.jar -release.external/javafx-graphics-21.0.9-win.jar.external=modules/ext/javafx-graphics-21.0.9-win.jar.external -release.external/javafx-media-21.0.9-win.jar=modules/ext/javafx-media-21.0.9-win.jar -release.external/javafx-media-21.0.9-win.jar.external=modules/ext/javafx-media-21.0.9-win.jar.external -release.external/javafx-swing-21.0.9-win.jar=modules/ext/javafx-swing-21.0.9-win.jar -release.external/javafx-swing-21.0.9-win.jar.external=modules/ext/javafx-swing-21.0.9-win.jar.external -release.external/javafx-web-21.0.9-win.jar=modules/ext/javafx-web-21.0.9-win.jar -release.external/javafx-web-21.0.9-win.jar.external=modules/ext/javafx-web-21.0.9-win.jar.external +release.external/javafx-base-23.0.2-win.jar=modules/ext/javafx-base-23.0.2-win.jar +release.external/javafx-base-23.0.2-win.jar.external=modules/ext/javafx-base-23.0.2-win.jar.external +release.external/javafx-controls-23.0.2-win.jar=modules/ext/javafx-controls-23.0.2-win.jar +release.external/javafx-controls-23.0.2-win.jar.external=modules/ext/javafx-controls-23.0.2-win.jar.external +release.external/javafx-graphics-23.0.2-win.jar=modules/ext/javafx-graphics-23.0.2-win.jar +release.external/javafx-graphics-23.0.2-win.jar.external=modules/ext/javafx-graphics-23.0.2-win.jar.external +release.external/javafx-media-23.0.2-win.jar=modules/ext/javafx-media-23.0.2-win.jar +release.external/javafx-media-23.0.2-win.jar.external=modules/ext/javafx-media-23.0.2-win.jar.external +release.external/javafx-swing-23.0.2-win.jar=modules/ext/javafx-swing-23.0.2-win.jar +release.external/javafx-swing-23.0.2-win.jar.external=modules/ext/javafx-swing-23.0.2-win.jar.external +release.external/javafx-web-23.0.2-win.jar=modules/ext/javafx-web-23.0.2-win.jar +release.external/javafx-web-23.0.2-win.jar.external=modules/ext/javafx-web-23.0.2-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 d7918e3f80e3..a12ee732173d 100644 --- a/extra/libs.javafx.win/nbproject/project.xml +++ b/extra/libs.javafx.win/nbproject/project.xml @@ -26,46 +26,54 @@ org.netbeans.libs.javafx.win - org.openide.modules + org.netbeans.libs.javafx - 7.40 + 2.10 - org.netbeans.libs.javafx + org.netbeans.libs.jsobject - 2.10 + 25.0 + + + + org.openide.modules + + + + 7.40 - ext/javafx-base-21.0.9-win.jar - external/javafx-base-21.0.9-win.jar + ext/javafx-base-23.0.2-win.jar + external/javafx-base-23.0.2-win.jar - ext/javafx-controls-21.0.9-win.jar - external/javafx-controls-21.0.9-win.jar + ext/javafx-controls-23.0.2-win.jar + external/javafx-controls-23.0.2-win.jar - ext/javafx-graphics-21.0.9-win.jar - external/javafx-graphics-21.0.9-win.jar + ext/javafx-graphics-23.0.2-win.jar + external/javafx-graphics-23.0.2-win.jar - ext/javafx-media-21.0.9-win.jar - external/javafx-media-21.0.9-win.jar + ext/javafx-media-23.0.2-win.jar + external/javafx-media-23.0.2-win.jar - ext/javafx-swing-21.0.9-win.jar - external/javafx-swing-21.0.9-win.jar + ext/javafx-swing-23.0.2-win.jar + external/javafx-swing-23.0.2-win.jar - ext/javafx-web-21.0.9-win.jar - external/javafx-web-21.0.9-win.jar + ext/javafx-web-23.0.2-win.jar + external/javafx-web-23.0.2-win.jar diff --git a/extra/libs.jsobject/build.xml b/extra/libs.jsobject/build.xml new file mode 100644 index 000000000000..a2b273a7514a --- /dev/null +++ b/extra/libs.jsobject/build.xml @@ -0,0 +1,30 @@ + + + + Builds, tests, and runs the project org.netbeans.libs.javafx.win + + + + + + + diff --git a/extra/libs.jsobject/external/binaries-list b/extra/libs.jsobject/external/binaries-list new file mode 100644 index 000000000000..27cb6d9fc376 --- /dev/null +++ b/extra/libs.jsobject/external/binaries-list @@ -0,0 +1,18 @@ +# 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. + +2DA8BB4885C515FB58BF740E53241FEDB17CF484 eu.doppel-helix.netbeans.lib:jdk-jsobject:25.0.3.2 \ No newline at end of file diff --git a/extra/libs.jsobject/external/jdk-jsobject-25.0.3.2-license.txt b/extra/libs.jsobject/external/jdk-jsobject-25.0.3.2-license.txt new file mode 100644 index 000000000000..bf0cde58efd5 --- /dev/null +++ b/extra/libs.jsobject/external/jdk-jsobject-25.0.3.2-license.txt @@ -0,0 +1,357 @@ +Name: JDK JSObject +Description: Defines the API for the JavaScript Object (removed from JDK in 26 and now part of JavaFX) +Version: 25.0.3.2 +License: GPL-2-CP +Origin: https://github.com/openjdk/jfx +Source: https://github.com/openjdk/jfx25u/tree/25.0.3%2B0 +Files: jdk-jsobject-25.0.3.2.jar +Type: compile-time,optional +Comment: Used at compile. Possibly downloaded later. + +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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) + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle 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/extra/libs.jsobject/external/jdk-jsobject-25.0.3.2.jar.external b/extra/libs.jsobject/external/jdk-jsobject-25.0.3.2.jar.external new file mode 100644 index 000000000000..f80feea43fc2 --- /dev/null +++ b/extra/libs.jsobject/external/jdk-jsobject-25.0.3.2.jar.external @@ -0,0 +1,4 @@ +CRC: 3849490119 +URL: m2:/eu.doppel-helix.netbeans.lib:jdk-jsobject:25.0.3.2:jar +MessageDigest: SHA-256 f338989a7e1a25e9982e618c1694edeee3eaaabb2425cceae71242430382ea83 +MessageDigest: SHA-512 21f714439cef4c63ff0154ae080770cfd077b078e9f46a064ea2b2e14cab73fc1b20d44faf2a7c7b9113b77df187d7b53f5103f8451faa14dd4fae31c11c8352 diff --git a/extra/libs.jsobject/licenseinfo.xml b/extra/libs.jsobject/licenseinfo.xml new file mode 100644 index 000000000000..05b993084fdc --- /dev/null +++ b/extra/libs.jsobject/licenseinfo.xml @@ -0,0 +1,28 @@ + + + + + external/jdk-jsobject-25.0.3.2.jar.external + + + + diff --git a/extra/libs.jsobject/manifest.mf b/extra/libs.jsobject/manifest.mf new file mode 100644 index 000000000000..6ea73056b80b --- /dev/null +++ b/extra/libs.jsobject/manifest.mf @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +AutoUpdate-Show-In-Client: true +OpenIDE-Module: org.netbeans.libs.jsobject +OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsobject/Bundle.properties +OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx +OpenIDE-Module-Specification-Version: 25.0 diff --git a/extra/libs.jsobject/nbproject/project.properties b/extra/libs.jsobject/nbproject/project.properties new file mode 100644 index 000000000000..60e4d3b90f41 --- /dev/null +++ b/extra/libs.jsobject/nbproject/project.properties @@ -0,0 +1,25 @@ +# 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. + +javac.release=21 +javac.compilerargs=-Xlint -Xlint:-serial +is.autoload=true + +release.external/jdk-jsobject-25.0.3.2.jar=modules/ext/jdk-jsobject-25.0.3.2.jar +release.external/jdk-jsobject-25.0.3.2.jar.external=modules/ext/jdk-jsobject-25.0.3.2.jar.external + +license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP diff --git a/extra/libs.jsobject/nbproject/project.xml b/extra/libs.jsobject/nbproject/project.xml new file mode 100644 index 000000000000..cf53736324b2 --- /dev/null +++ b/extra/libs.jsobject/nbproject/project.xml @@ -0,0 +1,37 @@ + + + + org.netbeans.modules.apisupport.project + + + org.netbeans.libs.jsobject + + + netscape.javascript + + + ext/jdk-jsobject-25.0.3.2.jar + external/jdk-jsobject-25.0.3.2.jar + + + + diff --git a/extra/libs.jsobject/src/org/netbeans/libs/jsobject/Bundle.properties b/extra/libs.jsobject/src/org/netbeans/libs/jsobject/Bundle.properties new file mode 100644 index 000000000000..52a298673aec --- /dev/null +++ b/extra/libs.jsobject/src/org/netbeans/libs/jsobject/Bundle.properties @@ -0,0 +1,18 @@ +# 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. +OpenIDE-Module-Name=JDK JSObject +OpenIDE-Module-Display-Category=Infrastructure diff --git a/nb/updatecenters/build.xml b/nb/updatecenters/build.xml index 4054c4638275..1e93a7b4d7a0 100644 --- a/nb/updatecenters/build.xml +++ b/nb/updatecenters/build.xml @@ -42,7 +42,7 @@ - + diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties index bbd52bc8c877..ffd892f7ba01 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -868,8 +868,8 @@ nb.cluster.3rdparty=\ libs.javafx.linux.aarch64,\ libs.javafx.macosx,\ libs.javafx.macosx.aarch64,\ - libs.javafx.win - + libs.javafx.win,\ + libs.jsobject nb.cluster.harness.dir=harness nb.cluster.harness.depends=nb.cluster.platform