[java-opensaml] branch main updated: Update POMs for new shared artifact names.
Scott Cantor
cantor.2 at osu.edu
Fri Sep 2 12:37:33 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=4d7ec3801c23ae5c3233143308554eb5dc36edbb
The following commit(s) were added to refs/heads/main by this push:
new 4d7ec3801 Update POMs for new shared artifact names.
4d7ec3801 is described below
commit 4d7ec3801c23ae5c3233143308554eb5dc36edbb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Sep 2 08:37:30 2022 -0400
Update POMs for new shared artifact names.
---
opensaml-core/pom.xml | 5 -----
opensaml-messaging-api/pom.xml | 5 -----
opensaml-messaging-impl/pom.xml | 10 +++-------
opensaml-parent/pom.xml | 17 ++++++++++++-----
opensaml-profile-api/pom.xml | 13 ++++---------
opensaml-profile-impl/pom.xml | 5 -----
opensaml-saml-api/pom.xml | 7 +------
opensaml-saml-impl/pom.xml | 17 ++++++-----------
opensaml-security-api/pom.xml | 15 +++++----------
opensaml-security-impl/pom.xml | 5 -----
opensaml-soap-api/pom.xml | 5 -----
opensaml-soap-impl/pom.xml | 7 +------
opensaml-spring/pom.xml | 17 ++++++-----------
opensaml-storage-api/pom.xml | 5 -----
opensaml-storage-impl/pom.xml | 19 +++++++------------
opensaml-xmlsec-api/pom.xml | 5 -----
opensaml-xmlsec-impl/pom.xml | 6 +-----
17 files changed, 46 insertions(+), 117 deletions(-)
diff --git a/opensaml-core/pom.xml b/opensaml-core/pom.xml
index f0ff73a9c..f8a41cb04 100644
--- a/opensaml-core/pom.xml
+++ b/opensaml-core/pom.xml
@@ -27,11 +27,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/opensaml-messaging-api/pom.xml b/opensaml-messaging-api/pom.xml
index 1937f59a0..8039bc2f4 100644
--- a/opensaml-messaging-api/pom.xml
+++ b/opensaml-messaging-api/pom.xml
@@ -29,11 +29,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/opensaml-messaging-impl/pom.xml b/opensaml-messaging-impl/pom.xml
index c174ba437..1c90f90fb 100644
--- a/opensaml-messaging-impl/pom.xml
+++ b/opensaml-messaging-impl/pom.xml
@@ -33,13 +33,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -68,8 +64,8 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
diff --git a/opensaml-parent/pom.xml b/opensaml-parent/pom.xml
index d40be7826..fe040eeb3 100644
--- a/opensaml-parent/pom.xml
+++ b/opensaml-parent/pom.xml
@@ -55,6 +55,7 @@
</modules>
<properties>
+ <shib-shared.groupId>net.shibboleth.shared</shib-shared.groupId>
<shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
<checkstyle.configLocation>${project.basedir}/../opensaml-parent/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<opensaml-parent.site.url>${shibboleth.site.deploy.url}java-opensaml/${project.version}/</opensaml-parent.site.url>
@@ -85,9 +86,15 @@
<groupId>${slf4j.groupId}</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
<version>${shib-shared.version}</version>
</dependency>
@@ -126,7 +133,7 @@
<dependencies>
<!-- 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>
@@ -146,8 +153,8 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<version>${shib-shared.version}</version>
<scope>test</scope>
</dependency>
diff --git a/opensaml-profile-api/pom.xml b/opensaml-profile-api/pom.xml
index a30f37a1f..af359bc9f 100644
--- a/opensaml-profile-api/pom.xml
+++ b/opensaml-profile-api/pom.xml
@@ -34,18 +34,13 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -81,8 +76,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
diff --git a/opensaml-profile-impl/pom.xml b/opensaml-profile-impl/pom.xml
index 62de69557..f7e2a6a2a 100644
--- a/opensaml-profile-impl/pom.xml
+++ b/opensaml-profile-impl/pom.xml
@@ -58,11 +58,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git a/opensaml-saml-api/pom.xml b/opensaml-saml-api/pom.xml
index 1b2dabd7b..5bb82eca5 100644
--- a/opensaml-saml-api/pom.xml
+++ b/opensaml-saml-api/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</artifactId>
</dependency>
@@ -68,11 +68,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/opensaml-saml-impl/pom.xml b/opensaml-saml-impl/pom.xml
index e6063a21e..e3c7b28e4 100644
--- a/opensaml-saml-impl/pom.xml
+++ b/opensaml-saml-impl/pom.xml
@@ -89,15 +89,15 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-velocity</artifactId>
</dependency>
@@ -106,11 +106,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>
@@ -221,13 +216,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/opensaml-security-api/pom.xml b/opensaml-security-api/pom.xml
index 05f36827f..dfd932c6a 100644
--- a/opensaml-security-api/pom.xml
+++ b/opensaml-security-api/pom.xml
@@ -35,7 +35,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
@@ -44,11 +44,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>
@@ -91,7 +86,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
@@ -102,7 +97,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
<scope>test</scope>
</dependency>
@@ -112,8 +107,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/opensaml-security-impl/pom.xml b/opensaml-security-impl/pom.xml
index 77b58acf5..7304fbd97 100644
--- a/opensaml-security-impl/pom.xml
+++ b/opensaml-security-impl/pom.xml
@@ -45,11 +45,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/opensaml-soap-api/pom.xml b/opensaml-soap-api/pom.xml
index 4addb7639..9fe0eb39b 100644
--- a/opensaml-soap-api/pom.xml
+++ b/opensaml-soap-api/pom.xml
@@ -46,11 +46,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/opensaml-soap-impl/pom.xml b/opensaml-soap-impl/pom.xml
index 782326076..a1c41dc1c 100644
--- a/opensaml-soap-impl/pom.xml
+++ b/opensaml-soap-impl/pom.xml
@@ -53,15 +53,10 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</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/opensaml-spring/pom.xml b/opensaml-spring/pom.xml
index 3b71e1f74..2d79542d8 100644
--- a/opensaml-spring/pom.xml
+++ b/opensaml-spring/pom.xml
@@ -42,28 +42,23 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<!-- Exception to usual test scope. -->
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
</dependency>
@@ -73,12 +68,12 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
diff --git a/opensaml-storage-api/pom.xml b/opensaml-storage-api/pom.xml
index 216a99a3b..c51a15606 100644
--- a/opensaml-storage-api/pom.xml
+++ b/opensaml-storage-api/pom.xml
@@ -22,11 +22,6 @@
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/opensaml-storage-impl/pom.xml b/opensaml-storage-impl/pom.xml
index 951fd7a89..abc2b8c5e 100644
--- a/opensaml-storage-impl/pom.xml
+++ b/opensaml-storage-impl/pom.xml
@@ -41,20 +41,15 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -115,7 +110,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
@@ -156,7 +151,7 @@
-->
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
</dependency>
@@ -166,7 +161,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
<scope>test</scope>
</dependency>
@@ -182,8 +177,8 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
<scope>test</scope>
</dependency>
diff --git a/opensaml-xmlsec-api/pom.xml b/opensaml-xmlsec-api/pom.xml
index 2c5a7654d..c242aac13 100644
--- a/opensaml-xmlsec-api/pom.xml
+++ b/opensaml-xmlsec-api/pom.xml
@@ -40,11 +40,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/opensaml-xmlsec-impl/pom.xml b/opensaml-xmlsec-impl/pom.xml
index 8bde2f5f0..ff68a7e9b 100644
--- a/opensaml-xmlsec-impl/pom.xml
+++ b/opensaml-xmlsec-impl/pom.xml
@@ -42,10 +42,6 @@
<artifactId>opensaml-xmlsec-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -87,7 +83,7 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.shared</groupId>
+ <groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list