[java-identity-provider] branch main updated: OpenSAML core module refactor.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 15 19:23:25 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=116a653b0e5e6b3ffae0963feb85e4c3c22def7e
The following commit(s) were added to refs/heads/main by this push:
new 116a653b0 OpenSAML core module refactor.
116a653b0 is described below
commit 116a653b0e5e6b3ffae0963feb85e4c3c22def7e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 15 15:23:21 2022 -0400
OpenSAML core module refactor.
---
idp-admin-api/pom.xml | 6 +++-
idp-admin-impl/pom.xml | 3 +-
idp-authn-api/pom.xml | 2 +-
idp-authn-impl/pom.xml | 11 ++----
idp-cas-impl/pom.xml | 2 +-
.../net/shibboleth/idp/conf/admin-system.xml | 2 +-
idp-consent-impl/pom.xml | 7 ++--
idp-core/pom.xml | 2 +-
idp-profile-api/pom.xml | 5 ++-
idp-profile-impl/pom.xml | 2 +-
idp-saml-api/pom.xml | 10 ++----
idp-saml-impl/pom.xml | 12 ++-----
idp-session-impl/pom.xml | 40 +++++++++++-----------
idp-ui/pom.xml | 13 ++++---
idp-war/pom.xml | 6 +++-
15 files changed, 54 insertions(+), 69 deletions(-)
diff --git a/idp-admin-api/pom.xml b/idp-admin-api/pom.xml
index f3db0f991..d98850ea8 100644
--- a/idp-admin-api/pom.xml
+++ b/idp-admin-api/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -55,6 +55,10 @@
<artifactId>opensaml-security-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-cli</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index 76d19083d..fd5ce90eb 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -164,8 +164,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/idp-authn-api/pom.xml b/idp-authn-api/pom.xml
index 00c54115c..c413d8191 100644
--- a/idp-authn-api/pom.xml
+++ b/idp-authn-api/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
diff --git a/idp-authn-impl/pom.xml b/idp-authn-impl/pom.xml
index 4197e12b8..d1f134966 100644
--- a/idp-authn-impl/pom.xml
+++ b/idp-authn-impl/pom.xml
@@ -63,11 +63,11 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-messaging-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -261,13 +261,6 @@
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-security-impl</artifactId>
diff --git a/idp-cas-impl/pom.xml b/idp-cas-impl/pom.xml
index 350b4cde3..5b028f779 100644
--- a/idp-cas-impl/pom.xml
+++ b/idp-cas-impl/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
index 9cdc7860c..4716a5812 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
@@ -238,7 +238,7 @@
<!-- MetricRegistry we can control with logging categories. -->
<bean id="shibboleth.metrics.MetricRegistry"
- class="org.opensaml.core.metrics.FilteredMetricRegistry"
+ class="org.opensaml.core.metrics.impl.FilteredMetricRegistry"
p:metricFilter-ref="shibboleth.metrics.LoggerDrivenMetricFilter" />
<bean id="shibboleth.metrics.LoggerDrivenMetricFilter"
diff --git a/idp-consent-impl/pom.xml b/idp-consent-impl/pom.xml
index 043a0b084..d6b7c3db2 100644
--- a/idp-consent-impl/pom.xml
+++ b/idp-consent-impl/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -107,13 +107,12 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
+ <artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/idp-core/pom.xml b/idp-core/pom.xml
index 501330a4f..00b0be16e 100644
--- a/idp-core/pom.xml
+++ b/idp-core/pom.xml
@@ -24,7 +24,7 @@
<!-- Compile Dependencies -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index 54f0bb220..3633f42e8 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -29,7 +29,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -104,9 +104,8 @@
<!-- Test Dependencies -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<version>${opensaml.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index 7e95505ef..5de74fab6 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
diff --git a/idp-saml-api/pom.xml b/idp-saml-api/pom.xml
index 18df49420..89fbf3e56 100644
--- a/idp-saml-api/pom.xml
+++ b/idp-saml-api/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -113,8 +113,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
+ <artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -122,11 +121,6 @@
<artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index 9d7028529..e1332eed0 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -207,12 +207,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-profile-api</artifactId>
@@ -221,12 +215,12 @@
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
+ <artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/idp-session-impl/pom.xml b/idp-session-impl/pom.xml
index e93c99c02..a42427c28 100644
--- a/idp-session-impl/pom.xml
+++ b/idp-session-impl/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -114,48 +114,48 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-profile-api</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-authn-api</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-authn-impl</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
+ <artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
- <version>${project.version}</version>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
- <version>${project.version}</version>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-authn-impl</artifactId>
- <version>${project.version}</version>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<scm>
diff --git a/idp-ui/pom.xml b/idp-ui/pom.xml
index 283350297..7fa894e0f 100644
--- a/idp-ui/pom.xml
+++ b/idp-ui/pom.xml
@@ -50,11 +50,11 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-messaging-api</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -94,19 +94,18 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
+ <!-- Needed for XMLObject providers. -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
- <type>test-jar</type>
+ <artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Needed for XMLObject providers. -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
+ <artifactId>opensaml-testing</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index 5c959bf1a..5001491b8 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -168,7 +168,11 @@
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-impl</artifactId>
</dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list