Merge pull request #961 from lprimak/jpms-module-names

[GH-896] Added JPMS module names to JAR manifests

cache/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-cache</artifactId>
     <name>Apache Shiro :: Cache</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>cache</module.name>
+    </properties>
 
     <build>
         <plugins>

config/core/pom.xml

@@ -30,6 +30,9 @@
     <name>Apache Shiro :: Configuration :: Core</name>
 
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>config.core</module.name>
+    </properties>
 
     <build>
         <plugins>

config/ogdl/pom.xml

@@ -31,6 +31,9 @@
     <description>Support for Shiro's Object Graph Definition Language (mostly used in Ini configuration) where
         declared name/value pairs are interpreted to create an object graph</description>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>config.ogdl</module.name>
+    </properties>
 
     <build>
         <plugins>

core/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-core</artifactId>
     <name>Apache Shiro :: Core</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>core</module.name>
+    </properties>
 
     <build>
         <plugins>

crypto/cipher/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-crypto-cipher</artifactId>
     <name>Apache Shiro :: Cryptography :: Ciphers</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>crypto.cipher</module.name>
+    </properties>
 
     <build>
         <plugins>

crypto/core/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-crypto-core</artifactId>
     <name>Apache Shiro :: Cryptography :: Core</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>crypto.core</module.name>
+    </properties>
 
     <build>
         <plugins>

crypto/hash/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-crypto-hash</artifactId>
     <name>Apache Shiro :: Cryptography :: Hashing</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>crypto.hash</module.name>
+    </properties>
 
     <build>
         <plugins>

crypto/support/hashes/argon2/pom.xml

@@ -34,6 +34,9 @@
     <name>Apache Shiro :: Cryptography :: Support :: Argon2</name>
 
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>hashes.argon2</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

crypto/support/hashes/bcrypt/pom.xml

@@ -34,6 +34,9 @@
     <name>Apache Shiro :: Cryptography :: Support :: BCrypt</name>
 
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>hashes.bcrypt</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

event/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-event</artifactId>
     <name>Apache Shiro :: Event</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>event</module.name>
+    </properties>
 
     <build>
         <plugins>

integration-tests/jaxrs/meecrowave/pom.xml

@@ -31,7 +31,9 @@
 
     <artifactId>shiro-its-jaxrs-meecrowave</artifactId>
     <name>Apache Shiro :: ITs :: JAX-RS :: Meecrowave</name>
-
+    <properties>
+        <module.name>its.jaxrs.meecrowave</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

integration-tests/jaxrs/openliberty/pom.xml

@@ -33,6 +33,7 @@
     <name>Apache Shiro :: ITs :: JAX-RS :: OpenLiberty</name>
 
     <properties>
+        <module.name>its.jaxrs.openliberty</module.name>
         <liberty.var.default.http.port>9080</liberty.var.default.http.port>
         <liberty.var.default.https.port>9443</liberty.var.default.https.port>
         <liberty.var.app.filename>shiro-its-jaxrs-app-${project.version}</liberty.var.app.filename>

integration-tests/jaxrs/tests/pom.xml

@@ -33,6 +33,7 @@
     <name>Apache Shiro :: ITs :: JAX-RS :: Tests</name>
 
     <properties>
+        <module.name>its.jaxrs.tests</module.name>
         <jaxrs.api.version>2.1.1</jaxrs.api.version>
         <johnzon.version>1.2.20</johnzon.version>
     </properties>

integration-tests/meecrowave-support/pom.xml

@@ -33,6 +33,7 @@
     <name>Apache Shiro :: ITs :: Meecrowave-Support</name>
 
     <properties>
+        <module.name>its.meecrowave.support</module.name>
     </properties>
 
     <dependencies>

integration-tests/support/pom.xml

@@ -28,6 +28,9 @@
 
 	<artifactId>shiro-its-support</artifactId>
 	<name>Apache Shiro :: ITs :: Support</name>
+    <properties>
+        <module.name>its.support</module.name>
+    </properties>
 
 	<dependencies>
 	    <dependency>

lang/pom.xml

@@ -34,6 +34,9 @@
         other modules.  It exists to augment what we would have liked to see in the JDK but does not exist.
     </description>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>lang</module.name>
+    </properties>
 
     <dependencies>
 

pom.xml

@@ -715,6 +715,9 @@
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.apache.shiro.${module.name}</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
@@ -1659,8 +1662,9 @@
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-javadoc-plugin</artifactId>
                             <configuration>
+                                <sourcepath>${project.build.sourceDirectory}</sourcepath>
+                                <doclint>none</doclint>
                                 <additionalJOptions>
-                                    <additionalJOption>-Xdoclint:none</additionalJOption>
                                     <additionalJOption>--allow-script-in-comments</additionalJOption>
                                 </additionalJOptions>
                             </configuration>

samples/aspectj/pom.xml

@@ -29,6 +29,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>samples-aspectj</artifactId>
 	<name>Apache Shiro :: Samples :: AspectJ</name>
+	<properties>
+		<module.name>samples.aspectj</module.name>
+	</properties>
 
 	<build>
 		<plugins>

