From 8a0eeb81b054820997c00ccae3a720d6aa3f4a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bl=C3=A4sing?= <mblaesing@doppel-helix.eu>
Date: Thu, 18 Feb 2021 22:33:11 +0100
Subject: [PATCH] Split jpms modules into independet artifacts instead of
 classifier based solution

The jna-platform artifact depends on jna - this leads to problems when
the JPMS artifacts are used, as the pom.xml for the classifier based
artifacts are identical to the base artifacts. This leads to

  <dependency>
    <groupId>net.java.dev.jna</groupId>
    <artifactId>jna-platform</artifactId>
    <version>5.7.0</version>
    <classifier>jpms</classifier>
  </dependency>

depending on

  <dependency>
    <groupId>net.java.dev.jna</groupId>
    <artifactId>jna</artifactId>
    <version>5.7.0</version>
  </dependency>

so the jna-platform JPMS artifacts pulls in the non-JPMS jna artifact.

To solve this, both artifacts are moved into their own groupId. So

  <dependency>
    <groupId>net.java.dev.jna</groupId>
    <artifactId>jna-platform</artifactId>
    <version>5.8.0</version>
    <classifier>jpms</classifier>
  </dependency>

becomes

  <dependency>
    <groupId>net.java.dev.jna.jpms</groupId>
    <artifactId>jna-platform</artifactId>
    <version>5.8.0</version>
  </dependency>
---
 build.xml                 | 93 +++++++++++++++++++++++++++++++++------
 pom-jna-jpms.xml          | 53 ++++++++++++++++++++++
 pom-jna-platform-jpms.xml | 61 +++++++++++++++++++++++++
 pom-jna-platform.xml      |  6 +--
 4 files changed, 196 insertions(+), 17 deletions(-)
 create mode 100644 pom-jna-jpms.xml
 create mode 100644 pom-jna-platform-jpms.xml

diff --git a/build.xml b/build.xml
index ff8997c098..9fde0aac5f 100644
--- a/build.xml
+++ b/build.xml
@@ -152,9 +152,13 @@
 
   <property name="pom-base" value="pom-jna.xml" />
   <property name="pom-platform-base" value="pom-jna-platform.xml" />
+  <property name="pom-jpms-base" value="pom-jna-jpms.xml" />
+  <property name="pom-platform-jpms-base" value="pom-jna-platform-jpms.xml" />
 
   <property name="pom" value="${build}/pom-jna.xml" />
   <property name="pom-platform" value="${build}/pom-jna-platform.xml" />
+  <property name="pom-jpms" value="${build}/pom-jna-jpms.xml" />
+  <property name="pom-platform-jpms" value="${build}/pom-jna-platform-jpms.xml" />
 
   <target name="default" depends="test" description="Build and Test."/>
 
@@ -195,7 +199,7 @@
     <property name="build.os.family" value="other"/>
     <property name="build.os.arch" value="${os.arch}" />
     <property name="build.os.endianess" value="${sun.cpu.endian}" />
-    
+
     <condition property="-native" value="true">
       <not><isset property="build-native"/></not>
     </condition>
@@ -203,11 +207,14 @@
       <isset property="-native"/>
     </condition>
 
-    <copy file="${pom-base}" todir="${build}" />
-    <copy file="${pom-platform-base}" todir="${build}" />
+    <copy file="${pom-base}" tofile="${pom}" />
+    <copy file="${pom-platform-base}" tofile="${pom-platform}" />
+    <copy file="${pom-jpms-base}" tofile="${pom-jpms}" />
+    <copy file="${pom-platform-jpms-base}" tofile="${pom-platform-jpms}" />
 
     <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
                    replace="\1${jna.version}\2"
+                   flags="g"
                    file="${pom}"/>
 
     <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
@@ -215,6 +222,16 @@
                    flags="g"
                    file="${pom-platform}"/>
 
+    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
+                   replace="\1${jna.version}\2"
+                   flags="g"
+                   file="${pom-jpms}"/>
+
+    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
+                 replace="\1${jna.version}\2"
+                 flags="g"
+                 file="${pom-platform-jpms}"/>
+
     <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
       <isset property="omit-jnilib"/>
     </condition>
