[java-shib-attribute] 01/02: Unlock parent POM and add missing groupId properties.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 25 17:24:24 UTC 2023
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=5d41c77ac0dd2885d40dafdb0fe96b5036f7e71d
commit 5d41c77ac0dd2885d40dafdb0fe96b5036f7e71d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 25 13:24:13 2023 -0400
Unlock parent POM and add missing groupId properties.
---
pom.xml | 22 ++++++++++------------
shib-attribute-filter-impl/pom.xml | 4 ++--
shib-attribute-filter-spring/pom.xml | 6 ++----
shib-attribute-resolver-spring/pom.xml | 4 ++--
shib-saml-attribute-api/pom.xml | 4 ++--
shib-saml-attribute-impl/pom.xml | 4 +++-
6 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d863973b..f6f26bdda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>17.0.1</version>
+ <version>17.0.2-SNAPSHOT</version>
</parent>
<name>Shibboleth Attribute Components</name>
@@ -45,11 +45,9 @@
<shib-shared.version>9.0.0</shib-shared.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0</opensaml.version>
+ <shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
<shib-metadata.version>5.0.0</shib-metadata.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
-
- <!-- TODO: Remove once in project parent: Base URL for all our deployed javadocs. -->
- <javadoc.url>https://shibboleth.net/api</javadoc.url>
</properties>
<dependencies>
@@ -93,20 +91,20 @@
used by all project modules. -->
<dependencyManagement>
<dependencies>
- <!-- Import Dependencies: OpenSAML -->
+ <!-- Import Dependencies: Shibboleth Metadata -->
<dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-bom</artifactId>
- <version>${opensaml.version}</version>
+ <groupId>${shib-metadata.groupId}</groupId>
+ <artifactId>shib-metadata-bom</artifactId>
+ <version>${shib-metadata.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- Import Dependencies: Shibboleth Metadata -->
+ <!-- Import Dependencies: OpenSAML -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-metadata-bom</artifactId>
- <version>${shib-metadata.version}</version>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-bom</artifactId>
+ <version>${opensaml.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index ab66f7eb7..2977ed573 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -34,7 +34,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-api</artifactId>
</dependency>
@@ -101,7 +101,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index 051db386e..5e64227ec 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -98,17 +98,15 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-testing</artifactId>
- <version>${shib-metadata.version}</version>
<scope>test</scope>
</dependency>
<!-- Needed for Spring schema directives. -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-spring</artifactId>
- <version>${shib-metadata.version}</version>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-resolver-spring/pom.xml b/shib-attribute-resolver-spring/pom.xml
index 8dcbf1ec9..adadba761 100644
--- a/shib-attribute-resolver-spring/pom.xml
+++ b/shib-attribute-resolver-spring/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-spring</artifactId>
</dependency>
@@ -129,7 +129,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-saml-attribute-api/pom.xml b/shib-saml-attribute-api/pom.xml
index f5d10054d..a1cac7978 100644
--- a/shib-saml-attribute-api/pom.xml
+++ b/shib-saml-attribute-api/pom.xml
@@ -29,7 +29,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-api</artifactId>
</dependency>
@@ -57,7 +57,7 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-saml-attribute-impl/pom.xml b/shib-saml-attribute-impl/pom.xml
index cf2c4cb86..aec7e1ee3 100644
--- a/shib-saml-attribute-impl/pom.xml
+++ b/shib-saml-attribute-impl/pom.xml
@@ -77,11 +77,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${shib-metadata.groupId}</groupId>
<artifactId>shib-metadata-api</artifactId>
<scope>test</scope>
</dependency>
+
<!-- Needed for XMLObject providers. -->
<dependency>
<groupId>${project.groupId}</groupId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list