[java-idp-oidc] branch main updated: JPAR-212 - Migrate javadoc links into individual projects

Scott Cantor cantor.2 at osu.edu
Tue Sep 19 20:04:21 UTC 2023


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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=6de84a60c8995bce5f5257f0888fa8ccd96f0729

The following commit(s) were added to refs/heads/main by this push:
     new 6de84a60 JPAR-212 - Migrate javadoc links into individual projects
6de84a60 is described below

commit 6de84a60c8995bce5f5257f0888fa8ccd96f0729
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 19 15:03:54 2023 -0500

    JPAR-212 - Migrate javadoc links into individual projects
    
    https://shibboleth.atlassian.net/browse/JPAR-212
    
    Also major POM cleanup.
---
 idp-oidc-extension-impl/pom.xml |  2 +-
 pom.xml                         | 70 +++++++++++++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 28f82d85..ab04d909 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -326,7 +326,7 @@
         <dependency>
             <groupId>${oidc-common.groupId}</groupId>
             <artifactId>oidc-common-crypto-impl</artifactId>
-            <version>${oidc.common.version}</version>
+            <version>${oidc-common.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 97d86939..91667e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,22 +14,28 @@
     <packaging>pom</packaging>
     <properties>
         <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
+        <shib-shared.version>9.0.0</shib-shared.version>
         <oidc-common.groupId>net.shibboleth.oidc</oidc-common.groupId>
+        <oidc-common.version>3.0.0</oidc-common.version>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
         <idp.version>5.0.0</idp.version>
+        <shib-profile.version>5.0.0</shib-profile.version>
+        <shib-attribute.version>5.0.0</shib-attribute.version>
+        <shib-metadata.version>5.0.0</shib-metadata.version>
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>5.0.0</opensaml.version>
-        <java-shib-shared.version>9.0.0</java-shib-shared.version>
         <nimbus-jose-jwt.version>9.29</nimbus-jose-jwt.version>
         <oauth2-oidc-sdk.version>10.5.1</oauth2-oidc-sdk.version>
         <json.smart.version>2.4.8</json.smart.version>
         <accessors.smart.version>1.2</accessors.smart.version>
         <nimbus.lang.tag.version>1.7</nimbus.lang.tag.version>
         <nimbus.content.type.version>2.2</nimbus.content.type.version>
-        <oidc.common.version>3.0.0</oidc.common.version>
         <oidc.config.version>2.0.0</oidc.config.version>
         <commons.io.version>2.6</commons.io.version>
         <checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
+
+        <!-- TODO: Remove once in project parent: Base URL for all our deployed javadocs. -->
+        <javadoc.url>https://shibboleth.net/api</javadoc.url>
     </properties>
     
     <description>
@@ -97,16 +103,42 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Import Dependencies: Shib-Metadata/Attribute/Profile -->
             <dependency>
-                <groupId>${idp.groupId}</groupId>
-                <artifactId>idp-cli</artifactId>
-                <version>${idp.version}</version>
+                <groupId>${shib-shared.groupId}</groupId>
+                <artifactId>shib-profile-bom</artifactId>
+                <version>${shib-profile.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Import Dependencies: OpenSAML -->
+            <dependency>
+                <groupId>${opensaml.groupId}</groupId>
+                <artifactId>opensaml-bom</artifactId>
+                <version>${opensaml.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Import Dependencies: Shib-Shared -->
+            <dependency>
+                <groupId>${shib-shared.groupId}</groupId>
+                <artifactId>shib-attribute-bom</artifactId>
+                <version>${shib-attribute.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>${shib-shared.groupId}</groupId>
+                <artifactId>shib-metadata-bom</artifactId>
+                <version>${shib-metadata.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <!-- OIDC Common BOM when importing OIDC dependencies -->
-             <dependency>
+            <dependency>
                 <groupId>${oidc-common.groupId}</groupId>
                 <artifactId>oidc-common-bom</artifactId>
-                <version>${oidc.common.version}</version>
+                <version>${oidc-common.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -124,8 +156,8 @@
             <!-- Test bom dependencies -->
             <dependency>
                 <groupId>${shib-shared.groupId}</groupId>
-                <artifactId>shib-testing</artifactId>
-                <version>9.0.0</version>
+                <artifactId>shib-shared-bom</artifactId>
+                <version>${shib-shared.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -152,4 +184,24 @@
         <url>https://git.shibboleth.net/view/?p=java-idp-oidc.git</url>
     </scm>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.shibboleth.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <links combine.children="append">
+                        <link>${javadoc.url}/java-shib-shared/${shib-shared.version}</link>
+                        <link>${javadoc.url}/java-opensaml/${opensaml.version}</link>
+                        <link>${javadoc.url}/java-shib-metadata/${shib-metadata.version}</link>
+                        <link>${javadoc.url}/java-shib-attribute/${shib-attribute.version}</link>
+                        <link>${javadoc.url}/java-shib-profile/${shib-profile.version}</link>
+                        <link>${javadoc.url}/java-identity-provider/${idp.version}</link>
+                        <link>${javadoc.url}/java-oidc-common/${oidc-common.version}</link>
+                    </links>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

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


More information about the commits mailing list