[java-idp-plugin-jetty] 182/186: Manifest issues

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=f36efb2e3732098f89c2b91db7e6e41f9be0b932

commit f36efb2e3732098f89c2b91db7e6e41f9be0b932
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 19 17:04:47 2025 +0100

    Manifest issues
---
 jetty-cli/pom.xml  | 34 +++++++---------------------------
 jetty-impl/pom.xml | 19 +------------------
 pom.xml            | 22 +++++++++++++++++++++-
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/jetty-cli/pom.xml b/jetty-cli/pom.xml
index 29ff1f4..dd70e8f 100644
--- a/jetty-cli/pom.xml
+++ b/jetty-cli/pom.xml
@@ -17,6 +17,10 @@
     <artifactId>jetty-plugin-cli</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <automatic.module.name>net.shibboleth.idp.plugin.jetty.cli</automatic.module.name>
+    </properties>
+    
     <dependencies>
 
         <dependency>
@@ -46,17 +50,17 @@
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-cli</artifactId>
-           <scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-networking</artifactId>
-           <scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-networking-spring</artifactId>
-           <scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${slf4j.groupId}</groupId>
@@ -92,28 +96,4 @@
         </dependency>
 
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestSections>
-                            <manifestSection>
-                                <name>net/shibboleth/idp/jettybase/plugin</name>
-                                <manifestEntries>
-                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
-                                    <Implementation-Version>${project.version}</Implementation-Version>
-                                    <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
-                                </manifestEntries>
-                            </manifestSection>
-                        </manifestSections>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/jetty-impl/pom.xml b/jetty-impl/pom.xml
index 1f832a7..3297c96 100644
--- a/jetty-impl/pom.xml
+++ b/jetty-impl/pom.xml
@@ -19,6 +19,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <automatic.module.name>net.shibboleth.idp.plugin.jetty</automatic.module.name>
         <assemblyDirectory>${project.build.directory}/jetty-base</assemblyDirectory>
     </properties>
 
@@ -81,24 +82,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestSections>
-                            <manifestSection>
-                                <name>net/shibboleth/idp/jettybase/plugin</name>
-                                <manifestEntries>
-                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
-                                    <Implementation-Version>${project.version}</Implementation-Version>
-                                    <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
-                                </manifestEntries>
-                            </manifestSection>
-                        </manifestSections>
-                    </archive>
-                </configuration>
-            </plugin>
             <!-- Copy (linux) files to the jetty base we will create (for use outside the plugin -->
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d80bbea..2a15f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <description>
         Parent project for building a Jetty plugin
         which deploys a appropriate jetty-base (as a module).
-	The module also has commands to dowbnload jetty and procrun (on windows)
+        The module also has commands to dowbnload jetty and procrun (on windows)
     </description>
     <groupId>net.shibboleth.idp.plugin.jetty</groupId>
     <artifactId>jetty-plugin-parent</artifactId>
@@ -60,4 +60,24 @@
         <module>jetty-dist</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+                            <Sealed>true</Sealed>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.