[java-shib-attribute] branch main updated: Update POMs for new shared artifact names.
Scott Cantor
cantor.2 at osu.edu
Fri Sep 2 12:38:07 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=fcde186465eca8be546e0e29985047dd6d06ee4e
The following commit(s) were added to refs/heads/main by this push:
new fcde18646 Update POMs for new shared artifact names.
fcde18646 is described below
commit fcde186465eca8be546e0e29985047dd6d06ee4e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Sep 2 08:38:04 2022 -0400
Update POMs for new shared artifact names.
---
pom.xml | 27 +++++++++++++--------------
shib-attribute-api/pom.xml | 10 ----------
shib-attribute-filter-api/pom.xml | 12 +-----------
shib-attribute-filter-impl/pom.xml | 16 +++-------------
shib-attribute-filter-spring/pom.xml | 16 +++-------------
shib-attribute-impl/pom.xml | 19 +++++--------------
shib-attribute-resolver-api/pom.xml | 14 ++------------
shib-attribute-resolver-impl/pom.xml | 18 ++++--------------
shib-attribute-resolver-spring/pom.xml | 16 +++-------------
shib-saml-attribute-api/pom.xml | 14 ++------------
shib-saml-attribute-impl/pom.xml | 8 ++++----
11 files changed, 40 insertions(+), 130 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6708b6dec..0e9a72ff6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,12 +40,11 @@
</modules>
<properties>
+ <shib-shared.groupId>net.shibboleth.shared</shib-shared.groupId>
<shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
- <java-support.version>9.0.0-SNAPSHOT</java-support.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
<shib-metadata.version>5.0.0-SNAPSHOT</shib-metadata.version>
- <spring-extensions.version>9.0.0-SNAPSHOT</spring-extensions.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
@@ -73,6 +72,17 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
+
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
@@ -130,7 +140,7 @@
<!-- Import Dependencies: Shared -->
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-shared-bom</artifactId>
<version>${shib-shared.version}</version>
<type>pom</type>
@@ -139,17 +149,6 @@
<!-- Compile Dependencies -->
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
- </dependency>
-
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
diff --git a/shib-attribute-api/pom.xml b/shib-attribute-api/pom.xml
index 72765a2f2..ff5afbd02 100644
--- a/shib-attribute-api/pom.xml
+++ b/shib-attribute-api/pom.xml
@@ -39,11 +39,6 @@
<artifactId>opensaml-saml-api</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
-
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
@@ -54,11 +49,6 @@
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/shib-attribute-filter-api/pom.xml b/shib-attribute-filter-api/pom.xml
index 9e3274721..31ed583e8 100644
--- a/shib-attribute-filter-api/pom.xml
+++ b/shib-attribute-filter-api/pom.xml
@@ -41,20 +41,10 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-service</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index e140cc471..d88027310 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -49,8 +49,8 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
<dependency>
@@ -70,11 +70,6 @@
<artifactId>opensaml-saml-api</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
-
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
@@ -88,11 +83,6 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -160,7 +150,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index f9584282e..d42abbde8 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -52,18 +52,13 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-service</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
<dependency>
@@ -79,11 +74,6 @@
<artifactId>spring-context</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/shib-attribute-impl/pom.xml b/shib-attribute-impl/pom.xml
index 782679dcc..0a4d9a6eb 100644
--- a/shib-attribute-impl/pom.xml
+++ b/shib-attribute-impl/pom.xml
@@ -43,23 +43,13 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-service</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
<dependency>
@@ -73,10 +63,11 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
diff --git a/shib-attribute-resolver-api/pom.xml b/shib-attribute-resolver-api/pom.xml
index 9f6a563a1..af52bb6a8 100644
--- a/shib-attribute-resolver-api/pom.xml
+++ b/shib-attribute-resolver-api/pom.xml
@@ -46,20 +46,15 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-service</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-velocity</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -79,11 +74,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/shib-attribute-resolver-impl/pom.xml b/shib-attribute-resolver-impl/pom.xml
index 612789f38..f6dd866ab 100644
--- a/shib-attribute-resolver-impl/pom.xml
+++ b/shib-attribute-resolver-impl/pom.xml
@@ -65,18 +65,13 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-velocity</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
<dependency>
@@ -112,11 +107,6 @@
<artifactId>metrics-core</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -162,7 +152,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-attribute-resolver-spring/pom.xml b/shib-attribute-resolver-spring/pom.xml
index 62a26f4a4..9a8e41a6f 100644
--- a/shib-attribute-resolver-spring/pom.xml
+++ b/shib-attribute-resolver-spring/pom.xml
@@ -79,13 +79,8 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
<dependency>
@@ -118,11 +113,6 @@
<artifactId>spring-context</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -180,7 +170,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-saml-attribute-api/pom.xml b/shib-saml-attribute-api/pom.xml
index 96d8c3c93..e5f84d296 100644
--- a/shib-saml-attribute-api/pom.xml
+++ b/shib-saml-attribute-api/pom.xml
@@ -67,20 +67,10 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/shib-saml-attribute-impl/pom.xml b/shib-saml-attribute-impl/pom.xml
index f9a119e49..3f06cb7d6 100644
--- a/shib-saml-attribute-impl/pom.xml
+++ b/shib-saml-attribute-impl/pom.xml
@@ -71,13 +71,13 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list