@@ -1553,10 +1570,10 @@ cd ..
 
     <artifact:mvn failonerror="true">
       <arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
-      <arg value="-DpomFile=${pom}"/>
+      <arg value="-DpomFile=${pom-jpms}"/>
       <arg value="-Dfile=${dist-jar-jpms}"/>
-      <arg value="-Dclassifier=jpms"/>
-      <arg value="-Dpackaging=jar"/>
+      <arg value="-Dsources=${maven-sources-jar}"/>
+      <arg value="-Djavadoc=${maven-javadoc-jar}"/>
     </artifact:mvn>
 
     <artifact:mvn failonerror="true">
@@ -1569,10 +1586,10 @@ cd ..
 
     <artifact:mvn failonerror="true">
       <arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
-      <arg value="-DpomFile=${pom-platform}"/>
+      <arg value="-DpomFile=${pom-platform-jpms}"/>
       <arg value="-Dfile=${platform-jpms-jar}"/>
-      <arg value="-Dclassifier=jpms"/>
-      <arg value="-Dpackaging=jar"/>
+      <arg value="-Dsources=${platform-sources-jar}"/>
+      <arg value="-Djavadoc=${platform-javadoc-jar}"/>
     </artifact:mvn>
   </target>
 
@@ -1584,9 +1601,9 @@ cd ..
       <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
       <arg value="-DpomFile=${pom}"/>
       <arg value="-Dfile=${dist-jar}"/>
-      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-jar-jpms},${dist-aar}"/>
-      <arg value="-Dtypes=jar,jar,jar,aar"/>
-      <arg value="-Dclassifiers=sources,javadoc,jpms,"/>
+      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-aar}"/>
+      <arg value="-Dtypes=jar,jar,aar"/>
+      <arg value="-Dclassifiers=sources,javadoc,"/>
     </artifact:mvn>
 
     <artifact:mvn failonerror="true">
@@ -1595,9 +1612,31 @@ cd ..
       <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
       <arg value="-DpomFile=${pom-platform}"/>
       <arg value="-Dfile=${platform-jar}"/>
-      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar},${platform-jpms-jar}"/>
+      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
       <arg value="-Dtypes=jar,jar,jar"/>
-      <arg value="-Dclassifiers=sources,javadoc,jpms"/>
+      <arg value="-Dclassifiers=sources,javadoc"/>
+    </artifact:mvn>
+
+    <artifact:mvn failonerror="true">
+      <arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
+      <arg value="-Durl=${maven-snapshots-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
+      <arg value="-DpomFile=${pom-jpms}"/>
+      <arg value="-Dfile=${dist-jar-jpms}"/>
+      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar}"/>
+      <arg value="-Dtypes=jar,jar"/>
+      <arg value="-Dclassifiers=sources,javadoc"/>
+    </artifact:mvn>
+
+    <artifact:mvn failonerror="true">
+      <arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
+      <arg value="-Durl=${maven-snapshots-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
+      <arg value="-DpomFile=${pom-platform-jpms}"/>
+      <arg value="-Dfile=${platform-jpms-jar}"/>
+      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
+      <arg value="-Dtypes=jar,jar"/>
+      <arg value="-Dclassifiers=sources,javadoc"/>
     </artifact:mvn>
   </target>
 
@@ -1630,6 +1669,32 @@ cd ..
       <arg value="-Dtypes=jar,jar,jar"/>
       <arg value="-Dgpg.useagent=true"/>
     </artifact:mvn>
+
+    <!-- sign and deploy the jna,  artifact -->
+    <artifact:mvn failonerror="true">
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:${version-maven-gpg-plugin}:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=${pom-jpms}"/>
+      <arg value="-Dfile=${dist-jar-jpms}"/>
+      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar}"/>
+      <arg value="-Dtypes=jar,jar"/>
+      <arg value="-Dclassifiers=sources,javadoc"/>
+      <arg value="-Dgpg.useagent=true"/>
+    </artifact:mvn>
+
+    <!-- sign and deploy the platform artifact -->
+    <artifact:mvn failonerror="true">
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:${version-maven-gpg-plugin}:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=${pom-platform-jpms}"/>
+      <arg value="-Dfile=${platform-jpms-jar}"/>
+      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
+      <arg value="-Dtypes=jar,jar"/>
+      <arg value="-Dclassifiers=sources,javadoc"/>
+      <arg value="-Dgpg.useagent=true"/>
+    </artifact:mvn>
   </target>
 
   <target name="-bootstrap-maven">
