[java-idp-plugin-metadatagen] branch main updated: Unlock parent POM and clean up deps, doc links, etc.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-plugin-metadatagen.

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

The following commit(s) were added to refs/heads/main by this push:
     new ad88f94  Unlock parent POM and clean up deps, doc links, etc.
ad88f94 is described below

commit ad88f949e3fe3090b9e774a0f3023e9b98be2711
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 25 15:26:57 2023 -0400

    Unlock parent POM and clean up deps, doc links, etc.
---
 metadatagen-impl/pom.xml | 15 ++------------
 pom.xml                  | 54 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/metadatagen-impl/pom.xml b/metadatagen-impl/pom.xml
index e7b96df..0144f74 100644
--- a/metadatagen-impl/pom.xml
+++ b/metadatagen-impl/pom.xml
@@ -42,13 +42,13 @@
         </dependency>
 
         <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
+            <groupId>${shib-profile.groupId}</groupId>
             <artifactId>shib-profile-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
+            <groupId>${shib-metadata.groupId}</groupId>
             <artifactId>shib-metadata-api</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -89,11 +89,6 @@
             <artifactId>shib-support</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-velocity</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>${spring.groupId}</groupId>
@@ -130,12 +125,6 @@
         </dependency>
 
         <!-- Test dependencies. -->
-        <dependency>
-            <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-conf-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 
diff --git a/pom.xml b/pom.xml
index 1911eed..f8731b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>17.0.1</version>
+        <version>17.0.2-SNAPSHOT</version>
     </parent>
     
     <groupId>net.shibboleth.idp.plugin.metadatagen</groupId>
@@ -18,11 +18,14 @@
     <properties>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
         <idp.version>5.0.0</idp.version>
+        <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
+        <shib-profile.version>5.0.0</shib-profile.version>
+        <shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
+        <shib-metadata.version>5.0.0</shib-metadata.version>
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>5.0.0</opensaml.version>
         <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
         <shib-shared.version>9.0.0</shib-shared.version>
-        <shib-profile.version>5.0.0</shib-profile.version>
         <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
     </properties>
     
@@ -57,11 +60,6 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <dependencyManagement>
@@ -84,13 +82,22 @@
             
             <!-- Import Dependencies: Profile -->
             <dependency>
-                <groupId>${shib-shared.groupId}</groupId>
+                <groupId>${shib-profile.groupId}</groupId>
                 <artifactId>shib-profile-bom</artifactId>
                 <version>${shib-profile.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            
+
+            <!-- Import Dependencies: Metadata -->
+            <dependency>
+                <groupId>${shib-metadata.groupId}</groupId>
+                <artifactId>shib-metadata-bom</artifactId>
+                <version>${shib-metadata.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+ 
             <!-- Import Dependencies: OpenSAML -->
             <dependency>
                 <groupId>${opensaml.groupId}</groupId>
@@ -117,4 +124,33 @@
         <module>metadatagen-dist</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.shibboleth.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <links combine.children="append">
+                        <link>${javadoc.url}/java-opensaml/${opensaml.version}</link>
+                        <link>${javadoc.url}/java-shib-profile/${shib-profile.version}</link>
+                        <link>${javadoc.url}/java-identity-provider/${idp.version}</link>
+                    </links>
+                </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>
+                            <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.