[java-shib-metadata] branch main updated: Rename collections package.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 15:07:22 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-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=8b6d59fa3a870c112aed6d168b6bffa4edef5fb8
The following commit(s) were added to refs/heads/main by this push:
new 8b6d59fa3 Rename collections package.
8b6d59fa3 is described below
commit 8b6d59fa3a870c112aed6d168b6bffa4edef5fb8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 11:07:19 2022 -0400
Rename collections package.
---
.../src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java | 2 +-
.../src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java | 2 +-
.../main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java | 2 +-
.../saml/security/impl/MetadataPKIXValidationInformationResolver.java | 2 +-
.../test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java | 2 +-
.../main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
index 12613fa69..aa662ec1d 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.collection.CollectionSupport;
+import net.shibboleth.shared.collection.CollectionSupport;
/**
* Class to contain a processed form of the {@link AttributeConsumingService} suitable for display purposes. */
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
index 0cb9bb03b..ffcd170bf 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.collection.CollectionSupport;
+import net.shibboleth.shared.collection.CollectionSupport;
/**
* Class to contain a processed form of the {@link UIInfo} suitable for display purposes. */
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
index c38d30795..6042ac19f 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.collection.CollectionSupport;
+import net.shibboleth.shared.collection.CollectionSupport;
/**
* Class to contain a processed form of the {@link Organization} suitable for display purposes. */
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
index 041906c1a..3a8ee64f5 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
@@ -50,8 +50,8 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.saml.security.KeyAuthoritySupport;
import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.collection.LockableClassToInstanceMultiMap;
import net.shibboleth.shared.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java
index 35c61df63..343919ea1 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/MetadataFailFastTest.java
@@ -28,10 +28,10 @@ import org.springframework.mock.env.MockPropertySource;
import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.spring.testing.AbstractFailFastTest;
-import net.shibboleth.utilities.java.support.collection.Pair;
/**
* This test "works" but is hanging the test process so not shutting down cleanly.
diff --git a/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java b/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
index 4780bec87..db916bae1 100644
--- a/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
+++ b/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
@@ -36,11 +36,11 @@ import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.testing.RepositorySupport;
-import net.shibboleth.utilities.java.support.collection.Pair;
/**
* Base class for testing metadata providers.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list