Tidying of security poms
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
diff --git a/appserver/security/core-ee/pom.xml b/appserver/security/core-ee/pom.xml
index b3aa726..726e3af 100644
--- a/appserver/security/core-ee/pom.xml
+++ b/appserver/security/core-ee/pom.xml
@@ -17,18 +17,21 @@
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.glassfish.main.security</groupId>
<artifactId>securitymodule</artifactId>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>security-ee</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>Java EE Security Core Classes</name>
+
<developers>
<developer>
<id>kumarjayanti</id>
@@ -52,6 +55,108 @@
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.security</groupId>
+ <artifactId>security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency><!-- for AuditModule -->
+ <groupId>org.glassfish.main.common</groupId>
+ <artifactId>glassfish-ee-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.admin</groupId>
+ <artifactId>config-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.deployment</groupId>
+ <artifactId>dol</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.common</groupId>
+ <artifactId>common-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.security</groupId>
+ <artifactId>ssl-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.deployment</groupId>
+ <artifactId>deployment-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.authentication</groupId>
+ <artifactId>jakarta.authentication-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.authorization</groupId>
+ <artifactId>jakarta.authorization-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.security</groupId>
+ <artifactId>jaspic.provider.framework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.common</groupId>
+ <artifactId>internal-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <!-- Don't set scope as provided. See issue #5992 -->
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.common</groupId>
+ <artifactId>glassfish-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.ejb</groupId>
+ <artifactId>ejb-internal-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.connectors</groupId>
+ <artifactId>connectors-internal-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.external</groupId>
+ <artifactId>management-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.gmbal</groupId>
+ <artifactId>gmbal</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.libpam4j</groupId>
+ <artifactId>libpam4j</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.annotations</groupId>
+ <artifactId>logging-annotation-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
@@ -156,107 +261,6 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.main.security</groupId>
- <artifactId>security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency> <!-- for AuditModule -->
- <groupId>org.glassfish.main.common</groupId>
- <artifactId>glassfish-ee-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.admin</groupId>
- <artifactId>config-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.deployment</groupId>
- <artifactId>dol</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.common</groupId>
- <artifactId>common-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.security</groupId>
- <artifactId>ssl-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.deployment</groupId>
- <artifactId>deployment-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.authentication</groupId>
- <artifactId>jakarta.authentication-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.authorization</groupId>
- <artifactId>jakarta.authorization-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.security</groupId>
- <artifactId>jaspic.provider.framework</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.common</groupId>
- <artifactId>internal-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <!-- Don't set scope as provided. See issue #5992 -->
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.common</groupId>
- <artifactId>glassfish-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.ejb</groupId>
- <artifactId>jakarta.ejb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.ejb</groupId>
- <artifactId>ejb-internal-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.connectors</groupId>
- <artifactId>connectors-internal-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>management-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.gmbal</groupId>
- <artifactId>gmbal</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.libpam4j</groupId>
- <artifactId>libpam4j</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.annotations</groupId>
- <artifactId>logging-annotation-processor</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
</project>
diff --git a/appserver/security/ejb.security/pom.xml b/appserver/security/ejb.security/pom.xml
index b3e9160..d924d32 100644
--- a/appserver/security/ejb.security/pom.xml
+++ b/appserver/security/ejb.security/pom.xml
@@ -17,18 +17,21 @@
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.glassfish.main.security</groupId>
<artifactId>securitymodule</artifactId>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>ejb.security</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>Ejb Security Integration</name>
+
<developers>
<developer>
<id>kumarjayanti</id>
@@ -47,25 +50,7 @@
</roles>
</developer>
</developers>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
@@ -137,4 +122,22 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/appserver/security/inmemory.jacc.provider/pom.xml b/appserver/security/inmemory.jacc.provider/pom.xml
index 002ea55..68f1287 100644
--- a/appserver/security/inmemory.jacc.provider/pom.xml
+++ b/appserver/security/inmemory.jacc.provider/pom.xml
@@ -17,18 +17,21 @@
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.glassfish.main.security</groupId>
+ <groupId>org.glassfish.main.security</groupId>
<artifactId>securitymodule</artifactId>
<version>6.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<artifactId>inmemory.jacc.provider</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>A Pluggable InMemory JACC Provider</name>
+
<developers>
<developer>
<id>monzillo</id>
@@ -39,19 +42,7 @@
</roles>
</developer>
</developers>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
@@ -77,4 +68,16 @@
<!-- Don't set scope as provided. See issue #5992 -->
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/appserver/security/jaspic-provider-framework/pom.xml b/appserver/security/jaspic-provider-framework/pom.xml
index 4f97a6c..50e7f5b 100644
--- a/appserver/security/jaspic-provider-framework/pom.xml
+++ b/appserver/security/jaspic-provider-framework/pom.xml
@@ -17,20 +17,22 @@
-->
-<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>
- <parent>
- <artifactId>securitymodule</artifactId>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.glassfish.main.security</groupId>
+ <artifactId>securitymodule</artifactId>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>jaspic.provider.framework</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>Jaspic Provider Framework</name>
<description>JSR-196 Provider Framework Reference Implementation</description>
-
+
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git a/appserver/security/pom.xml b/appserver/security/pom.xml
index 4bd52cf..58fb976 100644
--- a/appserver/security/pom.xml
+++ b/appserver/security/pom.xml
@@ -17,19 +17,23 @@
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
<groupId>org.glassfish.main.security</groupId>
<artifactId>securitymodule</artifactId>
<packaging>pom</packaging>
+
<name>GlassFish Security Parent</name>
<description>Security Infrastructure and Technology Integration Modules</description>
+
<modules>
<module>webintegration</module>
<module>core-ee</module>
diff --git a/appserver/security/security-all/pom.xml b/appserver/security/security-all/pom.xml
index 94fcdc5..41cee13 100644
--- a/appserver/security/security-all/pom.xml
+++ b/appserver/security/security-all/pom.xml
@@ -17,17 +17,21 @@
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.glassfish.main.security</groupId>
+ <groupId>org.glassfish.main.security</groupId>
<artifactId>securitymodule</artifactId>
<version>6.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<artifactId>security-all</artifactId>
<packaging>pom</packaging>
+
<name>Security Related Implementation for GlassFish</name>
+
<developers>
<developer>
<id>kumarjayanti</id>
@@ -38,6 +42,7 @@
</roles>
</developer>
</developers>
+
<dependencies>
<dependency>
<groupId>org.glassfish.main.security</groupId>
diff --git a/appserver/security/webintegration/pom.xml b/appserver/security/webintegration/pom.xml
index e3121f9..623b120 100644
--- a/appserver/security/webintegration/pom.xml
+++ b/appserver/security/webintegration/pom.xml
@@ -17,18 +17,21 @@
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.glassfish.main.security</groupId>
<artifactId>securitymodule</artifactId>
<version>6.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<artifactId>websecurity</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>WebTier Security Integration</name>
+
<developers>
<developer>
<id>kumarjayanti</id>
@@ -47,30 +50,7 @@
</roles>
</developer>
</developers>
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <probe-provider-class-names>com.sun.web.security.LoginProbeProvider</probe-provider-class-names>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
@@ -131,12 +111,37 @@
<artifactId>jakarta.authentication-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.external</groupId>
- <artifactId>management-api</artifactId>
+ <groupId>org.glassfish.external</groupId>
+ <artifactId>management-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.gmbal</groupId>
- <artifactId>gmbal</artifactId>
+ <groupId>org.glassfish.gmbal</groupId>
+ <artifactId>gmbal</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <probe-provider-class-names>com.sun.web.security.LoginProbeProvider</probe-provider-class-names>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/appserver/security/webservices.security/pom.xml b/appserver/security/webservices.security/pom.xml
index 09a6a52..4066b59 100644
--- a/appserver/security/webservices.security/pom.xml
+++ b/appserver/security/webservices.security/pom.xml
@@ -17,9 +17,7 @@
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
