Update JNA and JNA-platform to 5.12.1

Closes: apache#4441
matthiasblaesing · Jul 28, 2022 · c6166f5 · c6166f5
1 parent 5ba8513
commit c6166f5
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 deletions.
diff --git 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/...m/external/jna-platform-5.9.0-license.txt → .../external/jna-platform-5.12.1-license.txt b/...m/external/jna-platform-5.9.0-license.txt → .../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
@@ -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
@@ -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
@@ -29,7 +29,7 @@
                     <code-name-base>org.netbeans.libs.jna</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.9</specification-version>
+                        <specification-version>2.13</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
@@ -47,8 +47,8 @@
                 <package>com.sun.jna.platform.wince</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-platform-5.9.0.jar</runtime-relative-path>
-                <binary-origin>external/jna-platform-5.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-platform-5.12.1.jar</runtime-relative-path>
+                <binary-origin>external/jna-platform-5.12.1.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

diff --git 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/...m/libs.jna/external/jna-5.9.0-license.txt → .../libs.jna/external/jna-5.12.1-license.txt b/...m/libs.jna/external/jna-5.9.0-license.txt → .../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
@@ -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
@@ -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
@@ -48,8 +48,8 @@
                 <package>com.sun.jna.win32</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-5.9.0.jar</runtime-relative-path>
-                <binary-origin>external/jna-5.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-5.12.1.jar</runtime-relative-path>
+                <binary-origin>external/jna-5.12.1.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>