Merge pull request apache#3178 from matthiasblaesing/update-jna

Update JNA and JNA platform to 5.9.0

platform/libs.jna.platform/external/binaries-list

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-A8267193887C38418AF986ADAE090EE5D2593F48 net.java.dev.jna:jna-platform:5.4.0
+C535A5BDA553D7D7690356C825010DA74B2671B5 net.java.dev.jna:jna-platform:5.9.0

platform/libs.jna.platform/external/jna-platform-5.4.0-license.txt → platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt

@@ -1,5 +1,5 @@
 Name: Java Native Access
-Version: 5.4.0
+Version: 5.9.0
 License: Apache-2.0
 Description: Dynamically access native libraries from Java without JNI.
 Origin: Java Native Access

platform/libs.jna.platform/nbproject/project.properties

@@ -17,5 +17,5 @@
 
 is.autoload=true
 javac.source=1.6
-release.external/jna-platform-5.4.0.jar=modules/ext/jna-platform-5.4.0.jar
+release.external/jna-platform-5.9.0.jar=modules/ext/jna-platform-5.9.0.jar
 sigtest.gen.fail.on.error=false

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.1</specification-version>
+                        <specification-version>2.9</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.4.0.jar</runtime-relative-path>
-                <binary-origin>external/jna-platform-5.4.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-platform-5.9.0.jar</runtime-relative-path>
+                <binary-origin>external/jna-platform-5.9.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

platform/libs.jna/external/binaries-list

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-3E25BC70DD7750A3F0FEA5BD1467708280BEA04E net.java.dev.jna:jna:5.4.0
+8F503E6D9B500CEFF299052D6BE75B38C7257758 net.java.dev.jna:jna:5.9.0

platform/libs.jna/external/jna-5.4.0-license.txt → platform/libs.jna/external/jna-5.9.0-license.txt

@@ -1,5 +1,5 @@
 Name: Java Native Access
-Version: 5.4.0
+Version: 5.9.0
 License: Apache-2.0
 Description: Dynamically access native libraries from Java without JNI.
 Origin: Java Native Access

platform/libs.jna/nbproject/org-netbeans-libs-jna.sig

@@ -32,7 +32,7 @@ meth public com.sun.jna.Pointer getTrampoline()
 meth public static com.sun.jna.Callback getCallback(java.lang.Class<?>,com.sun.jna.Pointer)
 meth public static com.sun.jna.Pointer getFunctionPointer(com.sun.jna.Callback)
 supr java.lang.ref.WeakReference<com.sun.jna.Callback>
-hfds PROXY_CALLBACK_METHOD,allocatedMemory,allocations,callbackMap,callingConvention,cbstruct,directCallbackMap,initializers,method,pointerCallbackMap,proxy,trampoline
+hfds DLL_CALLBACK_CLASS,PROXY_CALLBACK_METHOD,allocatedMemory,allocations,callbackMap,callingConvention,cbstruct,directCallbackMap,initializers,method,pointerCallbackMap,proxy,trampoline
 hcls AttachOptions,DefaultCallbackProxy,NativeFunctionHandler
 
 CLSS public com.sun.jna.CallbackResultContext
@@ -221,6 +221,7 @@ meth public static void purge()
 meth public void clear()
 meth public void read(long,byte[],int,int)
 meth public void read(long,char[],int,int)
+meth public void read(long,com.sun.jna.Pointer[],int,int)
 meth public void read(long,double[],int,int)
 meth public void read(long,float[],int,int)
 meth public void read(long,int[],int,int)
@@ -238,14 +239,15 @@ meth public void setString(long,java.lang.String,java.lang.String)
 meth public void setWideString(long,java.lang.String)
 meth public void write(long,byte[],int,int)
 meth public void write(long,char[],int,int)
+meth public void write(long,com.sun.jna.Pointer[],int,int)
 meth public void write(long,double[],int,int)
 meth public void write(long,float[],int,int)
 meth public void write(long,int[],int,int)
 meth public void write(long,long[],int,int)
 meth public void write(long,short[],int,int)
 supr com.sun.jna.Pointer
-hfds allocatedMemory,buffers
-hcls SharedMemory
+hfds HEAD,QUEUE,buffers,reference
+hcls LinkedReference,SharedMemory
 
 CLSS public com.sun.jna.MethodParameterContext
 meth public java.lang.reflect.Method getMethod()
@@ -267,8 +269,8 @@ fld public final static int POINTER_SIZE
 fld public final static int SIZE_T_SIZE
 fld public final static int WCHAR_SIZE
 fld public final static java.lang.String DEFAULT_ENCODING
