Add automatic module names (fixes #245)

bbottema · Feb 2, 2020 · 90ddf0d · 90ddf0d
1 parent 1e70513
commit 90ddf0d
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 11 deletions.
diff --git a/modules/authenticated-socks-module/pom.xml b/modules/authenticated-socks-module/pom.xml
@@ -17,13 +17,16 @@
     <name>Simple Java Mail - Authenticated SOCKS module</name>
     <description>Simple API, Complex Emails. Now with SOCKS5 support</description>
 
-    <dependencies>
+    <properties>
+        <automaticModuleName>org.simplejavamail.authenticatedsocks</automaticModuleName>
+    </properties>
 
+    <dependencies>
         <!-- core dependencies -->
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>core-module</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/modules/batch-module/pom.xml b/modules/batch-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - Batch module</name>
     <description>Simple API, Complex Emails. High performance.</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.batch</automaticModuleName>
+    </properties>
+
     <dependencies>
 
         <!-- core dependencies -->
@@ -33,4 +37,4 @@
             <version>1.1.0</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - CLI module</name>
     <description>Simple API, Complex Emails. Now with CLI support</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.cli</automaticModuleName>
+    </properties>
+
     <dependencies>
 
         <!-- core dependencies -->
@@ -145,4 +149,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - Core module</name>
     <description>Simple API, Complex Emails. Core module support</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.core</automaticModuleName>
+    </properties>
+
     <dependencies>
 
         <!-- core dependencies -->
@@ -55,4 +59,4 @@
             <scope>provided</scope><!-- makes library mandatory if we should support CLI (even optionally) -->
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - Core Test module</name>
     <description>Simple API, Complex Emails. Core module test support</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.test</automaticModuleName>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.simplejavamail</groupId>
@@ -25,4 +29,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/modules/dkim-module/pom.xml b/modules/dkim-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - DKIM module</name>
     <description>Simple API, Complex Emails. Now with DKIM support</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.dkim</automaticModuleName>
+    </properties>
+
     <dependencies>
 
         <!-- core dependencies -->
@@ -33,4 +37,4 @@
             <version>1.2.0</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/modules/outlook-module/pom.xml b/modules/outlook-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - Outlook module</name>
     <description>Simple API, Complex Emails. Now with Outlook support</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.outlook</automaticModuleName>
+    </properties>
+
     <dependencies>
 
         <!-- core dependencies -->
@@ -50,4 +54,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
+</project>
diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
@@ -18,6 +18,7 @@
     <description>Simple API, Complex Emails. A light weight wrapper for the JavaMail SMTP API</description>
 
     <properties>
+        <automaticModuleName>org.simplejavamail</automaticModuleName>
         <spring.version>[4.3.18.RELEASE,)</spring.version>
     </properties>
 
@@ -149,4 +150,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
@@ -17,6 +17,10 @@
     <name>Simple Java Mail - S/MIME module</name>
     <description>Simple API, Complex Emails. Now with S/MIME support</description>
 
+    <properties>
+        <automaticModuleName>org.simplejavamail.smime</automaticModuleName>
+    </properties>
+
     <dependencies>
 
         <!-- core dependencies -->
@@ -39,4 +43,4 @@
             </exclusions>
 		</dependency>
     </dependencies>
-</project>
+</project>
diff --git a/modules/spring-module/pom.xml b/modules/spring-module/pom.xml
@@ -18,6 +18,7 @@
     <description>Simple API, Complex Emails. Now with Spring support</description>
 
     <properties>
+        <automaticModuleName>org.simplejavamail.spring</automaticModuleName>
         <spring.version>[4.3.18.RELEASE,)</spring.version>
     </properties>
 
@@ -58,4 +59,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -21,6 +21,7 @@
 
     <properties>
         <se.eris.notnull.instrument>false</se.eris.notnull.instrument>
+        <automaticModuleName>org.simplejavamail.undefined</automaticModuleName> <!-- update in individual modules -->
     </properties>
 
     <!-- to skip some steps: -DskipTests -Dspotbugs.skip=true -Dmaven.javadoc.skip=true -Denforcer.skip=true -Djacoco.skip=true -Dlicense.skip=true -->
@@ -114,6 +115,17 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${automaticModuleName}</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>