samples/quickstart-guice/pom.xml

@@ -28,6 +28,9 @@
     <artifactId>samples-quickstart-guice</artifactId>
     <name>Apache Shiro :: Samples :: Quick Start Guice</name>
     <packaging>jar</packaging>
+    <properties>
+        <module.name>samples.quickstart.guice</module.name>
+    </properties>
 
     <build>
         <plugins>

samples/quickstart/pom.xml

@@ -30,6 +30,9 @@
     <artifactId>samples-quickstart</artifactId>
     <name>Apache Shiro :: Samples :: Quick Start</name>
     <packaging>jar</packaging>
+    <properties>
+        <module.name>samples.quickstart</module.name>
+    </properties>
 
     <build>
         <plugins>

samples/spring-boot-web/pom.xml

@@ -30,6 +30,9 @@
 
     <artifactId>samples-spring-boot-web</artifactId>
     <name>Apache Shiro :: Samples :: Spring Boot Web</name>
+    <properties>
+        <module.name>samples.spring.boot.web</module.name>
+    </properties>
 
     <dependencies>
 

samples/spring-boot/pom.xml

@@ -30,6 +30,9 @@
 
     <artifactId>samples-spring-boot</artifactId>
     <name>Apache Shiro :: Samples :: Spring Boot</name>
+    <properties>
+        <module.name>samples.spring.boot</module.name>
+    </properties>
 
     <dependencies>
 

samples/spring/pom.xml

@@ -32,7 +32,9 @@
     <description>
     	Spring-based application sample demonstrating Shiro's capabilities.
     </description>
-
+    <properties>
+        <module.name>samples.spring</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

support/aspectj/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-aspectj</artifactId>
     <name>Apache Shiro :: Support :: AspectJ</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>aspectj</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

support/cdi/pom.xml

@@ -29,6 +29,9 @@
         <artifactId>shiro-support</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
+    <properties>
+        <module.name>cdi</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

support/ehcache/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-ehcache</artifactId>
     <name>Apache Shiro :: Support :: EHCache</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>ehcache</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

support/guice/pom.xml

@@ -31,6 +31,7 @@
     <packaging>bundle</packaging>
 
     <properties>
+        <module.name>guice</module.name>
         <japicmp.skip>true</japicmp.skip>
     </properties>
 

support/hazelcast/pom.xml

@@ -32,6 +32,7 @@
 
     <properties>
         <hazelcast.osgi.importRange>[3, 4)</hazelcast.osgi.importRange>
+        <module.name>hazelcast</module.name>
     </properties>
 
     <dependencies>

support/jakarta-ee/pom.xml

@@ -31,6 +31,7 @@
     </parent>
 
     <properties>
+        <module.name>jakarta.ee</module.name>
         <jacoco.skip>true</jacoco.skip>
     </properties>
 

support/jaxrs/pom.xml

@@ -29,7 +29,9 @@
     <artifactId>shiro-jaxrs</artifactId>
     <name>Apache Shiro :: Support :: JAX-RS</name>
     <packaging>bundle</packaging>
-
+    <properties>
+        <module.name>jaxrs</module.name>
+    </properties>
 
     <dependencies>
 

support/jcache/pom.xml

@@ -32,7 +32,7 @@
     <packaging>bundle</packaging>
 
     <properties>
-
+        <module.name>jcache</module.name>
     </properties>
 
     <dependencies>

support/quartz/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-quartz</artifactId>
     <name>Apache Shiro :: Support :: Quartz</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>quartz</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

support/servlet-plugin/pom.xml

@@ -33,6 +33,9 @@
     <description>
         Automatically deploys Shiro in a servlet container-based web application.
     </description>
+    <properties>
+        <module.name>servlet.plugin</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

support/spring-boot/spring-boot-starter/pom.xml

@@ -30,6 +30,9 @@
 
     <artifactId>shiro-spring-boot-starter</artifactId>
     <name>Apache Shiro :: Support :: Spring Boot</name>
+    <properties>
+        <module.name>spring.boot.starter</module.name>
+    </properties>
 
     <dependencies>
 

support/spring-boot/spring-boot-web-starter/pom.xml

@@ -30,6 +30,9 @@
 
     <artifactId>shiro-spring-boot-web-starter</artifactId>
     <name>Apache Shiro :: Support :: Spring Boot Web</name>
+    <properties>
+        <module.name>spring.boot.web.starter</module.name>
+    </properties>
 
     <dependencies>
 

support/spring/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-spring</artifactId>
     <name>Apache Shiro :: Support :: Spring</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>spring</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

tools/hasher/pom.xml

@@ -29,6 +29,9 @@
     <artifactId>shiro-tools-hasher</artifactId>
     <name>Apache Shiro :: Tools :: Hasher</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>tools.hasher</module.name>
+    </properties>
 
     <dependencies>
         <dependency>

web/pom.xml

@@ -30,6 +30,9 @@
     <artifactId>shiro-web</artifactId>
     <name>Apache Shiro :: Web</name>
     <packaging>bundle</packaging>
+    <properties>
+        <module.name>web</module.name>
+    </properties>
 
     <dependencies>
         <dependency>