[java-idp-plugin-oidc-rp] branch main updated: JPAR-212 - Migrate javadoc links into individual projects
Phil Smart
philip.smart at jisc.ac.uk
Wed Sep 20 16:32:48 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=9462e719904a6eff01724c06da31cffb6838bebd
The following commit(s) were added to refs/heads/main by this push:
new 9462e71 JPAR-212 - Migrate javadoc links into individual projects
9462e71 is described below
commit 9462e719904a6eff01724c06da31cffb6838bebd
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Sep 20 11:32:46 2023 -0500
JPAR-212 - Migrate javadoc links into individual projects
- POM cleanups
https://shibboleth.atlassian.net/browse/JPAR-212
---
idp-oidc-rp-api/pom.xml | 31 +++------------
idp-oidc-rp-impl/pom.xml | 82 ++++++++++++++++++++++++++++-----------
pom.xml | 99 +++++++++++++++++++++++++++++++++---------------
3 files changed, 133 insertions(+), 79 deletions(-)
diff --git a/idp-oidc-rp-api/pom.xml b/idp-oidc-rp-api/pom.xml
index 04ae197..8515d3d 100644
--- a/idp-oidc-rp-api/pom.xml
+++ b/idp-oidc-rp-api/pom.xml
@@ -37,7 +37,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -66,7 +66,7 @@
<artifactId>shib-support</artifactId>
</dependency>
<dependency>
- <groupId>${shib-shared.groupId}</groupId>
+ <groupId>${shib-profile.groupId}</groupId>
<artifactId>shib-profile-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -74,11 +74,6 @@
<groupId>com.nimbusds</groupId>
<artifactId>content-type</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
@@ -89,24 +84,14 @@
<groupId>${idp.groupId}</groupId>
<artifactId>idp-authn-api</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-saml-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -114,20 +99,14 @@
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Test -->
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/idp-oidc-rp-impl/pom.xml b/idp-oidc-rp-impl/pom.xml
index 6a0d13b..e3a4968 100644
--- a/idp-oidc-rp-impl/pom.xml
+++ b/idp-oidc-rp-impl/pom.xml
@@ -21,12 +21,12 @@
<dependencies>
<!-- compile time intra project dependencies -->
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-oidc-rp-api</artifactId>
</dependency>
<!-- provided dependencies -->
<dependency>
- <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
+ <groupId>${oidc-config.groupId}</groupId>
<artifactId>idp-plugin-oidc-config-impl</artifactId>
<scope>provided</scope>
</dependency>
@@ -71,27 +71,27 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-metadata-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-metadata-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-attribute-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -101,7 +101,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-attribute-impl</artifactId>
<scope>provided</scope>
</dependency>
@@ -130,6 +130,11 @@
<artifactId>opensaml-security-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-profile-api</artifactId>
@@ -141,7 +146,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-profile-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -156,7 +161,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
@@ -220,12 +225,7 @@
<artifactId>idp-admin-impl</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-profile-api</artifactId>
<scope>provided</scope>
@@ -235,6 +235,11 @@
<artifactId>idp-saml-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
@@ -248,14 +253,25 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-support</artifactId>
+ <scope>provided</scope>
</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-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
<artifactId>shib-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
@@ -269,7 +285,17 @@
<artifactId>shib-service</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Test dependency -->
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-saml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-testing</artifactId>
@@ -296,7 +322,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${idp.oidc.groupId}</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-impl</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -305,14 +331,19 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-messaging-impl</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-profile-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-oidc-rp-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
@@ -321,7 +352,12 @@
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-filter-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Spring webflow tests require Junit4, runs in TestNG bridge -->
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index e75074d..c108192 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,15 +19,25 @@
<idp.version>5.0.0</idp.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0</opensaml.version>
- <oidc.common.version>3.0.1-SNAPSHOT</oidc.common.version>
- <idp.oidc.config.version>2.0.0</idp.oidc.config.version>
<okhttp3.mockserver.version>4.9.3</okhttp3.mockserver.version>
- <shib.shared.testing.version>9.0.0</shib.shared.testing.version>
- <okhttp3.tls.version>4.9.3</okhttp3.tls.version>
- <idp.oidc.groupId>net.shibboleth.oidc</idp.oidc.groupId>
+ <shib-shared.testing.version>9.0.0</shib-shared.testing.version>
+ <okhttp3.tls.version>4.9.3</okhttp3.tls.version>
+ <oidc-config.groupId>net.shibboleth.idp.plugin.config.oidc</oidc-config.groupId>
+ <oidc-config.version>2.0.0</oidc-config.version>
+ <oidc-common.groupId>net.shibboleth.oidc</oidc-common.groupId>
+ <oidc-common.version>3.0.1-SNAPSHOT</oidc-common.version>
<shib-shared.groupId>net.shibboleth</shib-shared.groupId>
- <java-shib-shared.version>9.0.0</java-shib-shared.version>
+ <shib-shared.version>9.0.0</shib-shared.version>
+ <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
+ <shib-profile.version>5.0.0</shib-profile.version>
+ <shib-attribute.groupId>net.shibboleth</shib-attribute.groupId>
+ <shib-attribute.version>5.0.0</shib-attribute.version>
+ <shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
+ <shib-metadata.version>5.0.0</shib-metadata.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/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>
<distributionManagement>
@@ -50,6 +60,11 @@
</scm>
<dependencies>
+ <dependency>
+ <groupId>${slf4j.groupId}</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Project wide test Dependencies -->
<dependency>
<groupId>org.testng</groupId>
@@ -61,11 +76,6 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${slf4j.groupId}</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -77,34 +87,55 @@
<dependencies>
<!-- OIDC Shared config, which is a runtime dependency to the whole project -->
<dependency>
- <groupId>net.shibboleth.idp.plugin.config.oidc</groupId>
+ <groupId>${oidc-config.groupId}</groupId>
<artifactId>idp-plugin-oidc-config-impl</artifactId>
- <version>${idp.oidc.config.version}</version>
+ <version>${oidc-config.version}</version>
</dependency>
<!-- Its own dependencies -->
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-oidc-rp-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-oidc-rp-impl</artifactId>
<version>${project.version}</version>
</dependency>
<!-- OIDC Common BOM when importing OIDC dependencies -->
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <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>
- <!-- Shibboleth shared BOM -->
+ </dependency>
+ <!-- Import Dependencies: Shib-Metadata/Attribute/Profile/Shared -->
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-shared-bom</artifactId>
- <version>${shib.shared.testing.version}</version>
+ <version>${shib-shared.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-bom</artifactId>
+ <version>${shib-profile.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-attribute.groupId}</groupId>
+ <artifactId>shib-attribute-bom</artifactId>
+ <version>${shib-attribute.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-metadata.groupId}</groupId>
+ <artifactId>shib-metadata-bom</artifactId>
+ <version>${shib-metadata.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -117,13 +148,6 @@
<scope>import</scope>
</dependency>
<!-- Test dependencies -->
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
- <version>${shib.shared.testing.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
@@ -137,14 +161,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <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>
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-oidc-rp-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -176,6 +200,21 @@
<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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list