[java-idp-oidc] branch main updated: Fix plugin packaging
Phil Smart
philip.smart at jisc.ac.uk
Thu Feb 11 17:43:05 UTC 2021
This is an automated email from the git hooks/post-receive script.
philsmart 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=6f75c48ab10e738645cf4abf7fcfb61780c5717c
The following commit(s) were added to refs/heads/main by this push:
new 6f75c48a Fix plugin packaging
6f75c48a is described below
commit 6f75c48ab10e738645cf4abf7fcfb61780c5717c
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Feb 11 17:43:03 2021 +0000
Fix plugin packaging
---
idp-oidc-extension-api/pom.xml | 13 +-
.../src/assembly/dep.xml | 10 +-
idp-oidc-extension-impl/pom.xml | 79 ++++++---
pom.xml | 196 +++++----------------
4 files changed, 114 insertions(+), 184 deletions(-)
diff --git a/idp-oidc-extension-api/pom.xml b/idp-oidc-extension-api/pom.xml
index 14555c1e..0bb1ca4e 100644
--- a/idp-oidc-extension-api/pom.xml
+++ b/idp-oidc-extension-api/pom.xml
@@ -19,36 +19,43 @@
</properties>
<dependencies>
+
+ <!-- Provided dependencies. -->
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-profile-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-authn-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
- </dependency>
-
- <!-- Provided dependencies. -->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
diff --git a/idp-oidc-extension-distribution/src/assembly/dep.xml b/idp-oidc-extension-distribution/src/assembly/dep.xml
index e531ebde..b413d0fa 100644
--- a/idp-oidc-extension-distribution/src/assembly/dep.xml
+++ b/idp-oidc-extension-distribution/src/assembly/dep.xml
@@ -12,15 +12,7 @@
<directory>../idp-oidc-extension-impl/target/dependency</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>nimbus-jose-jwt*.jar</include>
- <include>oauth2-oidc-sdk*.jar</include>
- <include>json-smart-*.jar</include>
- <include>accessors-smart-*.jar</include>
- <include>lang-tag-*.jar</include>
- <include>gson-*.jar</include>
- <include>idp-plugin-oidc-op-api-*.jar</include>
- <include>content-type-*.jar</include>
- <include>oidc-common-*.jar</include>
+ <include>*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 45db33fc..67e73c77 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -18,73 +18,101 @@
</properties>
<dependencies>
+ <!-- compile dependencies -->
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+
+ <!-- provided dependencies -->
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>lang-tag</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-authn-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-attribute-resolver-spring</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-storage-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>idp-plugin-oidc-op-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-attribute-filter-spring</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-attribute-filter-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-consent-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-ui</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-attribute-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-attribute-impl</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-metadata-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-saml-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${slf4j.groupId}</groupId>
@@ -94,12 +122,13 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-profile-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-attribute-filter-api</artifactId>
- </dependency>
- <!-- Provided Dependencies -->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -306,20 +335,10 @@
</dependencies>
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.target.directory}</outputDirectory>
- </configuration>
- </execution>
+ <executions>
<execution>
<id>unpack</id>
<phase>generate-resources</phase>
@@ -333,8 +352,20 @@
<includes>conf/**,credentials/ldap-server.crt</includes>
</configuration>
</execution>
+ <execution>
+ <id>copy-dependencies</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>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 2f5ea52c..96b754a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,10 @@
<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.idp</groupId>
- <artifactId>idp-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>parent</artifactId>
+ <version>11.2.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>idp-plugin-oidc-op-parent</artifactId>
@@ -14,7 +14,11 @@
<properties>
<shib.idp.version>4.1.0-SNAPSHOT</shib.idp.version>
<opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
- <oidc-common.version>0.0.1-SNAPSHOT</oidc-common.version>
+ <oidc.common.version>0.0.2-SNAPSHOT</oidc.common.version>
+ <json.smart.version>2.3</json.smart.version>
+ <gson.version>2.8.6</gson.version>
+ <nimbus.lang.tag.version>1.4.4</nimbus.lang.tag.version>
+ <commons.io.version>2.6</commons.io.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
</properties>
<repositories>
@@ -38,8 +42,27 @@
<module>idp-oidc-extension-impl</module>
<module>idp-oidc-extension-distribution</module>
</modules>
+ <dependencies>
+ <!-- Project wide test Dependencies -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</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>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<dependencyManagement>
<dependencies>
+ <!-- IdP BOM when importing IdP dependencies -->
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-bom</artifactId>
@@ -47,10 +70,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
+ <!-- OIDC Common BOM when importing OIDC dependencies -->
+ <dependency>
<groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>oidc-common-bom</artifactId>
+ <version>${oidc.common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -63,164 +87,40 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.6</version>
+ <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-attribute-api</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-attribute-impl</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-saml-api</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-crypto-api</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-crypto-impl</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-metadata-api</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-metadata-impl</artifactId>
- <version>${oidc-common.version}</version>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-core</artifactId>
- <version>${opensaml.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-attribute-filter-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-profile-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <version>${json.smart.version}</version>
</dependency>
<dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-attribute-resolver-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>lang-tag</artifactId>
+ <version>${nimbus.lang.tag.version}</version>
</dependency>
+ <!-- Test IdP bom dependencies -->
<dependency>
<groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-tests-bom</artifactId>
<version>${shib.idp.version}</version>
- <artifactId>idp-authn-impl</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-authn-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-authn-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-conf</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <version>${shib.idp.version}</version>
- <artifactId>idp-conf</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-saml-impl</artifactId>
- <version>${shib.idp.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <version>${opensaml.version}</version>
- <artifactId>opensaml-profile-impl</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <version>${opensaml.version}</version>
- <artifactId>opensaml-profile-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- Other Test Dependencies -->
<dependency>
- <groupId>org.opensaml</groupId>
- <version>${opensaml.version}</version>
- <artifactId>opensaml-storage-impl</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<version>${project.version}</version>
<artifactId>idp-plugin-oidc-op-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.oidc</groupId>
- <artifactId>oidc-common-saml-impl</artifactId>
- <version>${oidc-common.version}</version>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list