-fld public final static java.lang.String VERSION = "5.4.0"
-fld public final static java.lang.String VERSION_NATIVE = "6.1.0"
+fld public final static java.lang.String VERSION = "5.9.0"
+fld public final static java.lang.String VERSION_NATIVE = "6.1.1"
 fld public final static java.nio.charset.Charset DEFAULT_CHARSET
 innr public abstract interface static ffi_callback
 meth public static <%0 extends com.sun.jna.Library> {%%0} load(java.lang.Class<{%%0}>)
@@ -606,7 +608,7 @@ meth public void writeField(java.lang.String)
 meth public void writeField(java.lang.String,java.lang.Object)
 supr java.lang.Object
 hfds LOG,PLACEHOLDER_MEMORY,actualAlignType,alignType,array,autoRead,autoWrite,busy,encoding,fieldOrder,layoutInfo,memory,nativeStrings,readCalled,reads,size,structAlignment,structFields,typeInfo,typeMapper
-hcls AutoAllocated,FFIType,LayoutInfo,StructureSet
+hcls AutoAllocated,FFIType,LayoutInfo,NativeStringTracking,StructureSet
 
 CLSS public abstract interface static com.sun.jna.Structure$ByReference
  outer com.sun.jna.Structure
@@ -708,39 +710,45 @@ hfds backingMap,referenceQueue
 
 CLSS public abstract com.sun.jna.ptr.ByReference
 cons protected init(int)
+meth public java.lang.String toString()
 supr com.sun.jna.PointerType
 
 CLSS public com.sun.jna.ptr.ByteByReference
 cons public init()
 cons public init(byte)
 meth public byte getValue()
+meth public java.lang.String toString()
 meth public void setValue(byte)
 supr com.sun.jna.ptr.ByReference
 
 CLSS public com.sun.jna.ptr.DoubleByReference
 cons public init()
 cons public init(double)
 meth public double getValue()
+meth public java.lang.String toString()
 meth public void setValue(double)
 supr com.sun.jna.ptr.ByReference
 
 CLSS public com.sun.jna.ptr.FloatByReference
 cons public init()
 cons public init(float)
 meth public float getValue()
+meth public java.lang.String toString()
 meth public void setValue(float)
 supr com.sun.jna.ptr.ByReference
 
 CLSS public com.sun.jna.ptr.IntByReference
 cons public init()
 cons public init(int)
 meth public int getValue()
+meth public java.lang.String toString()
 meth public void setValue(int)
 supr com.sun.jna.ptr.ByReference
 
 CLSS public com.sun.jna.ptr.LongByReference
 cons public init()
 cons public init(long)
+meth public java.lang.String toString()
 meth public long getValue()
 meth public void setValue(long)
 supr com.sun.jna.ptr.ByReference
@@ -749,6 +757,7 @@ CLSS public com.sun.jna.ptr.NativeLongByReference
 cons public init()
 cons public init(com.sun.jna.NativeLong)
 meth public com.sun.jna.NativeLong getValue()
+meth public java.lang.String toString()
 meth public void setValue(com.sun.jna.NativeLong)
 supr com.sun.jna.ptr.ByReference
 
@@ -762,6 +771,7 @@ supr com.sun.jna.ptr.ByReference
 CLSS public com.sun.jna.ptr.ShortByReference
 cons public init()
 cons public init(short)
+meth public java.lang.String toString()
 meth public short getValue()
 meth public void setValue(short)
 supr com.sun.jna.ptr.ByReference

platform/libs.jna/nbproject/project.properties

@@ -16,17 +16,23 @@
 # under the License.
 
 javac.source=1.6
-release.external/jna-5.4.0.jar=modules/ext/jna-5.4.0.jar
+release.external/jna-5.9.0.jar=modules/ext/jna-5.9.0.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.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-nb.jnilib
-release.external/jna-5.4.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so
-release.external/jna-5.4.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so
-release.external/jna-5.4.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll
-release.external/jna-5.4.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/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
 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/x86/jnidispatch-nb.dll,\
-    modules/lib/libjnidispatch-nb.jnilib
+    modules/lib/aarch64/linux/libjnidispatch-nb.so,\
+    modules/lib/x86_64/libjnidispatch-nb.jnilib,\
+    modules/lib/aarch64/libjnidispatch-nb.jnilib
 sigtest.gen.fail.on.error=false

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.4.0.jar</runtime-relative-path>
-                <binary-origin>external/jna-5.4.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-5.9.0.jar</runtime-relative-path>
+                <binary-origin>external/jna-5.9.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>