Skip to content

Commit

Permalink
Merge pull request #608 from bhamail/maven
Browse files Browse the repository at this point in the history
change parent and native pom artifactId/name to differentiate jna in IDE and build tools.
  • Loading branch information
bhamail committed Mar 7, 2016
2 parents 0acce1f + 1fcc441 commit f9b6117
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Features
* [#582](https://github.com/java-native-access/jna/pull/582): Mavenize the build process - Phase 1: building the native code via Maven [@lgoldstein](https://github.com/lgoldstein).
* [#606](https://github.com/java-native-access/jna/pull/606): Added Kerne32Util method to facilitate checking that calls to LocalFree/GlobalFree are successful [@lgoldstein](https://github.com/lgoldstein).
* [#612](https://github.com/java-native-access/jna/pull/612): Kernel32Util#freeLocal/GlobalMemory always throws Win32Exception if failed [@lgoldstein](https://github.com/lgoldstein).
* [#608](https://github.com/java-native-access/jna/pull/608): Mavenize the build process - change parent and native pom artifactId/name to differentiate in IDE and build tools. [@bhamail](https://github.com/bhamail)

Bug Fixes
---------
Expand Down
6 changes: 3 additions & 3 deletions native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

<parent>
<groupId>net.java.dev.jna</groupId>
<artifactId>parent</artifactId>
<artifactId>jna-parent</artifactId>
<version>4.3.0-SNAPHSOT</version>
<relativePath>../parent</relativePath>
</parent>

<artifactId>native</artifactId>
<artifactId>jna-native</artifactId>
<packaging>pom</packaging>

<name>net.java.dev.jna:native</name>
<name>net.java.dev.jna:jna-native</name>

<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>

<groupId>net.java.dev.jna</groupId>
<artifactId>parent</artifactId>
<artifactId>jna-parent</artifactId>
<version>4.3.0-SNAPHSOT</version>
<packaging>pom</packaging>

<name>net.java.dev.jna:parent</name>
<name>net.java.dev.jna:jna-parent</name>
<url>https://github.com/java-native-access/jna</url>
<licenses>
<license>
Expand Down

0 comments on commit f9b6117

Please sign in to comment.