[java-shib-attribute] branch main updated: Incorporate shib-metadata BOMs.
Scott Cantor
cantor.2 at osu.edu
Thu Jun 23 21:05:44 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=63999786841eb529a4b71a2dbc8df9d5c93131e4
The following commit(s) were added to refs/heads/main by this push:
new 639997868 Incorporate shib-metadata BOMs.
639997868 is described below
commit 63999786841eb529a4b71a2dbc8df9d5c93131e4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 23 17:05:40 2022 -0400
Incorporate shib-metadata BOMs.
---
pom.xml | 43 ++++++++++++++----------------------
shib-attribute-filter-api/pom.xml | 7 ------
shib-attribute-filter-impl/pom.xml | 30 +++++++++++++------------
shib-attribute-filter-spring/pom.xml | 10 +--------
shib-attribute-impl/pom.xml | 19 ++--------------
shib-attribute-resolver-api/pom.xml | 1 +
shib-attribute-resolver-impl/pom.xml | 39 +++++++++++++++++---------------
shib-saml-attribute-impl/pom.xml | 25 ++++++++++-----------
8 files changed, 70 insertions(+), 104 deletions(-)
diff --git a/pom.xml b/pom.xml
index e7df1e369..95dae461f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
used by all project modules. -->
<dependencyManagement>
<dependencies>
- <!-- Import Dependencies: OpenSAML -->
+ <!-- Import Dependencies: OpenSAML -->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-bom</artifactId>
@@ -108,6 +108,22 @@
<scope>import</scope>
</dependency>
+ <!-- Import Dependencies: Shibboleth Metadata -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-metadata-bom</artifactId>
+ <version>${shib-metadata.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-metadata-tests-bom</artifactId>
+ <version>${shib-metadata.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- Compile Dependencies -->
<dependency>
@@ -121,36 +137,11 @@
<version>${spring-extensions.version}</version>
</dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-api</artifactId>
- <version>${shib-metadata.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-impl</artifactId>
- <version>${shib-metadata.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-spring</artifactId>
- <version>${shib-metadata.version}</version>
- </dependency>
-
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-spring</artifactId>
- <version>${shib-metadata.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
diff --git a/shib-attribute-filter-api/pom.xml b/shib-attribute-filter-api/pom.xml
index a87dfcc72..5b552208c 100644
--- a/shib-attribute-filter-api/pom.xml
+++ b/shib-attribute-filter-api/pom.xml
@@ -26,13 +26,6 @@
<artifactId>shib-attribute-api</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-core</artifactId>
- <version>${project.version}</version>
- </dependency>
--->
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-messaging-api</artifactId>
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index 087a9fff8..5e4d51a59 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>shib-metadata-api</artifactId>
</dependency>
@@ -132,12 +132,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-impl</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shib-attribute-resolver-impl</artifactId>
@@ -145,6 +139,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-metadata-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-core</artifactId>
@@ -156,6 +157,7 @@
<artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
@@ -163,18 +165,18 @@
<scope>test</scope>
</dependency>
- <!-- Required even if dependency:analyse says not -->
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!-- Required even if dependency:analyse says not -->
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index 5bb4523a7..42b232140 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -126,15 +126,7 @@
<artifactId>opensaml-saml-impl</artifactId>
<scope>test</scope>
</dependency>
-<!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
--->
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
diff --git a/shib-attribute-impl/pom.xml b/shib-attribute-impl/pom.xml
index c61400379..67d5c69b1 100644
--- a/shib-attribute-impl/pom.xml
+++ b/shib-attribute-impl/pom.xml
@@ -26,13 +26,7 @@
<artifactId>shib-attribute-api</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
- <version>${project.version}</version>
- </dependency>
--->
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-profile-api</artifactId>
@@ -66,21 +60,12 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
-<!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
--->
-
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
diff --git a/shib-attribute-resolver-api/pom.xml b/shib-attribute-resolver-api/pom.xml
index 1546d8650..6522f206b 100644
--- a/shib-attribute-resolver-api/pom.xml
+++ b/shib-attribute-resolver-api/pom.xml
@@ -78,6 +78,7 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
diff --git a/shib-attribute-resolver-impl/pom.xml b/shib-attribute-resolver-impl/pom.xml
index 357102f2c..d2d59a59a 100644
--- a/shib-attribute-resolver-impl/pom.xml
+++ b/shib-attribute-resolver-impl/pom.xml
@@ -119,6 +119,7 @@
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
+
<!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
@@ -134,6 +135,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<!-- We need this even if mvn dependency:analyze says we don't - this
provides the implementations of the SAML interfaces and by definition cannot
@@ -147,36 +154,32 @@
<artifactId>opensaml-storage-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
+ <groupId>net.shibboleth.ext</groupId>
+ <artifactId>spring-extensions</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>com.unboundid</groupId>
- <artifactId>unboundid-ldapsdk</artifactId>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- <type>test-jar</type>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <type>test-jar</type>
+ <groupId>com.unboundid</groupId>
+ <artifactId>unboundid-ldapsdk</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
<profiles>
diff --git a/shib-saml-attribute-impl/pom.xml b/shib-saml-attribute-impl/pom.xml
index bc2862b4e..054b647ba 100644
--- a/shib-saml-attribute-impl/pom.xml
+++ b/shib-saml-attribute-impl/pom.xml
@@ -22,11 +22,6 @@
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-saml-attribute-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shib-attribute-api</artifactId>
@@ -47,6 +42,11 @@
<artifactId>shib-attribute-resolver-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-saml-attribute-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${opensaml.groupId}</groupId>
@@ -153,7 +153,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>shib-metadata-impl</artifactId>
<scope>test</scope>
</dependency>
@@ -163,6 +163,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
@@ -186,13 +192,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list