You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lp...@apache.org on 2023/06/30 15:56:27 UTC
[shiro] branch main updated: enh: added JPMS module names to JAR manifests
This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new 14ce01d2e enh: added JPMS module names to JAR manifests
new ff2275d66 Merge pull request #961 from lprimak/jpms-module-names
14ce01d2e is described below
commit 14ce01d2eb08c676af4525d14ec9a7515a43d7c8
Author: lprimak <le...@flowlogix.com>
AuthorDate: Thu Jun 29 23:18:53 2023 -0500
enh: added JPMS module names to JAR manifests
---
cache/pom.xml | 3 +++
config/core/pom.xml | 3 +++
config/ogdl/pom.xml | 3 +++
core/pom.xml | 3 +++
crypto/cipher/pom.xml | 3 +++
crypto/core/pom.xml | 3 +++
crypto/hash/pom.xml | 3 +++
crypto/support/hashes/argon2/pom.xml | 3 +++
crypto/support/hashes/bcrypt/pom.xml | 3 +++
event/pom.xml | 3 +++
integration-tests/jaxrs/meecrowave/pom.xml | 4 +++-
integration-tests/jaxrs/openliberty/pom.xml | 1 +
integration-tests/jaxrs/tests/pom.xml | 1 +
integration-tests/meecrowave-support/pom.xml | 1 +
integration-tests/support/pom.xml | 3 +++
lang/pom.xml | 3 +++
pom.xml | 6 +++++-
samples/aspectj/pom.xml | 3 +++
samples/quickstart-guice/pom.xml | 3 +++
samples/quickstart/pom.xml | 3 +++
samples/spring-boot-web/pom.xml | 3 +++
samples/spring-boot/pom.xml | 3 +++
samples/spring/pom.xml | 4 +++-
support/aspectj/pom.xml | 3 +++
support/cdi/pom.xml | 3 +++
support/ehcache/pom.xml | 3 +++
support/guice/pom.xml | 1 +
support/hazelcast/pom.xml | 1 +
support/jakarta-ee/pom.xml | 1 +
support/jaxrs/pom.xml | 4 +++-
support/jcache/pom.xml | 2 +-
support/quartz/pom.xml | 3 +++
support/servlet-plugin/pom.xml | 3 +++
support/spring-boot/spring-boot-starter/pom.xml | 3 +++
support/spring-boot/spring-boot-web-starter/pom.xml | 3 +++
support/spring/pom.xml | 3 +++
tools/hasher/pom.xml | 3 +++
web/pom.xml | 3 +++
38 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/cache/pom.xml b/cache/pom.xml
index 060000199..efbdae8ee 100644
--- a/cache/pom.xml
+++ b/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>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index 0bf23a527..c41b94126 100644
--- a/config/core/pom.xml
+++ b/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>
diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
index b0c08d8b8..dceb2065e 100644
--- a/config/ogdl/pom.xml
+++ b/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>
diff --git a/core/pom.xml b/core/pom.xml
index 3d5f827ff..f71ea872e 100644
--- a/core/pom.xml
+++ b/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>
diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index b1533ab7c..919b0e7bc 100644
--- a/crypto/cipher/pom.xml
+++ b/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>
diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
index 244e3dedf..6105d06b1 100644
--- a/crypto/core/pom.xml
+++ b/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>
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index 49688bcce..2fb69bfcf 100644
--- a/crypto/hash/pom.xml
+++ b/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>
diff --git a/crypto/support/hashes/argon2/pom.xml b/crypto/support/hashes/argon2/pom.xml
index 237322e34..c82b586fb 100644
--- a/crypto/support/hashes/argon2/pom.xml
+++ b/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>
diff --git a/crypto/support/hashes/bcrypt/pom.xml b/crypto/support/hashes/bcrypt/pom.xml
index 9590c81d2..d25aa0c3d 100644
--- a/crypto/support/hashes/bcrypt/pom.xml
+++ b/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>
diff --git a/event/pom.xml b/event/pom.xml
index 528fe5a77..090e6a3cf 100644
--- a/event/pom.xml
+++ b/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>
diff --git a/integration-tests/jaxrs/meecrowave/pom.xml b/integration-tests/jaxrs/meecrowave/pom.xml
index 1b4828ee9..c82c5d1b1 100644
--- a/integration-tests/jaxrs/meecrowave/pom.xml
+++ b/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>
diff --git a/integration-tests/jaxrs/openliberty/pom.xml b/integration-tests/jaxrs/openliberty/pom.xml
index 5fa2f3062..db56a309a 100644
--- a/integration-tests/jaxrs/openliberty/pom.xml
+++ b/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>
diff --git a/integration-tests/jaxrs/tests/pom.xml b/integration-tests/jaxrs/tests/pom.xml
index a7abb10d8..0c03a81ad 100644
--- a/integration-tests/jaxrs/tests/pom.xml
+++ b/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>
diff --git a/integration-tests/meecrowave-support/pom.xml b/integration-tests/meecrowave-support/pom.xml
index 6bf19255e..7a97c7724 100644
--- a/integration-tests/meecrowave-support/pom.xml
+++ b/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>
diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml
index 177d695fa..3c3f5f375 100644
--- a/integration-tests/support/pom.xml
+++ b/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>
diff --git a/lang/pom.xml b/lang/pom.xml
index ca56a171e..943c986c7 100644
--- a/lang/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 181000c97..91e8071ca 100644
--- a/pom.xml
+++ b/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>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index 36329e42f..9bb5686c5 100644
--- a/samples/aspectj/pom.xml
+++ b/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>
diff --git a/samples/quickstart-guice/pom.xml b/samples/quickstart-guice/pom.xml
index 321804a44..9131eccfd 100644
--- a/samples/quickstart-guice/pom.xml
+++ b/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>
diff --git a/samples/quickstart/pom.xml b/samples/quickstart/pom.xml
index 0916a7292..597feadd8 100644
--- a/samples/quickstart/pom.xml
+++ b/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>
diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
index 652cb6dd1..5eb610b0d 100644
--- a/samples/spring-boot-web/pom.xml
+++ b/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>
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index e333d8613..eb8543a84 100644
--- a/samples/spring-boot/pom.xml
+++ b/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>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 38658cb8e..2cd80ffd9 100644
--- a/samples/spring/pom.xml
+++ b/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>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index a3abf87ce..75d2b4a6f 100644
--- a/support/aspectj/pom.xml
+++ b/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>
diff --git a/support/cdi/pom.xml b/support/cdi/pom.xml
index 0e75db28b..0bf6fef19 100644
--- a/support/cdi/pom.xml
+++ b/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>
diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
index 9d3163ef2..99b1a00f8 100644
--- a/support/ehcache/pom.xml
+++ b/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>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index d2e13ca4e..d44d0ef56 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -31,6 +31,7 @@
<packaging>bundle</packaging>
<properties>
+ <module.name>guice</module.name>
<japicmp.skip>true</japicmp.skip>
</properties>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 866f8b33a..bee783d83 100644
--- a/support/hazelcast/pom.xml
+++ b/support/hazelcast/pom.xml
@@ -32,6 +32,7 @@
<properties>
<hazelcast.osgi.importRange>[3, 4)</hazelcast.osgi.importRange>
+ <module.name>hazelcast</module.name>
</properties>
<dependencies>
diff --git a/support/jakarta-ee/pom.xml b/support/jakarta-ee/pom.xml
index 15be68c83..f45b4545d 100644
--- a/support/jakarta-ee/pom.xml
+++ b/support/jakarta-ee/pom.xml
@@ -31,6 +31,7 @@
</parent>
<properties>
+ <module.name>jakarta.ee</module.name>
<jacoco.skip>true</jacoco.skip>
</properties>
diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index 8bdb60d4a..b56cd6517 100644
--- a/support/jaxrs/pom.xml
+++ b/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>
diff --git a/support/jcache/pom.xml b/support/jcache/pom.xml
index c719845d5..36d2270dd 100644
--- a/support/jcache/pom.xml
+++ b/support/jcache/pom.xml
@@ -32,7 +32,7 @@
<packaging>bundle</packaging>
<properties>
-
+ <module.name>jcache</module.name>
</properties>
<dependencies>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index 01d271523..9394eaaa8 100644
--- a/support/quartz/pom.xml
+++ b/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>
diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml
index b4e61de06..1699c139f 100644
--- a/support/servlet-plugin/pom.xml
+++ b/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>
diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml
index d824b28fe..65cf593a8 100644
--- a/support/spring-boot/spring-boot-starter/pom.xml
+++ b/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>
diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml
index 07bb176e9..ef8020685 100644
--- a/support/spring-boot/spring-boot-web-starter/pom.xml
+++ b/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>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 8dfceec7f..06b208953 100644
--- a/support/spring/pom.xml
+++ b/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>
diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml
index 9764b56c5..bac9656a2 100644
--- a/tools/hasher/pom.xml
+++ b/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>
diff --git a/web/pom.xml b/web/pom.xml
index 10622e3c4..53198929d 100644
--- a/web/pom.xml
+++ b/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>