Skip to content

Commit f9b6117

Browse files
committed
Merge pull request #608 from bhamail/maven
change parent and native pom artifactId/name to differentiate jna in IDE and build tools.
2 parents 0acce1f + 1fcc441 commit f9b6117

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Features
4040
* [#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).
4141
* [#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).
4242
* [#612](https://github.com/java-native-access/jna/pull/612): Kernel32Util#freeLocal/GlobalMemory always throws Win32Exception if failed [@lgoldstein](https://github.com/lgoldstein).
43+
* [#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)
4344

4445
Bug Fixes
4546
---------

native/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
<parent>
99
<groupId>net.java.dev.jna</groupId>
10-
<artifactId>parent</artifactId>
10+
<artifactId>jna-parent</artifactId>
1111
<version>4.3.0-SNAPHSOT</version>
1212
<relativePath>../parent</relativePath>
1313
</parent>
1414

15-
<artifactId>native</artifactId>
15+
<artifactId>jna-native</artifactId>
1616
<packaging>pom</packaging>
1717

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

2020
<build>
2121
<plugins>

parent/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>net.java.dev.jna</groupId>
8-
<artifactId>parent</artifactId>
8+
<artifactId>jna-parent</artifactId>
99
<version>4.3.0-SNAPHSOT</version>
1010
<packaging>pom</packaging>
1111

12-
<name>net.java.dev.jna:parent</name>
12+
<name>net.java.dev.jna:jna-parent</name>
1313
<url>https://github.com/java-native-access/jna</url>
1414
<licenses>
1515
<license>

0 commit comments

Comments
 (0)