[java-idp-plugin-duo] branch main updated: Fix Manifest construction

[Phil Smart]

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

philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.

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

The following commit(s) were added to refs/heads/main by this push:
       new  4b11812   Fix Manifest construction
4b11812 is described below

commit 4b118121088d20aea0535aea4d993242c784c289
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Mar 8 19:54:25 2021 +0000

    Fix Manifest construction
    
     - Trailing slash needed
     - Manifest split out to each individual plugin
---
 idp-duo-impl/pom.xml               | 24 +-----------------------
 idp-duo-nimbus-client-impl/pom.xml | 24 +++++++++++++++++++++++-
 idp-duo-sdk-client-impl/pom.xml    | 22 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/idp-duo-impl/pom.xml b/idp-duo-impl/pom.xml
index 4bb46d2..377344a 100644
--- a/idp-duo-impl/pom.xml
+++ b/idp-duo-impl/pom.xml
@@ -178,29 +178,7 @@
 						<exclude>credentials/**</exclude>
 					</excludes>
 				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<index>true</index>
-						<manifestEntries>
-							<Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
-						</manifestEntries>
-						<manifestSections>
-							<manifestSection>
-								<name>net/shibboleth/idp/plugin/duo</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>
+			</plugin>			
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/idp-duo-nimbus-client-impl/pom.xml b/idp-duo-nimbus-client-impl/pom.xml
index bcec9c9..9869504 100644
--- a/idp-duo-nimbus-client-impl/pom.xml
+++ b/idp-duo-nimbus-client-impl/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
-        <automatic.module.name>net.shibboleth.idp.plugin.authn.duo.sdk.impl</automatic.module.name>
+        <automatic.module.name>net.shibboleth.idp.plugin.authn.duo.nimbus.impl</automatic.module.name>
     </properties>
 
     <dependencies>
@@ -97,6 +97,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+                        </manifestEntries>
+                        <manifestSections>
+                            <manifestSection>
+                                <name>net/shibboleth/idp/plugin/authn/duo/nimbus/</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>
 
diff --git a/idp-duo-sdk-client-impl/pom.xml b/idp-duo-sdk-client-impl/pom.xml
index 1fdc5b6..cbed1cc 100644
--- a/idp-duo-sdk-client-impl/pom.xml
+++ b/idp-duo-sdk-client-impl/pom.xml
@@ -152,6 +152,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+                        </manifestEntries>
+                        <manifestSections>
+                            <manifestSection>
+                                <name>net/shibboleth/idp/plugin/authn/duo/sdk/</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>
 

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