diff --git a/pom-jna-jpms.xml b/pom-jna-jpms.xml
new file mode 100644
index 0000000000..e71f4e37af
--- /dev/null
+++ b/pom-jna-jpms.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>net.java.dev.jna.jpms</groupId>
+  <artifactId>jna</artifactId>
+  <version>TEMPLATE</version>
+  <packaging>jar</packaging>
+
+  <name>Java Native Access</name>
+  <description>Java Native Access</description>
+  <url>https://github.com/java-native-access/jna</url>
+
+  <licenses>
+      <license>
+          <name>LGPL, version 2.1</name>
+          <url>http://www.gnu.org/licenses/licenses.html</url>
+          <distribution>repo</distribution>
+      </license>
+      <license>
+          <name>Apache License v2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          <distribution>repo</distribution>
+      </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:git:https://github.com/java-native-access/jna</connection>
+    <developerConnection>scm:git:ssh://git@github.com/java-native-access/jna.git</developerConnection>
+    <url>https://github.com/java-native-access/jna</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>twall</id>
+      <name>Timothy Wall</name>
+      <roles>
+        <role>Owner</role>
+      </roles>
+    </developer>
+    <developer>
+      <email>mblaesing@doppel-helix.eu</email>
+      <name>Matthias Bläsing</name>
+      <url>https://github.com/matthiasblaesing/</url>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+</project>
diff --git a/pom-jna-platform-jpms.xml b/pom-jna-platform-jpms.xml
new file mode 100644
index 0000000000..7ef76fa9c1
--- /dev/null
+++ b/pom-jna-platform-jpms.xml
@@ -0,0 +1,61 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>net.java.dev.jna</groupId>
+  <artifactId>jna-platform</artifactId>
+  <version>TEMPLATE</version>
+  <packaging>jar</packaging>
+
+  <name>Java Native Access Platform</name>
+  <description>Java Native Access Platform</description>
+  <url>https://github.com/java-native-access/jna</url>
+
+  <licenses>
+      <license>
+          <name>LGPL, version 2.1</name>
+          <url>http://www.gnu.org/licenses/licenses.html</url>
+          <distribution>repo</distribution>
+      </license>
+      <license>
+          <name>Apache License v2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          <distribution>repo</distribution>
+      </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:git:https://github.com/java-native-access/jna</connection>
+    <developerConnection>scm:git:ssh://git@github.com/java-native-access/jna.git</developerConnection>
+    <url>https://github.com/java-native-access/jna</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>twall</id>
+      <name>Timothy Wall</name>
+      <roles>
+        <role>Owner</role>
+      </roles>
+    </developer>
+    <developer>
+      <email>mblaesing@doppel-helix.eu</email>
+      <name>Matthias Bläsing</name>
+      <url>https://github.com/matthiasblaesing/</url>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>TEMPLATE</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/pom-jna-platform.xml b/pom-jna-platform.xml
index bb86696690..0f855827e4 100644
--- a/pom-jna-platform.xml
+++ b/pom-jna-platform.xml
@@ -4,7 +4,7 @@
   http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>net.java.dev.jna</groupId>
+  <groupId>net.java.dev.jna.jpms</groupId>
   <artifactId>jna-platform</artifactId>
   <version>TEMPLATE</version>
   <packaging>jar</packaging>
@@ -52,9 +52,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>net.java.dev.jna</groupId>
+      <groupId>net.java.dev.jna.jpms</groupId>
       <artifactId>jna</artifactId>
-      <version>5.5.1-SNAPSHOT</version>
+      <version>TEMPLATE</version>
     </dependency>
   </dependencies>