[java-idp-plugin-webauthn] branch main updated: Clean POMS
Phil Smart
philip.smart at jisc.ac.uk
Mon Aug 12 09:17:03 UTC 2024
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-webauthn.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-webauthn.git;a=commit;h=8643811c05d2c9ac918c14575610941d17850c2e
The following commit(s) were added to refs/heads/main by this push:
new 8643811 Clean POMS
8643811 is described below
commit 8643811c05d2c9ac918c14575610941d17850c2e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Aug 12 10:17:00 2024 +0100
Clean POMS
- add undeclared deps
- remove declared but unused deps - where possible, the anaylze plugin
is not always good at knowing this
- fix manifest
- add more groupId properties
---
pom.xml | 23 ++++++--------
webauthn-api/pom.xml | 50 ++++++++++++++++--------------
webauthn-impl/pom.xml | 84 ++++++++++++++++++++++++++++++---------------------
3 files changed, 87 insertions(+), 70 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9a0a18d..52ba3ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
<properties>
<maven-dist-enforcer-data.version>1.0.15</maven-dist-enforcer-data.version>
<shibboleth.projectName>java-idp-plugin-webauthn</shibboleth.projectName>
+ <okhttp3.mockserver.groupId>com.squareup.okhttp3</okhttp3.mockserver.groupId>
<okhttp3.mockserver.version>4.9.3</okhttp3.mockserver.version>
<okhttp3.tls.version>4.9.3</okhttp3.tls.version>
<idp.groupId>net.shibboleth.idp</idp.groupId>
@@ -38,6 +39,7 @@
<yubico.groupId>com.yubico</yubico.groupId>
<yubico-webauthn.version>2.5.2</yubico-webauthn.version>
<jackson-dataformat-cbor.verison>2.15.3</jackson-dataformat-cbor.verison>
+ <com-upokecenter.groupId>com.upokecenter</com-upokecenter.groupId>
<com-upokecenter.version>4.5.2</com-upokecenter.version>
<numbers.groupId>com.github.peteroupc</numbers.groupId>
<numbers.version>1.8.2</numbers.version>
@@ -103,7 +105,7 @@
<version>${yubico-webauthn.version}</version>
</dependency>
<dependency>
- <groupId>com.upokecenter</groupId>
+ <groupId>${com-upokecenter.groupId}</groupId>
<artifactId>cbor</artifactId>
<version>${com-upokecenter.version}</version>
<scope>runtime</scope>
@@ -169,13 +171,13 @@
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
+ <groupId>${okhttp3.mockserver.groupId}</groupId>
<artifactId>mockwebserver</artifactId>
<version>${okhttp3.mockserver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
+ <groupId>${okhttp3.mockserver.groupId}</groupId>
<artifactId>okhttp-tls</artifactId>
<version>${okhttp3.tls.version}</version>
<scope>test</scope>
@@ -196,17 +198,12 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links combine.children="append">
- <link>
- ${javadoc.url}/java-shib-shared/${shib-shared.version}</link>
+ <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-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>
</links>
</configuration>
</plugin>
diff --git a/webauthn-api/pom.xml b/webauthn-api/pom.xml
index 17a2e52..e8cf092 100644
--- a/webauthn-api/pom.xml
+++ b/webauthn-api/pom.xml
@@ -15,15 +15,11 @@
<description>IdP WebAuthn plugin API.</description>
<properties>
- <checkstyle.configLocation>
- ${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<automatic.module.name>net.shibboleth.idp.plugin.authn.webauthn.api</automatic.module.name>
</properties>
<dependencies>
- <!-- NOTE: Only use compile scope for net-new dependencies needed in the
- distribution. -->
-
<!-- Provided dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
@@ -36,22 +32,32 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.yubico</groupId>
+ <groupId>${yubico.groupId}</groupId>
<artifactId>webauthn-server-core</artifactId>
<scope>provided</scope>
</dependency>
@@ -64,20 +70,25 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-api</artifactId>
+ <artifactId>idp-session-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-session-api</artifactId>
+ <artifactId>idp-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -100,12 +111,7 @@
<groupId>${idp.groupId}</groupId>
<artifactId>idp-testing</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-profile-testing</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -121,7 +127,7 @@
</manifestEntries>
<manifestSections>
<manifestSection>
- <name>net/shibboleth/idp/plugin/authn/oidc/rp</name>
+ <name>net/shibboleth/idp/plugin/authn/webauthn</name>
<manifestEntries>
<Implementation-Title>${project.artifactId}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/webauthn-impl/pom.xml b/webauthn-impl/pom.xml
index a0b5703..4365858 100644
--- a/webauthn-impl/pom.xml
+++ b/webauthn-impl/pom.xml
@@ -15,8 +15,7 @@
<description>IdP WebAuthn plugin implementation.</description>
<properties>
- <checkstyle.configLocation>
- ${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<automatic.module.name>net.shibboleth.idp.plugin.authn.webauthn.impl</automatic.module.name>
</properties>
@@ -27,7 +26,7 @@
<artifactId>idp-plugin-webauthn-api</artifactId>
</dependency>
<dependency>
- <groupId>com.yubico</groupId>
+ <groupId>${yubico.groupId}</groupId>
<artifactId>webauthn-server-core</artifactId>
<scope>compile</scope>
</dependency>
@@ -48,17 +47,17 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.upokecenter</groupId>
+ <groupId>${com-upokecenter.groupId}</groupId>
<artifactId>cbor</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.yubico</groupId>
+ <groupId>${yubico.groupId}</groupId>
<artifactId>yubico-util</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.github.peteroupc</groupId>
+ <groupId>${numbers.groupId}</groupId>
<artifactId>numbers</artifactId>
<scope>runtime</scope>
</dependency>
@@ -102,15 +101,15 @@
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-security</artifactId>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-authn-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
+ <artifactId>idp-profile-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -133,6 +132,11 @@
<artifactId>shib-security-spring</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-spring</artifactId>
@@ -143,6 +147,11 @@
<artifactId>shib-velocity-spring</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core-api</artifactId>
@@ -183,6 +192,11 @@
<artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${shib-attribute.groupId}</groupId>
<artifactId>shib-attribute-impl</artifactId>
@@ -213,8 +227,11 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<scope>provided</scope>
</dependency>
- <!-- TODO we should not need this for the cache long term if we switch
- out the storage-->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -224,13 +241,7 @@
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
<scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-messaging-api</artifactId>
@@ -240,19 +251,28 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-storage-api</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-ui</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
+ <groupId>${okhttp3.mockserver.groupId}</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
+ <groupId>${okhttp3.mockserver.groupId}</groupId>
<artifactId>okhttp-tls</artifactId>
<scope>test</scope>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-conf-impl</artifactId>
@@ -274,8 +294,7 @@
<groupId>${idp.groupId}</groupId>
<artifactId>idp-spring</artifactId>
<scope>test</scope>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
@@ -311,13 +330,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>${idp.groupId}</groupId>
<artifactId>idp-testing</artifactId>
@@ -349,7 +361,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -357,13 +368,16 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
+ <manifestEntries>
+ <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ </manifestEntries>
<manifestSections>
<manifestSection>
- <name>org/example/com/webauthn/</name>
+ <name>net/shibboleth/idp/plugin/authn/webauthn</name>
<manifestEntries>
<Implementation-Title>${project.artifactId}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>Shibboleth</Implementation-Vendor>
+ <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
</manifestEntries>
</manifestSection>
</manifestSections>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list