[java-oidc-common] branch main updated: Cleanup pomns, switch nimbus-jose-jwt to version 9
Phil Smart
philip.smart at jisc.ac.uk
Tue Jan 19 12:34:24 UTC 2021
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=a26f6b42844d99cf73a4285fec3402ad7ee750be
The following commit(s) were added to refs/heads/main by this push:
new a26f6b4 Cleanup pomns, switch nimbus-jose-jwt to version 9
a26f6b4 is described below
commit a26f6b42844d99cf73a4285fec3402ad7ee750be
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Jan 19 12:34:22 2021 +0000
Cleanup pomns, switch nimbus-jose-jwt to version 9
---
oidc-common-attribute-api/pom.xml | 33 +-
oidc-common-attribute-impl/pom.xml | 144 ++++----
oidc-common-crypto-api/pom.xml | 33 ++
.../oidc/jwk/support/RemoteJwkUtils.java | 5 +-
oidc-common-crypto-impl/pom.xml | 34 ++
.../src/main/assembly/plugin-assembly.xml | 59 +++-
oidc-common-metadata-api/pom.xml | 34 +-
oidc-common-metadata-impl/pom.xml | 315 ++++++++++--------
oidc-common-saml-api/pom.xml | 24 ++
oidc-common-saml-impl/pom.xml | 6 +
pom.xml | 361 +++++++++++----------
11 files changed, 664 insertions(+), 384 deletions(-)
diff --git a/oidc-common-attribute-api/pom.xml b/oidc-common-attribute-api/pom.xml
index c683d8b..c4b6a3b 100644
--- a/oidc-common-attribute-api/pom.xml
+++ b/oidc-common-attribute-api/pom.xml
@@ -19,22 +19,47 @@
</properties>
<dependencies>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-core</artifactId>
- </dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-attribute-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-attribute-impl/pom.xml b/oidc-common-attribute-impl/pom.xml
index 05c6146..1ba52e9 100644
--- a/oidc-common-attribute-impl/pom.xml
+++ b/oidc-common-attribute-impl/pom.xml
@@ -1,63 +1,89 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
- <artifactId>oidc-common-attribute-impl</artifactId>
- <packaging>jar</packaging>
- <name>Shibboleth IdP :: Plugins :: OIDC Common :: Attribute Implementation</name>
- <description>Implementation for common OIDC attribute functions/features.</description>
-
- <properties>
- <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.oidc.attribute.impl</automatic.module.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-attribute-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-attribute-api</artifactId>
- </dependency>
- <!-- Provided Dependencies -->
- <!-- Test Dependencies -->
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-profile-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-attribute-resolver-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>oidc-common-attribute-impl</artifactId>
+ <packaging>jar</packaging>
+ <name>Shibboleth IdP :: Plugins :: OIDC Common :: Attribute Implementation</name>
+ <description>Implementation for common OIDC attribute functions/features.</description>
+
+ <properties>
+ <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.oidc.attribute.impl</automatic.module.name>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-profile-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-attribute-resolver-spring</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-crypto-api/pom.xml b/oidc-common-crypto-api/pom.xml
index e5047f0..9fb6071 100644
--- a/oidc-common-crypto-api/pom.xml
+++ b/oidc-common-crypto-api/pom.xml
@@ -22,14 +22,23 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-storage-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>compile</scope>
</dependency>
<!-- Test Dependencies -->
@@ -38,6 +47,30 @@
<artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
index 6ab08cd..31a8e3d 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
@@ -19,6 +19,7 @@ package net.shibboleth.oidc.jwk.support;
import java.io.IOException;
import java.net.URI;
+import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.http.ParseException;
@@ -35,8 +36,6 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.jose.util.JSONObjectUtils;
-import net.minidev.json.JSONObject;
-
/**
* Generic utility methods related to remote JWK sets.
*/
@@ -90,7 +89,7 @@ public final class RemoteJwkUtils {
log.trace("{} Fetched the following response body: {}", logPrefix, output);
final JWKSet jwkSet;
try {
- final JSONObject json = JSONObjectUtils.parse(output);
+ final Map<String, Object> json = JSONObjectUtils.parse(output);
// The following check is needed to avoid NPE from Nimbus if keys claim not found
if (JSONObjectUtils.getJSONArray(json, "keys") == null) {
log.error("{} Could not find 'keys' array from the JSON from {}", logPrefix, uri);
diff --git a/oidc-common-crypto-impl/pom.xml b/oidc-common-crypto-impl/pom.xml
index 3203e90..ee66b8a 100644
--- a/oidc-common-crypto-impl/pom.xml
+++ b/oidc-common-crypto-impl/pom.xml
@@ -22,6 +22,17 @@
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -31,5 +42,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-dist/src/main/assembly/plugin-assembly.xml b/oidc-common-dist/src/main/assembly/plugin-assembly.xml
index 3156522..662a0f9 100644
--- a/oidc-common-dist/src/main/assembly/plugin-assembly.xml
+++ b/oidc-common-dist/src/main/assembly/plugin-assembly.xml
@@ -1,7 +1,8 @@
<assembly>
- <id>assembly-zip</id>
+ <id>assembly</id>
<formats>
<format>zip</format>
+ <format>tar.gz</format>
</formats>
<fileSets>
<!-- attribute -->
@@ -17,6 +18,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-attribute-api/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../oidc-common-attribute-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
@@ -29,6 +37,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-attribute-impl/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<!-- crypto -->
<fileSet>
@@ -43,6 +58,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-crypto-api/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../oidc-common-crypto-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
@@ -55,6 +77,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-crypto-impl/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<!-- metadata -->
<fileSet>
@@ -69,6 +98,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-metadata-api/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../oidc-common-metadata-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
@@ -81,6 +117,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-metadata-impl/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<!-- saml -->
<fileSet>
@@ -95,6 +138,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-saml-api/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../oidc-common-saml-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
@@ -107,6 +157,13 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../oidc-common-saml-impl/target/dependency</directory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
<!-- the module to serve the plugin -->
<fileSet>
diff --git a/oidc-common-metadata-api/pom.xml b/oidc-common-metadata-api/pom.xml
index df14a7b..7c2ed05 100644
--- a/oidc-common-metadata-api/pom.xml
+++ b/oidc-common-metadata-api/pom.xml
@@ -22,19 +22,35 @@
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-core</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-metadata-impl/pom.xml b/oidc-common-metadata-impl/pom.xml
index 2b8a794..70ae461 100644
--- a/oidc-common-metadata-impl/pom.xml
+++ b/oidc-common-metadata-impl/pom.xml
@@ -1,135 +1,188 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
- <artifactId>oidc-common-metadata-impl</artifactId>
- <packaging>jar</packaging>
- <name>Shibboleth IdP :: Plugins :: OIDC Common :: Relying Party Metadata Implementation</name>
- <description>Implementation for common OIDC RP metadata functions/features.</description>
-
- <properties>
- <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.oidc.metadata.impl</automatic.module.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-saml-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-attribute-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-attribute-resolver-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-storage-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-xmlsec-impl</artifactId>
- </dependency>
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- Test Dependencies -->
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-saml-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-saml-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <version>${opensaml.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-attribute-resolver-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Needed for Nimbus use in tests. -->
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <version>${opensaml.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-profile-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-attribute-resolver-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>oidc-common-metadata-impl</artifactId>
+ <packaging>jar</packaging>
+ <name>Shibboleth IdP :: Plugins :: OIDC Common :: Relying Party Metadata Implementation</name>
+ <description>Implementation for common OIDC RP metadata functions/features.</description>
+
+ <properties>
+ <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.oidc.metadata.impl</automatic.module.name>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-saml-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-attribute-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-attribute-resolver-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-storage-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-saml-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-saml-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
+ <version>${opensaml.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-attribute-resolver-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Needed for Nimbus use in tests. -->
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core</artifactId>
+ <version>${opensaml.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-profile-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-attribute-resolver-spring</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-saml-api/pom.xml b/oidc-common-saml-api/pom.xml
index 31441a2..f62fe0c 100644
--- a/oidc-common-saml-api/pom.xml
+++ b/oidc-common-saml-api/pom.xml
@@ -22,7 +22,31 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/oidc-common-saml-impl/pom.xml b/oidc-common-saml-impl/pom.xml
index f026057..a4c1c04 100644
--- a/oidc-common-saml-impl/pom.xml
+++ b/oidc-common-saml-impl/pom.xml
@@ -22,6 +22,12 @@
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-saml-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index 263b075..a71e3dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,179 +1,186 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.shibboleth</groupId>
- <artifactId>parent</artifactId>
- <version>11.2.0-SNAPSHOT</version>
- </parent>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>Shibboleth IdP :: Plugins :: OIDC Common :: Parent</name>
- <packaging>pom</packaging>
- <description>A POM containing properties, dependencies, etc. that are common across all Shibboleth OIDC Java common libraries.</description>
- <properties>
- <idp.groupId>net.shibboleth.idp</idp.groupId>
- <idp.version>4.1.0-SNAPSHOT</idp.version>
- <opensaml.groupId>org.opensaml</opensaml.groupId>
- <opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
- <java-support.version>8.2.0-SNAPSHOT</java-support.version>
- <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
- </properties>
- <repositories>
- <repository>
- <id>shib-release</id>
- <url>https://build.shibboleth.net/nexus/content/groups/public</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>shib-snapshot</id>
- <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <scm>
- <connection>${shibboleth.scm.connection}java-oidc-common</connection>
- <developerConnection>${shibboleth.scm.developerConnection}java-oidc-common</developerConnection>
- <url>${shibboleth.scm.url}java-oidc-common.git</url>
- </scm>
- <dependencies>
- <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>
- <!-- Project wide test Dependencies -->
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <dependencyManagement>
- <!-- oidc-common project dependencies -->
- <dependencies>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-attribute-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-attribute-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-metadata-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-saml-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-saml-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>oauth2-oidc-sdk</artifactId>
- <version>7.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>2.3</version>
- </dependency>
- <!-- Shibboleth IdP BOM for importing IdP dependencies -->
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-bom</artifactId>
- <version>${idp.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <!-- Provided shibboleth support dependencies -->
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- Test bom dependencies -->
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-tests-bom</artifactId>
- <version>${idp.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <modules>
- <module>oidc-common-attribute-api</module>
- <module>oidc-common-attribute-impl</module>
- <module>oidc-common-crypto-api</module>
- <module>oidc-common-crypto-impl</module>
- <module>oidc-common-metadata-api</module>
- <module>oidc-common-metadata-impl</module>
- <module>oidc-common-saml-api</module>
- <module>oidc-common-saml-impl</module>
- <module>oidc-common-dist</module>
- <module>oidc-common-plugin</module>
- </modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>parent</artifactId>
+ <version>11.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>Shibboleth IdP :: Plugins :: OIDC Common :: Parent</name>
+ <packaging>pom</packaging>
+ <description>A POM containing properties, dependencies, etc. that are common across all Shibboleth OIDC Java common libraries.</description>
+ <properties>
+ <idp.groupId>net.shibboleth.idp</idp.groupId>
+ <idp.version>4.1.0-SNAPSHOT</idp.version>
+ <opensaml.groupId>org.opensaml</opensaml.groupId>
+ <opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
+ <java-support.version>8.2.0-SNAPSHOT</java-support.version>
+ <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
+ </properties>
+ <repositories>
+ <repository>
+ <id>shib-release</id>
+ <url>https://build.shibboleth.net/nexus/content/groups/public</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>shib-snapshot</id>
+ <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <scm>
+ <connection>${shibboleth.scm.connection}java-oidc-common</connection>
+ <developerConnection>${shibboleth.scm.developerConnection}java-oidc-common</developerConnection>
+ <url>${shibboleth.scm.url}java-oidc-common.git</url>
+ </scm>
+ <dependencies>
+ <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>
+ <!-- Project wide test Dependencies -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <dependencyManagement>
+ <!-- oidc-common project dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-metadata-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-metadata-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-saml-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-saml-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ <version>8.33</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>compile</scope>
+ <version>9.0</version>
+ </dependency>
+ <!-- Shibboleth IdP BOM for importing IdP dependencies -->
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-bom</artifactId>
+ <version>${idp.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- Provided shibboleth support dependencies -->
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>${java-support.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test bom dependencies -->
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-tests-bom</artifactId>
+ <version>${idp.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <modules>
+ <module>oidc-common-attribute-api</module>
+ <module>oidc-common-attribute-impl</module>
+ <module>oidc-common-crypto-api</module>
+ <module>oidc-common-crypto-impl</module>
+ <module>oidc-common-metadata-api</module>
+ <module>oidc-common-metadata-impl</module>
+ <module>oidc-common-saml-api</module>
+ <module>oidc-common-saml-impl</module>
+ <module>oidc-common-dist</module>
+ <module>oidc-common-plugin</module>
+ </modules>
</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list