[java-idp-plugin-duo] branch main updated: JPAR-212 - Migrate javadoc links into individual projects
Phil Smart
philip.smart at jisc.ac.uk
Wed Sep 20 19:40:01 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-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=4f56b090070fc847d81232091b9f467dd1d5675c
The following commit(s) were added to refs/heads/main by this push:
new 4f56b09 JPAR-212 - Migrate javadoc links into individual projects
4f56b09 is described below
commit 4f56b090070fc847d81232091b9f467dd1d5675c
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Sep 20 14:39:53 2023 -0500
JPAR-212 - Migrate javadoc links into individual projects
- POM cleanups
https://shibboleth.atlassian.net/browse/JPAR-212
---
idp-duo-impl/pom.xml | 15 +++++---------
idp-duo-nimbus-client-impl/pom.xml | 12 +++++------
idp-duo-sdk-client-impl/pom.xml | 11 +++-------
pom.xml | 42 ++++++++++++++++++++++++++++++--------
4 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/idp-duo-impl/pom.xml b/idp-duo-impl/pom.xml
index 7a2c3ae..ee036ff 100644
--- a/idp-duo-impl/pom.xml
+++ b/idp-duo-impl/pom.xml
@@ -23,22 +23,21 @@
<dependencies>
<!-- compile time dependencies -->
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-duo-api</artifactId>
</dependency>
<!-- Provided dependencies -->
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-impl</artifactId>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-session-api</artifactId>
@@ -64,8 +63,7 @@
<groupId>${idp.groupId}</groupId>
<artifactId>idp-ui</artifactId>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-messaging-api</artifactId>
@@ -76,13 +74,11 @@
<artifactId>opensaml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
@@ -98,7 +94,6 @@
<artifactId>spring-webflow</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
diff --git a/idp-duo-nimbus-client-impl/pom.xml b/idp-duo-nimbus-client-impl/pom.xml
index 4119f24..43f17c0 100644
--- a/idp-duo-nimbus-client-impl/pom.xml
+++ b/idp-duo-nimbus-client-impl/pom.xml
@@ -20,10 +20,9 @@
<dependencies>
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-duo-api</artifactId>
- </dependency>
-
+ </dependency>
<!-- provided dependencies -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -36,12 +35,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-impl</artifactId>
<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>
@@ -53,6 +52,7 @@
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-support</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Needed for module/plugin impls. -->
<dependency>
@@ -62,7 +62,7 @@
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>org.opensaml</groupId>
+ <groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-security-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/idp-duo-sdk-client-impl/pom.xml b/idp-duo-sdk-client-impl/pom.xml
index 4ad2212..8947cfb 100644
--- a/idp-duo-sdk-client-impl/pom.xml
+++ b/idp-duo-sdk-client-impl/pom.xml
@@ -26,7 +26,7 @@
<artifactId>duo-universal-sdk</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-duo-api</artifactId>
</dependency>
<dependency>
@@ -97,12 +97,12 @@
<!-- provided dependencies -->
<dependency>
- <groupId>net.shibboleth.oidc</groupId>
+ <groupId>${oidc-common.groupId}</groupId>
<artifactId>oidc-common-crypto-impl</artifactId>
<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>
@@ -116,11 +116,6 @@
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
- <dependency> <!-- required for the DuoIntegration -->
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Needed for module/plugin impls. -->
<dependency>
<groupId>${idp.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index faf4bb4..93e80e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,16 +20,27 @@
</description>
<properties>
- <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
<idp.groupId>net.shibboleth.idp</idp.groupId>
<idp.version>5.0.0</idp.version>
<duo.client.version>1.1.3</duo.client.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0</opensaml.version>
- <oidc.common.version>3.0.1-SNAPSHOT</oidc.common.version>
- <java-shib-shared.version>9.0.0</java-shib-shared.version>
- <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
- <jdk.version>15.3</jdk.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>
+ <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>
+ <jdk.version>15.3</jdk.version>
+ <!-- Remove when parent is unlocked -->
+ <java-shib-shared.version>9.0.0</java-shib-shared.version>
+ <!-- TODO: Remove once in project parent: Base URL for all our deployed javadocs. -->
+ <javadoc.url>https://shibboleth.net/api</javadoc.url>
</properties>
<modules>
@@ -90,9 +101,9 @@
</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>
@@ -103,7 +114,7 @@
<version>${duo.client.version}</version>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp.plugin.authn</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>idp-plugin-duo-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -135,6 +146,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