[java-idp-plugin-scripting] 02/02: Unlock parent POM and clean up deps. Add Javadoc links.

[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-scripting.

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

commit 25b66cba99f192b1b9954c812074f601f8088e02
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 25 14:38:44 2023 -0400

    Unlock parent POM and clean up deps. Add Javadoc links.
---
 nashorn-jdk-impl/pom.xml | 29 +++++++----------------------
 pom.xml                  | 23 ++++++++++++++++++++++-
 rhino-impl/pom.xml       |  9 +++++----
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/nashorn-jdk-impl/pom.xml b/nashorn-jdk-impl/pom.xml
index cb5a887..a64eb32 100644
--- a/nashorn-jdk-impl/pom.xml
+++ b/nashorn-jdk-impl/pom.xml
@@ -70,34 +70,19 @@
         </dependency>
 
         <!--  Provided - IdP and its dependencies. -->
-
-        <dependency>
-            <groupId>net.shibboleth.idp.plugin.scripting</groupId>
-            <artifactId>idp-plugin-scripting-api</artifactId>
-            <version>2.0.1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${slf4j.groupId}</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-admin-api</artifactId>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-admin-impl</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-admin-impl</artifactId>
+            <groupId>${shib-profile.groupId}</groupId>
+            <artifactId>shib-profile-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--  TEST -->
+        
+        <!-- Test -->
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index f00a76e..8c85f06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,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.scripting</groupId>
@@ -21,6 +21,8 @@
     </description>
 
     <properties>
+        <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
+        <shib-profile.version>5.0.0</shib-profile.version>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
         <idp.version>5.0.0</idp.version>
         <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
@@ -38,6 +40,15 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- Import Dependencies:  Shib-Metadata/Attribute/Profile -->
+            <dependency>
+                <groupId>${shib-profile.groupId}</groupId>
+                <artifactId>shib-profile-bom</artifactId>
+                <version>${shib-profile.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Import IdP -->
             <dependency>
                 <groupId>${idp.groupId}</groupId>
                 <artifactId>idp-bom</artifactId>
@@ -58,6 +69,16 @@
     
     <build>
         <plugins>
+            <plugin>
+                <groupId>net.shibboleth.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <links combine.children="append">
+                        <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>
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index 9688ccf..cab5b10 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -47,13 +47,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-admin-api</artifactId>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-admin-impl</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-admin-impl</artifactId>
+            <groupId>${shib-profile.groupId}</groupId>
+            <artifactId>shib-profile-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

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