Skip to content

Commit

Permalink
Merge pull request #804 from matthiasblaesing/remove_platform_main_class
Browse files Browse the repository at this point in the history
Main-Class in jna-platform.jar collides with java 9 module system
  • Loading branch information
matthiasblaesing authored May 14, 2017
2 parents a6e0963 + f942fc0 commit 4450862
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Bug Fixes
* [#776](https://github.com/java-native-access/jna/issues/776): Do not include ClassPath attribute in MANIFEST.MF of jna-platform. - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#785](https://github.com/java-native-access/jna/issues/785): OaIdlUtil#toPrimitiveArray fails if dimension bounds are not 0-based - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#795](https://github.com/java-native-access/jna/issues/795): com.sun.jna.platform.win32.WinDef.WORDByReference holds a WORD which is defined to 16 bit on windows, so it needs to be accessed as short (getShort()). Fix suggested by - [@kdeines](https://github.com/kdeines).
* [#804](https://github.com/java-native-access/jna/pull/804) Main-Class in jna-platform.jar collides with java 9 module system - [@matthiasblaesing](https://github.com/matthiasblaesing).

Release 4.4.0
=============
Expand Down
1 change: 0 additions & 1 deletion contrib/platform/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
<target name="-pre-jar">
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
<manifest file="${tmp.manifest.file}" mode="replace">
<attribute name="Main-Class" value="com.sun.jna.Native"/>
<attribute name="Manifest-Version" value="1.0"/>
<attribute name="Implementation-Title" value="${impl.title}"/>
<attribute name="Implementation-Vendor" value="${vendor}"/>
Expand Down

0 comments on commit 4450862

Please sign in to comment.