[java-shib-attribute] branch main updated: OpenSAML core module refactor.

Scott Cantor cantor.2 at osu.edu
Thu Sep 15 19:22:28 UTC 2022


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=4f9a7047d9a93c5f6e4e6b9e40865b52bd400e91

The following commit(s) were added to refs/heads/main by this push:
     new 4f9a7047d OpenSAML core module refactor.
4f9a7047d is described below

commit 4f9a7047d9a93c5f6e4e6b9e40865b52bd400e91
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 15 15:22:26 2022 -0400

    OpenSAML core module refactor.
---
 shib-attribute-api/pom.xml             |  5 ++---
 shib-attribute-filter-impl/pom.xml     |  7 +++----
 shib-attribute-filter-spring/pom.xml   |  7 +++----
 shib-attribute-resolver-impl/pom.xml   | 13 ++++++-------
 shib-attribute-resolver-spring/pom.xml | 13 ++++++-------
 shib-saml-attribute-api/pom.xml        |  5 ++---
 shib-saml-attribute-impl/pom.xml       |  5 ++---
 7 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/shib-attribute-api/pom.xml b/shib-attribute-api/pom.xml
index ff5afbd02..9467031c3 100644
--- a/shib-attribute-api/pom.xml
+++ b/shib-attribute-api/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>
@@ -60,8 +60,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-testing</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index a7a40610f..2416b4a8a 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
+            <artifactId>opensaml-core-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
@@ -130,13 +130,12 @@
         
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-saml-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
+            <artifactId>opensaml-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index 0765209b8..35fd0107c 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -114,18 +114,17 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-profile-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
+            <artifactId>opensaml-saml-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
+            <artifactId>opensaml-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/shib-attribute-resolver-impl/pom.xml b/shib-attribute-resolver-impl/pom.xml
index 80e6ee6af..bdb99c91d 100644
--- a/shib-attribute-resolver-impl/pom.xml
+++ b/shib-attribute-resolver-impl/pom.xml
@@ -113,13 +113,7 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-core-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -145,6 +139,11 @@
             <artifactId>opensaml-storage-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
         
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
diff --git a/shib-attribute-resolver-spring/pom.xml b/shib-attribute-resolver-spring/pom.xml
index 18392b0e8..81d7617f6 100644
--- a/shib-attribute-resolver-spring/pom.xml
+++ b/shib-attribute-resolver-spring/pom.xml
@@ -144,13 +144,7 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
+            <artifactId>opensaml-core-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -181,6 +175,11 @@
             <artifactId>opensaml-storage-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
         
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
diff --git a/shib-saml-attribute-api/pom.xml b/shib-saml-attribute-api/pom.xml
index d07859fa8..11b93cd51 100644
--- a/shib-saml-attribute-api/pom.xml
+++ b/shib-saml-attribute-api/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
+            <artifactId>opensaml-core-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
@@ -58,8 +58,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-testing</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Needed despite what dependency:analyze says -->
diff --git a/shib-saml-attribute-impl/pom.xml b/shib-saml-attribute-impl/pom.xml
index e81c50ef9..7adf0d2de 100644
--- a/shib-saml-attribute-impl/pom.xml
+++ b/shib-saml-attribute-impl/pom.xml
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
+            <artifactId>opensaml-core-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
@@ -91,8 +91,7 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-testing</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Needed for XMLObject providers. -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list