From c6166f56bdefe2dee663b5bb26de86219e4c04ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bl=C3=A4sing?= Date: Thu, 28 Jul 2022 20:58:13 +0200 Subject: [PATCH] Update JNA and JNA-platform to 5.12.1 Closes: #4441 --- .../libs.jna.platform/external/binaries-list | 2 +- ...se.txt => jna-platform-5.12.1-license.txt} | 2 +- platform/libs.jna.platform/manifest.mf | 2 +- .../nbproject/project.properties | 2 +- .../libs.jna.platform/nbproject/project.xml | 6 +++--- platform/libs.jna/external/binaries-list | 2 +- ...9.0-license.txt => jna-5.12.1-license.txt} | 2 +- platform/libs.jna/manifest.mf | 2 +- .../libs.jna/nbproject/project.properties | 20 ++++++++++--------- platform/libs.jna/nbproject/project.xml | 4 ++-- 10 files changed, 23 insertions(+), 21 deletions(-) rename platform/libs.jna.platform/external/{jna-platform-5.9.0-license.txt => jna-platform-5.12.1-license.txt} (99%) rename platform/libs.jna/external/{jna-5.9.0-license.txt => jna-5.12.1-license.txt} (99%) diff --git a/platform/libs.jna.platform/external/binaries-list b/platform/libs.jna.platform/external/binaries-list index 9acffb010f5c..c40aa998c917 100644 --- a/platform/libs.jna.platform/external/binaries-list +++ b/platform/libs.jna.platform/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -C535A5BDA553D7D7690356C825010DA74B2671B5 net.java.dev.jna:jna-platform:5.9.0 +097406A297C852F4A41E688A176EC675F72E8329 net.java.dev.jna:jna-platform:5.12.1 diff --git a/platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt b/platform/libs.jna.platform/external/jna-platform-5.12.1-license.txt similarity index 99% rename from platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt rename to platform/libs.jna.platform/external/jna-platform-5.12.1-license.txt index 7ab5d5838b87..087700f8635d 100644 --- a/platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt +++ b/platform/libs.jna.platform/external/jna-platform-5.12.1-license.txt @@ -1,5 +1,5 @@ Name: Java Native Access -Version: 5.9.0 +Version: 5.12.1 License: Apache-2.0 Description: Dynamically access native libraries from Java without JNI. Origin: Java Native Access diff --git a/platform/libs.jna.platform/manifest.mf b/platform/libs.jna.platform/manifest.mf index 04047bfa2f66..a31c12dc7a29 100644 --- a/platform/libs.jna.platform/manifest.mf +++ b/platform/libs.jna.platform/manifest.mf @@ -1,4 +1,4 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.libs.jna.platform/2 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jna/platform/Bundle.properties -OpenIDE-Module-Specification-Version: 2.12 +OpenIDE-Module-Specification-Version: 2.13 diff --git a/platform/libs.jna.platform/nbproject/project.properties b/platform/libs.jna.platform/nbproject/project.properties index b86335082c7d..98355e24d6a2 100644 --- a/platform/libs.jna.platform/nbproject/project.properties +++ b/platform/libs.jna.platform/nbproject/project.properties @@ -17,5 +17,5 @@ is.autoload=true javac.source=1.6 -release.external/jna-platform-5.9.0.jar=modules/ext/jna-platform-5.9.0.jar +release.external/jna-platform-5.12.1.jar=modules/ext/jna-platform-5.12.1.jar sigtest.gen.fail.on.error=false diff --git a/platform/libs.jna.platform/nbproject/project.xml b/platform/libs.jna.platform/nbproject/project.xml index c7fc274277dc..260c6dc35c15 100644 --- a/platform/libs.jna.platform/nbproject/project.xml +++ b/platform/libs.jna.platform/nbproject/project.xml @@ -29,7 +29,7 @@ org.netbeans.libs.jna 2 - 2.9 + 2.13 @@ -47,8 +47,8 @@ com.sun.jna.platform.wince - ext/jna-platform-5.9.0.jar - external/jna-platform-5.9.0.jar + ext/jna-platform-5.12.1.jar + external/jna-platform-5.12.1.jar diff --git a/platform/libs.jna/external/binaries-list b/platform/libs.jna/external/binaries-list index ab565afa1b78..1a354b242ebf 100644 --- a/platform/libs.jna/external/binaries-list +++ b/platform/libs.jna/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -8F503E6D9B500CEFF299052D6BE75B38C7257758 net.java.dev.jna:jna:5.9.0 +B1E93A735CAEA94F503E95E6FE79BF9CDC1E985D net.java.dev.jna:jna:5.12.1 diff --git a/platform/libs.jna/external/jna-5.9.0-license.txt b/platform/libs.jna/external/jna-5.12.1-license.txt similarity index 99% rename from platform/libs.jna/external/jna-5.9.0-license.txt rename to platform/libs.jna/external/jna-5.12.1-license.txt index 7ab5d5838b87..087700f8635d 100644 --- a/platform/libs.jna/external/jna-5.9.0-license.txt +++ b/platform/libs.jna/external/jna-5.12.1-license.txt @@ -1,5 +1,5 @@ Name: Java Native Access -Version: 5.9.0 +Version: 5.12.1 License: Apache-2.0 Description: Dynamically access native libraries from Java without JNI. Origin: Java Native Access diff --git a/platform/libs.jna/manifest.mf b/platform/libs.jna/manifest.mf index f56bc84de239..8ddea7072cc1 100644 --- a/platform/libs.jna/manifest.mf +++ b/platform/libs.jna/manifest.mf @@ -4,4 +4,4 @@ OpenIDE-Module: org.netbeans.libs.jna/2 OpenIDE-Module-Install: org/netbeans/libs/jna/Installer.class OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jna/Bundle.properties AutoUpdate-Essential-Module: true -OpenIDE-Module-Specification-Version: 2.12 +OpenIDE-Module-Specification-Version: 2.13 diff --git a/platform/libs.jna/nbproject/project.properties b/platform/libs.jna/nbproject/project.properties index a7efb245d5c5..84644e4a8a29 100644 --- a/platform/libs.jna/nbproject/project.properties +++ b/platform/libs.jna/nbproject/project.properties @@ -16,22 +16,24 @@ # under the License. javac.source=1.6 -release.external/jna-5.9.0.jar=modules/ext/jna-5.9.0.jar +release.external/jna-5.12.1.jar=modules/ext/jna-5.12.1.jar # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well. -release.external/jna-5.9.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib -release.external/jna-5.9.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib -release.external/jna-5.9.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so -release.external/jna-5.9.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so -release.external/jna-5.9.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so -release.external/jna-5.9.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll -release.external/jna-5.9.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll -release.external/jna-5.9.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll +release.external/jna-5.12.1.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib +release.external/jna-5.12.1.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib +release.external/jna-5.12.1.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so +release.external/jna-5.12.1.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so +release.external/jna-5.12.1.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so +release.external/jna-5.12.1.jar!/com/sun/jna/linux-riscv64/libjnidispatch.so=modules/lib/riscv64/linux/libjnidispatch-nb.so +release.external/jna-5.12.1.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll +release.external/jna-5.12.1.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll +release.external/jna-5.12.1.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll jnlp.verify.excludes=\ modules/lib/amd64/jnidispatch-nb.dll,\ modules/lib/x86/jnidispatch-nb.dll,\ modules/lib/aarch64/jnidispatch-nb.dll,\ modules/lib/amd64/linux/libjnidispatch-nb.so,\ modules/lib/i386/linux/libjnidispatch-nb.so,\ + modules/lib/riscv64/linux/libjnidispatch-nb.so,\ modules/lib/aarch64/linux/libjnidispatch-nb.so,\ modules/lib/x86_64/libjnidispatch-nb.jnilib,\ modules/lib/aarch64/libjnidispatch-nb.jnilib diff --git a/platform/libs.jna/nbproject/project.xml b/platform/libs.jna/nbproject/project.xml index b72dff6ae4eb..8de9c2acb7a1 100644 --- a/platform/libs.jna/nbproject/project.xml +++ b/platform/libs.jna/nbproject/project.xml @@ -48,8 +48,8 @@ com.sun.jna.win32 - ext/jna-5.9.0.jar - external/jna-5.9.0.jar + ext/jna-5.12.1.jar + external/jna-5.12.1.jar