From d3a11ae70d2910deb3f72bd2e90f13f7ac39febf Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Fri, 3 Dec 2021 18:23:57 +0100
Subject: [PATCH] #112 Add automatic module name to all JARs.

---
 CHANGES.txt                     |  6 ++++-
 morfologik-fsa-builders/pom.xml |  3 ++-
 morfologik-fsa/pom.xml          |  3 ++-
 morfologik-polish/pom.xml       |  3 ++-
 morfologik-speller/pom.xml      |  3 ++-
 morfologik-stemming/pom.xml     |  3 ++-
 morfologik-tools/pom.xml        |  3 ++-
 pom.xml                         | 44 +++++++++++++++++++++++++--------
 8 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 38369171..469a70a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,11 @@ Morfologik, Change Log
 For an up-to-date CHANGES file see 
 https://github.com/morfologik/morfologik-stemming/blob/master/CHANGES
 
-======================= morfologik-stemming 2.1.8-SNAPSHOT =======================
+======================= morfologik-stemming 2.1.8 =======================
+
+Other Changes
+
+ * GH-112: Add automatic module name to all JARs.
 
 ======================= morfologik-stemming 2.1.7 =======================
 
diff --git a/morfologik-fsa-builders/pom.xml b/morfologik-fsa-builders/pom.xml
index 51c97dfb..039628a8 100644
--- a/morfologik-fsa-builders/pom.xml
+++ b/morfologik-fsa-builders/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.carrot2</groupId>
     <artifactId>morfologik-parent</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -20,6 +20,7 @@
 
   <properties>
     <forbiddenapis.signaturefile>../etc/forbidden-apis/signatures.txt</forbiddenapis.signaturefile>
+    <project.moduleId>org.carrot2.morfologik.fsa_builders</project.moduleId>
   </properties>
 
   <dependencies>
diff --git a/morfologik-fsa/pom.xml b/morfologik-fsa/pom.xml
index 7c06abe3..90432690 100644
--- a/morfologik-fsa/pom.xml
+++ b/morfologik-fsa/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.carrot2</groupId>
     <artifactId>morfologik-parent</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -20,6 +20,7 @@
   
   <properties>
     <forbiddenapis.signaturefile>../etc/forbidden-apis/signatures.txt</forbiddenapis.signaturefile>
+    <project.moduleId>org.carrot2.morfologik.fsa</project.moduleId>
   </properties>
 
   <build>
diff --git a/morfologik-polish/pom.xml b/morfologik-polish/pom.xml
index daac2754..3ad6fd86 100644
--- a/morfologik-polish/pom.xml
+++ b/morfologik-polish/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.carrot2</groupId>
     <artifactId>morfologik-parent</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -20,6 +20,7 @@
 
   <properties>
     <forbiddenapis.signaturefile>../etc/forbidden-apis/signatures.txt</forbiddenapis.signaturefile>
+    <project.moduleId>org.carrot2.morfologik.polish</project.moduleId>
   </properties>
 
   <dependencies>
diff --git a/morfologik-speller/pom.xml b/morfologik-speller/pom.xml
index 77875d49..da1ffd10 100644
--- a/morfologik-speller/pom.xml
+++ b/morfologik-speller/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.carrot2</groupId>
     <artifactId>morfologik-parent</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -20,6 +20,7 @@
 
   <properties>
     <forbiddenapis.signaturefile>../etc/forbidden-apis/signatures.txt</forbiddenapis.signaturefile>
+    <project.moduleId>org.carrot2.morfologik.speller</project.moduleId>
   </properties>
 
   <dependencies>
diff --git a/morfologik-stemming/pom.xml b/morfologik-stemming/pom.xml
index d2f88df7..78f76883 100644
--- a/morfologik-stemming/pom.xml
+++ b/morfologik-stemming/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.carrot2</groupId>
     <artifactId>morfologik-parent</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -20,6 +20,7 @@
 
   <properties>
     <forbiddenapis.signaturefile>../etc/forbidden-apis/signatures.txt</forbiddenapis.signaturefile>
+    <project.moduleId>org.carrot2.morfologik.stemming</project.moduleId>
   </properties>
 
   <dependencies>
diff --git a/morfologik-tools/pom.xml b/morfologik-tools/pom.xml
index 83708766..384b2d3e 100644
--- a/morfologik-tools/pom.xml
+++ b/morfologik-tools/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.carrot2</groupId>
     <artifactId>morfologik-parent</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -20,6 +20,7 @@
 
   <properties>
     <forbiddenapis.signaturefile>../etc/forbidden-apis/signatures.txt</forbiddenapis.signaturefile>
+    <project.moduleId>org.carrot2.morfologik.tools</project.moduleId>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index c1fb42b0..16ab5a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>org.carrot2</groupId>
   <artifactId>morfologik-parent</artifactId>
-  <version>2.1.8-SNAPSHOT</version>
+  <version>2.1.8</version>
   <packaging>pom</packaging>
 
   <name>Morfologik (parent POM)</name>
@@ -54,8 +54,10 @@
     <version.junit>4.12</version.junit>
     <version.randomizedtesting>2.5.2</version.randomizedtesting>
 
+    <version.maven-compiler-plugin>3.8.1</version.maven-compiler-plugin>
     <version.maven-enforcer-plugin>1.4.1</version.maven-enforcer-plugin>
     <version.maven-clean-plugin>2.6.1</version.maven-clean-plugin>
+    <version.maven-jar-plugin>3.2.0</version.maven-jar-plugin>
   </properties>
 
   <modules>
@@ -139,7 +141,20 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.5</version>
+          <version>${version.maven-jar-plugin}</version>
+          <configuration>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+              <manifestEntries>
+                <Project-GroupId>${project.groupId}</Project-GroupId>
+                <Project-ArtifactId>${project.artifactId}</Project-ArtifactId>
+                <Project-Version>${project.version}</Project-Version>
+                <Project-Name>${project.name}</Project-Name>
+
+                <Automatic-Module-Name>${project.moduleId}</Automatic-Module-Name>
+              </manifestEntries>
+            </archive>
+          </configuration>
         </plugin>
 
         <plugin>
@@ -163,7 +178,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
+          <version>${version.maven-compiler-plugin}</version>
+          <configuration>
+            <source>${maven.compiler.source}</source>
+            <target>${maven.compiler.target}</target>
+          </configuration>
         </plugin>
 
         <plugin>
@@ -175,7 +194,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>5.1.2</version>
           <extensions>true</extensions>
         </plugin>
 
@@ -194,6 +213,11 @@
     </pluginManagement>
     
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -656,14 +680,14 @@
 
       <distributionManagement>
         <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <id>sonatype-nexus-snapshots</id>
+          <name>Sonatype Nexus Snapshots</name>
+          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
         <repository>
-            <id>sonatype-nexus-staging</id>
-            <name>Sonatype Nexus Releases</name>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+          <id>sonatype-nexus-staging</id>
+          <name>Sonatype Nexus Releases</name>
+          <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
       </distributionManagement>