[java-opensaml] branch main updated: Rename primitive package.

[Scott Cantor]

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=c7bcafa30115ff12205b52dec50d6100d9e70ada

The following commit(s) were added to refs/heads/main by this push:
     new c7bcafa30 Rename primitive package.
c7bcafa30 is described below

commit c7bcafa30115ff12205b52dec50d6100d9e70ada
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 13:17:23 2022 -0400

    Rename primitive package.
---
 .../provider/AbstractFilesystemConfigurationPropertiesSource.java   | 4 ++--
 .../main/java/org/opensaml/core/criterion/EntityIdCriterion.java    | 2 +-
 .../java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java    | 2 +-
 .../src/main/java/org/opensaml/core/xml/AbstractXMLObject.java      | 2 +-
 .../src/main/java/org/opensaml/core/xml/Namespace.java              | 2 +-
 .../src/main/java/org/opensaml/core/xml/NamespaceManager.java       | 2 +-
 .../src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java | 2 +-
 .../java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java  | 2 +-
 .../org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java     | 2 +-
 .../org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java    | 2 +-
 .../src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java  | 2 +-
 .../src/main/java/org/opensaml/core/xml/schema/XSURI.java           | 4 ++--
 .../src/main/java/org/opensaml/core/xml/util/AttributeMap.java      | 2 +-
 .../main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java   | 4 ++--
 .../src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java  | 2 +-
 .../opensaml/core/xml/schema/impl/XSBase64BinaryUnmarshaller.java   | 4 ++--
 .../java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java | 2 +-
 .../test/java/org/opensaml/core/xml/tests/NamespaceManagerTest.java | 2 +-
 .../java/org/opensaml/core/xml/util/tests/AttributeMapTest.java     | 5 +++--
 .../org/opensaml/messaging/pipeline/StaticPipelineNameStrategy.java | 4 ++--
 .../messaging/handler/impl/HTTPRequestValidationHandler.java        | 2 +-
 .../profile/action/AbstractHandlerDelegatingProfileAction.java      | 2 +-
 .../src/main/java/org/opensaml/profile/action/ActionSupport.java    | 2 +-
 .../src/main/java/org/opensaml/profile/action/EventException.java   | 2 +-
 .../src/main/java/org/opensaml/profile/context/MetricContext.java   | 2 +-
 .../java/org/opensaml/profile/context/ProfileRequestContext.java    | 2 +-
 .../main/java/org/opensaml/profile/logic/ProfileIdPredicate.java    | 2 +-
 .../src/main/java/org/opensaml/profile/action/impl/CheckAccess.java | 2 +-
 .../src/main/java/org/opensaml/profile/action/impl/LogEvent.java    | 2 +-
 .../main/java/org/opensaml/profile/action/impl/SetProfileId.java    | 2 +-
 .../java/org/opensaml/saml/common/SAMLObjectContentReference.java   | 2 +-
 .../java/org/opensaml/saml/common/assertion/ValidationContext.java  | 2 +-
 .../java/org/opensaml/saml/common/binding/BindingDescriptor.java    | 2 +-
 .../java/org/opensaml/saml/common/binding/SAMLBindingSupport.java   | 2 +-
 .../opensaml/saml/common/messaging/SAMLMessageSecuritySupport.java  | 2 +-
 .../saml/common/messaging/context/AbstractSAMLEntityContext.java    | 2 +-
 .../opensaml/saml/common/messaging/context/SAMLArtifactContext.java | 2 +-
 .../opensaml/saml/common/messaging/context/SAMLBindingContext.java  | 2 +-
 .../opensaml/saml/common/messaging/context/SAMLConsentContext.java  | 2 +-
 .../saml/common/messaging/context/SAMLMessageInfoContext.java       | 2 +-
 .../saml/common/messaging/context/SAMLPeerEntityContext.java        | 2 +-
 .../opensaml/saml/common/messaging/context/SAMLProtocolContext.java | 2 +-
 .../saml/common/messaging/logic/ProxiedRequesterPredicate.java      | 2 +-
 .../saml/common/messaging/soap/SAMLSOAPClientContextBuilder.java    | 2 +-
 .../saml/common/profile/AbstractNameIdentifierGenerator.java        | 2 +-
 .../saml/common/profile/logic/AbstractNameIDPolicyPredicate.java    | 2 +-
 .../saml/common/profile/logic/DefaultLocalErrorPredicate.java       | 2 +-
 .../saml/common/profile/logic/EntityAttributesPredicate.java        | 2 +-
 .../saml/common/profile/logic/EntityGroupNamePredicate.java         | 2 +-
 .../org/opensaml/saml/common/profile/logic/EntityIdPredicate.java   | 2 +-
 .../saml/common/profile/logic/RegistrationAuthorityPredicate.java   | 2 +-
 .../saml/common/profile/logic/RegistrationPolicyPredicate.java      | 2 +-
 .../src/main/java/org/opensaml/saml/config/SAMLConfiguration.java   | 2 +-
 .../org/opensaml/saml/criterion/BestMatchLocationCriterion.java     | 2 +-
 .../src/main/java/org/opensaml/saml/criterion/BindingCriterion.java | 2 +-
 .../java/org/opensaml/saml/criterion/BindingLocationCriterion.java  | 2 +-
 .../opensaml/saml/criterion/BindingResponseLocationCriterion.java   | 2 +-
 .../main/java/org/opensaml/saml/criterion/ProtocolCriterion.java    | 2 +-
 .../src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java   | 4 ++--
 .../main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java  | 4 ++--
 .../src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java       | 4 ++--
 .../src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java         | 4 ++--
 .../src/main/java/org/opensaml/saml/metadata/EntityGroupName.java   | 2 +-
 .../saml/metadata/resolver/index/SimpleStringMetadataIndexKey.java  | 2 +-
 .../opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0002.java | 2 +-
 .../src/main/java/org/opensaml/saml/saml1/core/Action.java          | 4 ++--
 .../main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java   | 4 ++--
 .../java/org/opensaml/saml/saml1/core/AssertionIDReference.java     | 4 ++--
 .../src/main/java/org/opensaml/saml/saml1/core/Audience.java        | 4 ++--
 .../main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java  | 4 ++--
 .../org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java | 6 +++---
 .../src/main/java/org/opensaml/saml/saml2/core/Action.java          | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/Artifact.java        | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java  | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/Audience.java        | 4 ++--
 .../java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java     | 4 ++--
 .../main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/GetComplete.java     | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/NewID.java           | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/RequesterID.java     | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java    | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java   | 4 ++--
 .../opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java    | 4 ++--
 .../main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java | 4 ++--
 .../java/org/opensaml/saml/saml2/metadata/AttributeProfile.java     | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/metadata/Company.java     | 4 ++--
 .../main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java    | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java   | 4 ++--
 .../main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java    | 4 ++--
 .../src/main/java/org/opensaml/saml/saml2/metadata/SurName.java     | 4 ++--
 .../main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java | 4 ++--
 .../saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java     | 2 +-
 .../saml/common/binding/impl/SAMLProtocolAndRoleHandler.java        | 2 +-
 .../common/binding/security/impl/InResponseToSecurityHandler.java   | 2 +-
 .../common/binding/security/impl/MessageReplaySecurityHandler.java  | 2 +-
 .../binding/security/impl/ReceivedEndpointSecurityHandler.java      | 2 +-
 .../saml/common/profile/impl/AddInResponseToToResponse.java         | 2 +-
 .../opensaml/saml/common/profile/impl/VerifyChannelBindings.java    | 2 +-
 .../role/impl/EvaluableProtocolRoleDescriptorCriterion.java         | 2 +-
 .../resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java      | 2 +-
 .../metadata/resolver/filter/impl/ByReferenceMetadataFilter.java    | 2 +-
 .../resolver/filter/impl/EntitiesDescriptorNameProcessor.java       | 4 ++--
 .../saml/metadata/resolver/filter/impl/NameIDFormatFilter.java      | 2 +-
 .../metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java | 2 +-
 .../metadata/resolver/impl/AbstractDynamicMetadataResolver.java     | 4 ++--
 .../saml/metadata/resolver/impl/AbstractMetadataResolver.java       | 2 +-
 .../metadata/resolver/impl/AbstractReloadingMetadataResolver.java   | 2 +-
 .../saml/metadata/resolver/impl/EntityIDDigestGenerator.java        | 2 +-
 .../resolver/impl/MetadataQueryProtocolRequestURLBuilder.java       | 2 +-
 .../saml/metadata/resolver/impl/RegexRequestURLBuilder.java         | 2 +-
 .../saml/metadata/resolver/impl/TemplateRequestURLBuilder.java      | 2 +-
 .../saml/metadata/resolver/index/impl/EndpointMetadataIndex.java    | 2 +-
 .../saml/metadata/resolver/index/impl/MetadataIndexManager.java     | 2 +-
 .../saml/metadata/resolver/index/impl/MetadataIndexSupport.java     | 2 +-
 .../metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java     | 2 +-
 .../saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java       | 2 +-
 .../org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java   | 2 +-
 .../saml2/assertion/impl/AbstractSubjectConfirmationValidator.java  | 4 ++--
 .../saml2/assertion/impl/AudienceRestrictionConditionValidator.java | 4 ++--
 .../opensaml/saml/saml2/assertion/impl/AuthnStatementValidator.java | 2 +-
 .../saml/saml2/assertion/impl/OneTimeUseConditionValidator.java     | 6 +++---
 .../saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java       | 2 +-
 .../saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java     | 2 +-
 .../saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java       | 2 +-
 .../saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java     | 2 +-
 .../org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java   | 2 +-
 .../org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java   | 2 +-
 .../saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java   | 2 +-
 .../profile/impl/DefaultAssertionValidationContextBuilder.java      | 2 +-
 .../java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java   | 2 +-
 .../impl/DefaultSAML20AssertionValidationContextBuilder.java        | 2 +-
 .../security/impl/SAMLMetadataEncryptionParametersResolver.java     | 2 +-
 .../resolver/index/impl/ConstantEntityDescriptorFunction.java       | 2 +-
 .../saml/metadata/resolver/index/impl/SimpleStringCriterion.java    | 2 +-
 .../saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java | 2 +-
 .../java/org/opensaml/security/credential/AbstractCredential.java   | 2 +-
 .../java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java  | 2 +-
 .../main/java/org/opensaml/security/criteria/KeyNameCriterion.java  | 2 +-
 .../java/org/opensaml/security/criteria/PeerEntityIDCriterion.java  | 2 +-
 .../java/org/opensaml/security/crypto/ec/NamedCurveRegistry.java    | 2 +-
 .../org/opensaml/security/crypto/ec/curves/BasicNamedCurve.java     | 2 +-
 .../opensaml/security/httpclient/HttpClientSecurityParameters.java  | 2 +-
 .../main/java/org/opensaml/security/x509/TrustedNamesCriterion.java | 2 +-
 .../main/java/org/opensaml/security/x509/X509DigestCriterion.java   | 2 +-
 .../src/main/java/org/opensaml/security/x509/X509Support.java       | 2 +-
 .../criteria/impl/EvaluableEntityIDCredentialCriterion.java         | 2 +-
 .../criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java     | 2 +-
 .../criteria/impl/EvaluableKeyNameCredentialCriterion.java          | 2 +-
 .../criteria/impl/EvaluableX509DigestCredentialCriterion.java       | 2 +-
 .../httpclient/impl/BasicHttpClientSecurityConfiguration.java       | 2 +-
 .../httpclient/impl/BasicHttpClientSecurityParametersResolver.java  | 2 +-
 .../opensaml/security/x509/impl/KeyStoreX509CredentialAdapter.java  | 2 +-
 .../security/x509/impl/X509KeyManagerX509CredentialAdapter.java     | 2 +-
 .../src/main/java/org/opensaml/soap/client/SOAPClientContext.java   | 2 +-
 .../org/opensaml/soap/client/http/HttpSOAPRequestParameters.java    | 4 ++--
 .../soap/messaging/AbstractHeaderGeneratingMessageHandler.java      | 2 +-
 .../src/main/java/org/opensaml/soap/util/SOAPSupport.java           | 2 +-
 .../opensaml/soap/wsaddressing/messaging/WSAddressingContext.java   | 4 ++--
 .../org/opensaml/soap/wsaddressing/util/WSAddressingSupport.java    | 4 ++--
 .../java/org/opensaml/soap/wssecurity/util/WSSecuritySupport.java   | 2 +-
 .../messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java    | 2 +-
 .../java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java    | 2 +-
 .../org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java    | 4 ++--
 .../org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java  | 4 ++--
 .../opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java | 2 +-
 .../soap/wsaddressing/messaging/impl/AddRelatesToHandler.java       | 2 +-
 .../soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java   | 4 ++--
 .../soap/wsaddressing/messaging/impl/ValidateActionHandler.java     | 2 +-
 .../org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java    | 4 ++--
 .../spring/credential/AbstractBasicCredentialFactoryBean.java       | 2 +-
 .../main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java  | 2 +-
 .../src/main/java/org/opensaml/storage/AbstractStorageService.java  | 2 +-
 .../java/org/opensaml/storage/impl/client/ClientStorageService.java | 2 +-
 .../opensaml/storage/impl/memcached/MemcachedStorageService.java    | 2 +-
 .../org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java | 4 ++--
 .../opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java    | 4 ++--
 .../org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java | 4 ++--
 .../org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java | 4 ++--
 .../java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java  | 4 ++--
 .../xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java      | 4 ++--
 .../xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java      | 4 ++--
 .../xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java        | 4 ++--
 .../opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java  | 2 +-
 .../xacml/policy/impl/CombinerParameterTypeUnmarshaller.java        | 4 ++--
 .../xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java         | 4 ++--
 .../org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java    | 4 ++--
 .../org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java | 4 ++--
 .../xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java | 4 ++--
 .../policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java    | 4 ++--
 .../opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java   | 4 ++--
 .../xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java   | 4 ++--
 .../java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java   | 4 ++--
 .../policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java     | 4 ++--
 .../opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java    | 4 ++--
 .../xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java       | 4 ++--
 .../xacml/policy/impl/VariableReferenceTypeUnmarshaller.java        | 4 ++--
 .../main/java/org/opensaml/xmlsec/AlgorithmPolicyParameters.java    | 2 +-
 .../main/java/org/opensaml/xmlsec/WhitelistBlacklistParameters.java | 4 ++--
 .../opensaml/xmlsec/agreement/KeyAgreementProcessorRegistry.java    | 2 +-
 .../main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java  | 2 +-
 .../xmlsec/criterion/KeyInfoGenerationProfileCriterion.java         | 2 +-
 .../xmlsec/encryption/support/AbstractEncryptedKeyResolver.java     | 2 +-
 .../main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java | 2 +-
 .../encryption/support/KeyAgreementEncryptionConfiguration.java     | 2 +-
 .../org/opensaml/xmlsec/encryption/support/RSAOAEPParameters.java   | 2 +-
 .../org/opensaml/xmlsec/signature/support/SignatureSupport.java     | 2 +-
 .../org/opensaml/xmlsec/signature/support/URIContentReference.java  | 2 +-
 .../opensaml/xmlsec/agreement/impl/BasicKeyAgreementCredential.java | 2 +-
 .../main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java  | 2 +-
 .../src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java   | 2 +-
 .../main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java    | 2 +-
 .../main/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDF.java  | 2 +-
 .../src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java   | 2 +-
 .../org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfiguration.java | 2 +-
 .../java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java | 2 +-
 .../opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java    | 2 +-
 .../opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java  | 4 ++--
 .../org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java   | 2 +-
 .../main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java   | 2 +-
 .../org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java     | 2 +-
 .../xmlsec/signature/support/impl/SignatureAlgorithmValidator.java  | 2 +-
 .../org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java  | 2 +-
 .../opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java  | 2 +-
 224 files changed, 299 insertions(+), 298 deletions(-)

diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java b/opensaml-core-api/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java
index c047ebbac..853e56378 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/config/provider/AbstractFilesystemConfigurationPropertiesSource.java
@@ -24,12 +24,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.config.ConfigurationPropertiesSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * A configuration properties source implementation which obtains the properties set
  * from a resource on the filesystem.
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java b/opensaml-core-api/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java
index 2a5bfe617..324150f50 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.core.criterion;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** {@link Criterion} representing an entity ID. */
 public final class EntityIdCriterion implements Criterion {
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java b/opensaml-core-api/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
index ed8588dbf..b21436edd 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
index 2e5474add..323d4f3fa 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
@@ -34,10 +34,10 @@ import org.w3c.dom.Element;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.LockableClassToInstanceMultiMap;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.shared.xml.XMLConstants;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * An abstract implementation of XMLObject.
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/Namespace.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/Namespace.java
index 09ea75d40..b92cef800 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/Namespace.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/Namespace.java
@@ -21,8 +21,8 @@ import java.util.Objects;
 
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** Data structure for representing XML namespace attributes. */
 public class Namespace {
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/NamespaceManager.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/NamespaceManager.java
index 5b59f44d9..f1c869b07 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/NamespaceManager.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/NamespaceManager.java
@@ -30,9 +30,9 @@ import javax.xml.namespace.QName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.LazyMap;
 import net.shibboleth.shared.collection.LazySet;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.XMLConstants;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.Strings;
 
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java
index b1790676d..0ca2a4cc6 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLConfigurator.java
@@ -34,13 +34,13 @@ import javax.xml.validation.SchemaFactory;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.AttributeSupport;
 import net.shibboleth.shared.xml.ElementSupport;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.shared.xml.XMLParserException;
 import net.shibboleth.shared.xml.impl.BasicParserPool;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.config.ConfigurationService;
 import org.opensaml.core.xml.XMLObjectBuilder;
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java
index 9e3909ee7..2ec724516 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java
@@ -24,12 +24,12 @@ import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.ElementSupport;
 import net.shibboleth.shared.xml.NamespaceSupport;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.shared.xml.XMLConstants;
 import net.shibboleth.shared.xml.XMLParserException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.Namespace;
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
index 9928686e2..4326ab4eb 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
@@ -23,10 +23,10 @@ import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.shared.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.Namespace;
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
index 9314c74df..0ad47aeff 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManager.java
@@ -50,10 +50,10 @@ import com.google.common.io.Files;
 
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.XMLParserException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Implementation of {@link XMLObjectLoadSaveManager} which uses a local filesystem to load and store serialized XML.
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java
index 6b53a916e..be6dc0832 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSBooleanValue.java
@@ -19,7 +19,7 @@ package org.opensaml.core.xml.schema;
 
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * A class representing a boolean attribute. This class tracks the usage of the literals {true, false, 1, 0} to ensure
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSURI.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSURI.java
index 27dbb9882..d9d9715f0 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSURI.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/schema/XSURI.java
@@ -22,9 +22,9 @@ import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.shared.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
 import org.opensaml.core.xml.XMLObject;
 
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/AttributeMap.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
index 135c48366..81c299a25 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
@@ -29,9 +29,9 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.collection.LazyMap;
 import net.shibboleth.shared.collection.LazySet;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.NamespaceManager;
 import org.opensaml.core.xml.XMLObject;
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java
index 5f3ccc294..613dba43e 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLAttributeSupport.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.core.xml.util;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.BaseBearing;
 import org.opensaml.core.xml.IdBearing;
@@ -27,6 +25,8 @@ import org.opensaml.core.xml.SpaceBearing;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.SpaceBearing.XMLSpaceEnum;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Helper methods for working with global attributes from the XML namespace. These are namely:
  * <ol>
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
index a0f0d219b..d9295d433 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
@@ -28,12 +28,12 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.AttributeSupport;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.shared.xml.XMLParserException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.config.ConfigurationService;
 import org.opensaml.core.xml.Namespace;
diff --git a/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryUnmarshaller.java b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryUnmarshaller.java
index fa709a4f2..a9dfac6fa 100644
--- a/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryUnmarshaller.java
+++ b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryUnmarshaller.java
@@ -19,12 +19,12 @@ package org.opensaml.core.xml.schema.impl;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
 import org.opensaml.core.xml.schema.XSBase64Binary;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Thread-safe unmarshaller for {@link XSBase64Binary} objects.
  */
diff --git a/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java
index 143964f4b..4c5bcb218 100644
--- a/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java
+++ b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/schema/impl/XSQNameUnmarshaller.java
@@ -17,9 +17,9 @@
 
 package org.opensaml.core.xml.schema.impl;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.ElementSupport;
 import net.shibboleth.shared.xml.QNameSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
diff --git a/opensaml-core-impl/src/test/java/org/opensaml/core/xml/tests/NamespaceManagerTest.java b/opensaml-core-impl/src/test/java/org/opensaml/core/xml/tests/NamespaceManagerTest.java
index df7108342..c1489c88f 100644
--- a/opensaml-core-impl/src/test/java/org/opensaml/core/xml/tests/NamespaceManagerTest.java
+++ b/opensaml-core-impl/src/test/java/org/opensaml/core/xml/tests/NamespaceManagerTest.java
@@ -26,8 +26,8 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.testing.XMLObjectBaseTestCase;
 import org.opensaml.core.xml.Namespace;
diff --git a/opensaml-core-impl/src/test/java/org/opensaml/core/xml/util/tests/AttributeMapTest.java b/opensaml-core-impl/src/test/java/org/opensaml/core/xml/util/tests/AttributeMapTest.java
index ad7e6eeb5..40d6b2862 100644
--- a/opensaml-core-impl/src/test/java/org/opensaml/core/xml/util/tests/AttributeMapTest.java
+++ b/opensaml-core-impl/src/test/java/org/opensaml/core/xml/util/tests/AttributeMapTest.java
@@ -18,6 +18,9 @@
 package org.opensaml.core.xml.util.tests;
 
 import org.testng.annotations.Test;
+
+import net.shibboleth.shared.primitive.StringSupport;
+
 import org.testng.annotations.BeforeMethod;
 import org.testng.Assert;
 
@@ -26,8 +29,6 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.testing.XMLObjectBaseTestCase;
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.Namespace;
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/pipeline/StaticPipelineNameStrategy.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/pipeline/StaticPipelineNameStrategy.java
index 6045e43f1..1cb1424ed 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/pipeline/StaticPipelineNameStrategy.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/pipeline/StaticPipelineNameStrategy.java
@@ -21,10 +21,10 @@ import java.util.function.Function;
 
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.messaging.context.InOutOperationContext;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Static strategy function for resolving a pipeline name.
  */
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java
index 98cdbc44b..e379a20bc 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java
@@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory;
 import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A message handler that checks basic HTTP request properties.
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java
index aee9ecb2c..ac979c809 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java
@@ -34,8 +34,8 @@ import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
 import com.google.common.base.Predicates;
 
 import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Base class for a profile action which just delegates to an instance of {@link MessageHandler}.
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/ActionSupport.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/ActionSupport.java
index b02bd4bc4..19c73928f 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/ActionSupport.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/ActionSupport.java
@@ -20,8 +20,8 @@ package org.opensaml.profile.action;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.EventContext;
 import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventException.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventException.java
index 42a579e62..96b0664c3 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventException.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/EventException.java
@@ -20,8 +20,8 @@ package org.opensaml.profile.action;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Runtime exception which may be used to communicate a specific event ID.
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/context/MetricContext.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/context/MetricContext.java
index 33ecbc867..e9bf1de23 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/context/MetricContext.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/context/MetricContext.java
@@ -35,8 +35,8 @@ import net.shibboleth.shared.annotation.constraint.Live;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Child context that supplies instructions to the runtime actions
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/context/ProfileRequestContext.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/context/ProfileRequestContext.java
index 7cbec5ed5..489bc4cd7 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/context/ProfileRequestContext.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/context/ProfileRequestContext.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.InOutOperationContext;
 
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
index 7fd85e8ce..8ba11bd35 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
@@ -22,9 +22,9 @@ import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java
index 65c7d4d0a..9f953271f 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java
@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.security.AccessControlService;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * This action validates that a request comes from an authorized client, based on an injected service
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java
index b7d4da9c6..395f5a178 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java
@@ -34,8 +34,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 
 /**
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/SetProfileId.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/SetProfileId.java
index e48a9fbdd..377135209 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/SetProfileId.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/SetProfileId.java
@@ -23,8 +23,8 @@ import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 
 /**
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java
index 1a48b3309..3b7b0be05 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java
@@ -27,8 +27,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.LazyList;
 import net.shibboleth.shared.collection.LazySet;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.xml.security.signature.XMLSignature;
 import org.apache.xml.security.signature.XMLSignatureException;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/assertion/ValidationContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/assertion/ValidationContext.java
index 385e636ed..ba3308385 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/assertion/ValidationContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/assertion/ValidationContext.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import net.shibboleth.shared.collection.LazyMap;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Context which holds state related to a single validation event.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
index 2b0570882..29af122c8 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
@@ -41,8 +41,8 @@ import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
index 73153c842..49b46f6ec 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
@@ -42,8 +42,8 @@ import com.google.common.base.Strings;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** A support class for SAML binding operations. */
 public final class SAMLBindingSupport {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupport.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupport.java
index 37dbea821..ea824501a 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupport.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupport.java
@@ -21,8 +21,8 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.messaging.context.MessageContext;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AbstractSAMLEntityContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AbstractSAMLEntityContext.java
index ac12ceab7..0f845fd08 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AbstractSAMLEntityContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AbstractSAMLEntityContext.java
@@ -21,7 +21,7 @@ import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLArtifactContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLArtifactContext.java
index d54bebf41..f019ec976 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLArtifactContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLArtifactContext.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.messaging.context;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java
index 1944e16fc..56beeba44 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.messaging.context;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 import org.opensaml.saml.common.binding.BindingDescriptor;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLConsentContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLConsentContext.java
index c00459810..8780265d0 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLConsentContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLConsentContext.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.messaging.context;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContext.java
index 548fbfadd..bc50fdf96 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLMessageInfoContext.java
@@ -26,7 +26,7 @@ import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * A context intended to be used as a subcontext of a {@link MessageContext}  that carries 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java
index 2d26800cf..0ff8d2636 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLPeerEntityContext.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLProtocolContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLProtocolContext.java
index 2c3095afe..974c2090c 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLProtocolContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLProtocolContext.java
@@ -20,7 +20,7 @@ package org.opensaml.saml.common.messaging.context;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
index fa815319a..6a2958ca3 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
@@ -29,9 +29,9 @@ import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.profile.context.ProxiedRequesterContext;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Predicate that determines whether one of a set of candidates is contained in a
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/soap/SAMLSOAPClientContextBuilder.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/soap/SAMLSOAPClientContextBuilder.java
index 891806f90..45c89cf08 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/soap/SAMLSOAPClientContextBuilder.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/soap/SAMLSOAPClientContextBuilder.java
@@ -46,8 +46,8 @@ import org.opensaml.security.messaging.HttpClientSecurityContext;
 import org.opensaml.soap.client.SOAPClientContext;
 import org.opensaml.soap.client.security.SOAPClientSecurityContext;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 //TODO when impl finished, document required vs optional data and derivation rules
 
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
index 8e99666ec..2101aa075 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
@@ -34,8 +34,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Abstract base class for simple implementations of {@link NameIdentifierGenerator}.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
index a1e8eb673..13ff4ffca 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
@@ -38,9 +38,9 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Base class for implementations of {@link Predicate} that handle evaluation of name identifier content in various
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
index dd3f0eac3..e7b6f1650 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
@@ -37,9 +37,9 @@ import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.messaging.context.navigate.MessageLookup;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
index 55c022cc4..f789e120d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
@@ -50,10 +50,10 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Predicate to determine whether an {@link EntityDescriptor} or its parent groups contain an {@link EntityAttributes}
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
index 9c15a74c3..5f7a435a5 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
@@ -37,10 +37,10 @@ import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Predicate to determine whether one of a set of names matches any of an entity's containing
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
index 829517764..78423b902 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
@@ -29,8 +29,8 @@ import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Predicate;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Predicate that matches an {@link EntityDescriptor} against a set of entityIDs.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
index 988450efc..e24bf5176 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
@@ -29,7 +29,7 @@ import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Predicate to determine whether one of a set of names matches an entity's
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
index d403807d8..e3dd898fc 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
@@ -30,7 +30,7 @@ import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Predicate to determine whether one of a set of names matches an entity's
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/config/SAMLConfiguration.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/config/SAMLConfiguration.java
index 4eb3b9fef..833713b01 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/config/SAMLConfiguration.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/config/SAMLConfiguration.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.binding.artifact.SAML2ArtifactBuilderFactory;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * SAML-related configuration information.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BestMatchLocationCriterion.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BestMatchLocationCriterion.java
index 3605803b6..ddc88dc59 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BestMatchLocationCriterion.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BestMatchLocationCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.saml.criterion;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * {@link Criterion} representing a SAML binding location to compare to candidate endpoints
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java
index ff5b5083c..3f9863efd 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java
@@ -24,8 +24,8 @@ import javax.annotation.Nonnull;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** {@link Criterion} representing an ordered list of SAML bindings. */
 public final class BindingCriterion implements Criterion {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java
index e3622925a..21d636a13 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.saml.criterion;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * {@link Criterion} representing a SAML binding location.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java
index a68079146..7423b1c43 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.saml.criterion;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** {@link Criterion} representing a SAML binding resonse location. */
 public final class BindingResponseLocationCriterion implements Criterion {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java
index 2d74f32e9..761c12050 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.saml.criterion;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** {@link Criterion} representing a protocolSupportEnumeration value. */
 public final class ProtocolCriterion implements Criterion {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
index 314bd2942..c60aa5558 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * DomainHint.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
index 91472054f..bdd9d18e1 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * GeolocationHint.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
index bf0b0fa4c..4c473e1d0 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * IPHint.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
index 1a305960b..8709c9eda 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.metadata.LocalizedURI;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * Localized logo type.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java
index dee68ad6c..a9c175d02 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java
@@ -20,8 +20,8 @@ package org.opensaml.saml.metadata;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A bean class which is used to represent an entity group to which an
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/index/SimpleStringMetadataIndexKey.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/index/SimpleStringMetadataIndexKey.java
index 0b75e5d43..25391aec3 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/index/SimpleStringMetadataIndexKey.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/index/SimpleStringMetadataIndexKey.java
@@ -21,8 +21,8 @@ import javax.annotation.Nonnull;
 
 import com.google.common.base.MoreObjects;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A simple implementation of {@link MetadataIndexKey} based on a single input string.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0002.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0002.java
index d6454340d..6415d5a12 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0002.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0002.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
 
 import org.opensaml.saml.common.binding.artifact.SAMLSourceLocationArtifact;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * SAML 1 Type 0x0002 Artifact. SAML 1, type 2, artifacts contains a 2 byte type code with a value of 1 followed by a 20
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
index 0ca9783d9..120381a8c 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.saml.common.SAMLObject;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java
index 552138711..c158f7839 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java
@@ -22,8 +22,8 @@ import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.saml.common.SAMLObject;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java
index 064522ab7..c5563bab0 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.saml.common.xml.SAMLConstants;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java
index 1e13ef39c..a839537d7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java
@@ -30,8 +30,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * This interface describes how an object representing a SAML1 <code>Audience</code> element will behave.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
index 6092dcb4b..fb98f5bd7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
@@ -29,8 +29,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * This interface defines how the object representing a SAML1 <code> ConfirmationMethod </code> element behaves.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java
index b415c9a19..334f212f6 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java
@@ -29,11 +29,11 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.collection.LazyMap;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.xml.SerializeSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.io.MarshallingException;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java
index 80c77b6ee..37fc3ad12 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core Action.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java
index 59fa30b82..bfc1043b7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java
@@ -30,8 +30,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core Artifact.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java
index 1d57a3b9a..00d8726ae 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core AssertionIDRef.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java
index b87dbc77e..afcc20ba8 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core AssertionURIRef.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java
index 359d6e843..c4053954b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core Audience.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java
index 14351f733..7f7cce284 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java
@@ -29,8 +29,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core AuthnContextClassRef.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java
index c6884ba46..59d664b35 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core AuthnContextDeclRef.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java
index 3159591c1..721435c2e 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core GetComplete.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java
index 9fafd7268..363a316ab 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java
@@ -30,8 +30,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core NewID.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java
index 6ae33483d..e0adc00b0 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core RequesterID.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java
index ff29b223e..2af13418d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java
@@ -30,8 +30,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core SessionIndex.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java
index dd084df5e..6bd0fbdc9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Core StatusMessage.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java
index e32689d94..6cd971e39 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata AdditionalMetadataLocation.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
index 10d405a22..1a133cfb8 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata AffiliateMember.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java
index 9d0f0f51f..c86d9dbb9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata AttributeProfile.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java
index 15f02cffa..0448502c9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata Company.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java
index fbcdfc9b4..0fc607a12 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata EmailAddress.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java
index 2e9c3de32..50685a2e2 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata GivenName.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java
index 9924a48d8..b945e2436 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata NameIDFormat.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java
index dfbd43338..9f8a19ae1 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata SurName.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java
index d6a76bc1a..d3db44ca3 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java
@@ -26,8 +26,8 @@ import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.xml.SAMLConstants;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * SAML 2.0 Metadata TelephoneNumber.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
index fc4016323..6f512266c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
@@ -39,8 +39,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.TimerSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 
 /** Basic artifact map implementation. */
 public class BasicSAMLArtifactMap extends AbstractInitializableComponent implements
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
index b6fad6b5e..537a5c276 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
@@ -33,8 +33,8 @@ import org.opensaml.saml.common.messaging.context.SAMLProtocolContext;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * SAML {@link org.opensaml.messaging.handler.MessageHandler} that attaches protocol
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandler.java
index e96e62fb5..47e142c47 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/InResponseToSecurityHandler.java
@@ -29,7 +29,7 @@ import org.opensaml.saml.common.SAMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Client-side message handler for validating that the inbound SAML response inResponseTo ID matches the corresponding
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
index 5423296e4..d6d019bc4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
@@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory;
 
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Security message handler implementation that which checks for replay of SAML messages.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
index 972afd8c7..2839880e6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
@@ -37,8 +37,8 @@ import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.URIComparator;
 import net.shibboleth.shared.net.URIException;
 import net.shibboleth.shared.net.impl.BasicURLComparator;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Message handler which checks the validity of the SAML protocol message receiver 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
index ad8b2995c..d59b3eba6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
@@ -42,8 +42,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that adds the <code>InResponseTo</code> attribute to a response message if a SAML message ID is set on
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
index 4fff6a297..1cf42d978 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
@@ -36,8 +36,8 @@ import org.opensaml.soap.messaging.context.SOAP11Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that verifies two sets of {@link ChannelBindings} from two different {@link ChannelBindingsContext}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java
index 445f6094d..a8cfb9a7b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java
@@ -28,8 +28,8 @@ import org.opensaml.saml.saml2.metadata.RoleDescriptor;
 import com.google.common.base.MoreObjects;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Implementation of {@link EvaluableRoleDescriptorCriterion} which evaluates that a role descriptor
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java
index 34d024790..88a938997 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java
@@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.metadata.AffiliationDescriptor;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilter.java
index e5233a8a4..5c60c4b29 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilter.java
@@ -34,8 +34,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A {@link MetadataFilter} that associates other filters with specific
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
index 9a8ebdaad..60b8a61ec 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
@@ -19,8 +19,6 @@ package org.opensaml.saml.metadata.resolver.filter.impl;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.metadata.EntityGroupName;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
@@ -30,6 +28,8 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * A metadata node processor implementation which attaches an instance of
  * {@link EntityGroupName} to an {@link EntityDescriptor} for
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java
index 5c673b391..8f3fbea6d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java
@@ -48,8 +48,8 @@ import com.google.common.collect.Multimap;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A filter that adds {@link NameIDFormat} content to entities in order to drive software
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
index 12858c8da..d6d649286 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
@@ -57,10 +57,10 @@ import net.shibboleth.shared.annotation.constraint.Unmodifiable;
 import net.shibboleth.shared.collection.LazySet;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.MediaTypeSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Abstract subclass for dynamic metadata resolvers that implement metadata resolution based on HTTP requests.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
index 74dcaaafa..fde2da0e5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
@@ -77,11 +77,11 @@ import net.shibboleth.shared.codec.StringDigester;
 import net.shibboleth.shared.codec.StringDigester.OutputFormat;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.primitive.TimerSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 
 /**
  * Abstract subclass for metadata resolvers that resolve metadata dynamically, as needed and on demand.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
index 0d8ad39c6..434995512 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
@@ -59,6 +59,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.CriterionPredicateRegistry;
 import net.shibboleth.shared.resolver.ResolverException;
@@ -66,7 +67,6 @@ import net.shibboleth.shared.resolver.ResolverSupport;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** An abstract, base, implementation of a metadata provider. */
 public abstract class AbstractMetadataResolver extends AbstractIdentifiableInitializableComponent implements
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
index a9321633d..3325f226b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
@@ -41,9 +41,9 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.TimerSupport;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 
 /**
  * Base class for metadata providers that cache and periodically refresh their metadata.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java
index 29e14ceab..30b77b706 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java
@@ -28,8 +28,8 @@ import org.opensaml.security.crypto.JCAConstants;
 
 import net.shibboleth.shared.codec.StringDigester;
 import net.shibboleth.shared.codec.StringDigester.OutputFormat;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Strategy for processing input criteria to extract the entityID from an {@link EntityIdCriterion} 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/MetadataQueryProtocolRequestURLBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/MetadataQueryProtocolRequestURLBuilder.java
index 12ef81d05..36f9f4a15 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/MetadataQueryProtocolRequestURLBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/MetadataQueryProtocolRequestURLBuilder.java
@@ -33,9 +33,9 @@ import com.google.common.net.UrlEscapers;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 //TODO reference to protocol spec pending in Javadoc.
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/RegexRequestURLBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/RegexRequestURLBuilder.java
index bfbdba579..6804cade7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/RegexRequestURLBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/RegexRequestURLBuilder.java
@@ -25,9 +25,9 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.slf4j.Logger;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilder.java
index 932497d58..5ddfea97c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilder.java
@@ -33,10 +33,10 @@ import org.slf4j.LoggerFactory;
 import com.google.common.net.UrlEscapers;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.velocity.Template;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Function which produces a URL by substituting an entity ID value from criteria into a Velocity template string.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java
index c3bab08b8..dda84f403 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java
@@ -49,9 +49,9 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
 import net.shibboleth.shared.net.URLBuilder;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * An implementation of {@link MetadataIndex} which indexes entities by their role endpoint locations.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
index 6c57e9356..b7acaea6c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
@@ -38,9 +38,9 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
 import net.shibboleth.shared.collection.LazySet;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * High-level component which handles index and lookup of instances of particular type of data item,
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java
index e356fd057..936ac2e16 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
 
 import net.shibboleth.shared.net.SimpleURLCanonicalizer;
 import net.shibboleth.shared.net.URLBuilder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Support methods for metadata indexing.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java
index 36eaeea5a..255c51467 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java
@@ -56,9 +56,9 @@ import com.google.common.base.MoreObjects;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.LazySet;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * An implementation of {@link MetadataIndex} which indexes entities by their artifact SourceID values.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java
index 43124f74f..7a0651599 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * SAML 1.X HTTP Artifact message decoder.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
index ff498e661..9e593bc2c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
@@ -50,8 +50,8 @@ import com.google.common.base.Predicates;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that sets {@link Status} content in a {@link Response} obtained from
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java
index cc79e8b10..0a2f635d2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java
@@ -35,8 +35,8 @@ import org.opensaml.saml.saml2.core.SubjectConfirmation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.utilities.java.support.primitive.ObjectSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.ObjectSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * A base class for {@link SubjectConfirmationValidator} implementations. 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java
index f084dde49..5e6b97524 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java
@@ -24,8 +24,6 @@ import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.saml.common.assertion.AssertionValidationException;
 import org.opensaml.saml.common.assertion.ValidationContext;
 import org.opensaml.saml.common.assertion.ValidationResult;
@@ -38,6 +36,8 @@ import org.opensaml.saml.saml2.core.Condition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * {@link ConditionValidator} implementation for {@link AudienceRestriction} conditions.
  * 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidator.java
index 29c5aace5..450978de5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AuthnStatementValidator.java
@@ -37,7 +37,7 @@ import org.opensaml.saml.saml2.core.SubjectLocality;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * {@link StatementValidator} implementation for {@link AuthnStatement} conditions.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
index e597e2f69..dcabc1799 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
@@ -27,10 +27,10 @@ import javax.annotation.concurrent.ThreadSafe;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.saml.common.assertion.AssertionValidationException;
 import org.opensaml.saml.common.assertion.ValidationContext;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
index 5ef28a883..5562b0e76 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
@@ -69,12 +69,12 @@ import net.shibboleth.shared.codec.Base64Support;
 import net.shibboleth.shared.codec.DecodingException;
 import net.shibboleth.shared.codec.EncodingException;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.Resolver;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.shared.security.IdentifierGenerationStrategy;
 import net.shibboleth.shared.security.impl.SecureRandomIdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** 
  * SAML 2 Artifact Binding decoder, support both HTTP GET and POST.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java
index 9edb8d0fa..ff183b503 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java
@@ -43,7 +43,7 @@ import com.google.common.base.Strings;
 import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.codec.Base64Support;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * SAML 2.0 HTTP Redirect decoder using the DEFLATE encoding method.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
index 68f4db915..6d9ba19ca 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
@@ -52,8 +52,8 @@ import net.shibboleth.shared.codec.HTMLEncoder;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.URLBuilder;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * SAML 2 Artifact Binding encoder, support both HTTP GET and POST.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
index b8f1fbbf6..4aa19e8ed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
@@ -57,8 +57,8 @@ import net.shibboleth.shared.codec.EncodingException;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.net.HttpServletSupport;
 import net.shibboleth.shared.net.URLBuilder;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.SerializeSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * SAML 2.0 HTTP Redirect encoder using the DEFLATE encoding method.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
index 6984cc126..7c84f8e84 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.List;
 
 import net.shibboleth.shared.collection.LazyList;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.util.AttributeMap;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java
index 188a42f85..81d6ddd41 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java
@@ -49,8 +49,8 @@ import com.google.common.base.Predicates;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that sets {@link Status} content in a {@link StatusResponseType} obtained from
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
index 9472a9f3b..2cbf5e460 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
@@ -46,8 +46,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.HttpServletSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that builds {@link SubjectConfirmation} and adds it to the {@link Subject} of all the assertions
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultAssertionValidationContextBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultAssertionValidationContextBuilder.java
index 81df9c22d..6fc1a962f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultAssertionValidationContextBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultAssertionValidationContextBuilder.java
@@ -75,10 +75,10 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.collection.LazySet;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.net.HttpServletSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  *  Function which implements default behavior for building an instance of {@link ValidationContext}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java
index b9312e032..1a3fd37ef 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java
@@ -58,9 +58,9 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that encrypts all {@link NameID}s in a message obtained from a lookup strategy,
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java
index 2d98977c2..2b4da0c12 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java
@@ -34,8 +34,8 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.collection.LazySet;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.net.HttpServletSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.messaging.context.MessageContext;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
index e6c317e3b..f91b9c271 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
@@ -31,11 +31,11 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.PredicateSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.metadata.EncryptionMethod;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/ConstantEntityDescriptorFunction.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/ConstantEntityDescriptorFunction.java
index b448b1262..a115f376a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/ConstantEntityDescriptorFunction.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/ConstantEntityDescriptorFunction.java
@@ -28,8 +28,8 @@ import org.opensaml.saml.metadata.resolver.index.MetadataIndexKey;
 import org.opensaml.saml.metadata.resolver.index.SimpleStringMetadataIndexKey;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 public class ConstantEntityDescriptorFunction implements Function<EntityDescriptor, Set<MetadataIndexKey>> {
     
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SimpleStringCriterion.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SimpleStringCriterion.java
index b37c4ef88..c3334abcf 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SimpleStringCriterion.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/SimpleStringCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.saml.metadata.resolver.index.impl;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
index 2a1451576..42ccecf20 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidatorTest.java
@@ -21,7 +21,7 @@ import java.time.Duration;
 import java.util.Map;
 
 import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.saml.common.assertion.AssertionValidationException;
 import org.opensaml.saml.common.assertion.ValidationContext;
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java b/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
index bbc994af4..25b8fe6e6 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
 import javax.crypto.SecretKey;
 
 import net.shibboleth.shared.collection.LazySet;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Base class for {@link org.opensaml.security.credential.Credential} implementations.
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
index 1f7fe1548..787915900 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
@@ -19,9 +19,9 @@ package org.opensaml.security.criteria;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 
 /**
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
index 97f3b5c4a..46892fb0b 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
@@ -19,9 +19,9 @@ package org.opensaml.security.criteria;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 
 /**
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
index cd74a6e1e..aacbfec41 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
@@ -19,9 +19,9 @@ package org.opensaml.security.criteria;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * An implementation of {@link Criterion} which specifies criteria pertaining 
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/NamedCurveRegistry.java b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/NamedCurveRegistry.java
index bd012bfa6..fc2af8789 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/NamedCurveRegistry.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/NamedCurveRegistry.java
@@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A registry of {@link NamedCurve} descriptors.
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/BasicNamedCurve.java b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/BasicNamedCurve.java
index 09b534a6b..77183942a 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/BasicNamedCurve.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/BasicNamedCurve.java
@@ -25,8 +25,8 @@ import org.opensaml.security.crypto.ec.NamedCurve;
 
 import com.google.common.base.MoreObjects;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Basic implementations of {@link NamedCurve} where all required properties are simply supplied at
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java
index 40efc8853..77e3addcc 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java
@@ -24,8 +24,8 @@ import java.util.List;
 import javax.annotation.Nullable;
 import javax.net.ssl.HostnameVerifier;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
index 5f684b02b..4471abb18 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A criterion implementation for conveying a dynamically-generated set of trusted
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
index 8f4e29d4e..c2c0659ea 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
@@ -21,9 +21,9 @@ import java.util.Arrays;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.commons.codec.binary.Hex;
 
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
index a1c50b701..eb08060a4 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
@@ -46,8 +46,8 @@ import javax.security.auth.x500.X500Principal;
 
 import net.shibboleth.shared.codec.Base64Support;
 import net.shibboleth.shared.codec.DecodingException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.DEROctetString;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
index e107297d4..ac15d985c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.security.credential.criteria.impl;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.AbstractTriStatePredicate;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.security.credential.Credential;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
index c705b3004..67450209a 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
@@ -22,9 +22,9 @@ import java.security.Key;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.AbstractTriStatePredicate;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.security.credential.Credential;
 import org.opensaml.security.criteria.KeyAlgorithmCriterion;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
index 44410da79..d48fd1337 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.security.credential.criteria.impl;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.AbstractTriStatePredicate;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.security.credential.Credential;
 import org.opensaml.security.criteria.KeyNameCriterion;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
index 6e2027581..0cdd725dc 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
@@ -27,9 +27,9 @@ import java.util.Arrays;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.AbstractTriStatePredicate;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.commons.codec.binary.Hex;
 import org.opensaml.security.credential.Credential;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfiguration.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfiguration.java
index d6ba4f71f..465518929 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfiguration.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfiguration.java
@@ -32,7 +32,7 @@ import org.opensaml.security.httpclient.HttpClientSecurityConfiguration;
 import org.opensaml.security.trust.TrustEngine;
 import org.opensaml.security.x509.X509Credential;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Basic implementation of {@link HttpClientSecurityConfiguration}.
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolver.java
index bc2dbcce4..fc88fefa8 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolver.java
@@ -34,10 +34,10 @@ import org.opensaml.security.x509.X509Credential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.ObjectSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.ObjectSupport;
 
 /**
  * Basic implementation of {@link HttpClientSecurityParametersResolver}.
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/KeyStoreX509CredentialAdapter.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/KeyStoreX509CredentialAdapter.java
index 680556027..983d6411e 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/KeyStoreX509CredentialAdapter.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/KeyStoreX509CredentialAdapter.java
@@ -42,8 +42,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** A wrapper that changes a {@link KeyStore} in to a {@link X509Credential}. */
 public class KeyStoreX509CredentialAdapter extends AbstractCredential implements X509Credential {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java
index 5934976a3..8f06e7240 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java
@@ -35,8 +35,8 @@ import org.opensaml.security.credential.UsageType;
 import org.opensaml.security.x509.X509Credential;
 
 import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /** A class that wraps a {@link X509KeyManager} and exposes it as an {@link X509Credential}. */
 public class X509KeyManagerX509CredentialAdapter extends AbstractCredential implements X509Credential {
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClientContext.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClientContext.java
index 7e5a66c07..a0694fb76 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClientContext.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/SOAPClientContext.java
@@ -23,7 +23,7 @@ import org.opensaml.messaging.context.BaseContext;
 import org.opensaml.soap.client.SOAPClient.SOAPRequestParameters;
 import org.opensaml.soap.client.http.PipelineFactoryHttpSOAPClient;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /** Message context for SOAP client messages. */
 public final class SOAPClientContext extends BaseContext {
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPRequestParameters.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPRequestParameters.java
index 2ea99bdb0..3f5151a0a 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPRequestParameters.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPRequestParameters.java
@@ -20,10 +20,10 @@ package org.opensaml.soap.client.http;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.soap.client.SOAPClient.SOAPRequestParameters;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** HTTP transported SOAP request parameters. */
 @ThreadSafe
 public class HttpSOAPRequestParameters implements SOAPRequestParameters {
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java
index 468a9e5f1..74ddd7b55 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java
@@ -28,7 +28,7 @@ import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.handler.AbstractMessageHandler;
 import org.opensaml.messaging.handler.MessageHandlerException;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Abstract base class for message handlers that generate SOAP headers.
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java
index ca50a9415..da0de06d6 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java
@@ -28,9 +28,9 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.collection.LazyList;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.XMLConstants;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.XMLObject;
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java
index 95748df34..a2ee1b767 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/messaging/WSAddressingContext.java
@@ -17,10 +17,10 @@
 
 package org.opensaml.soap.wsaddressing.messaging;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.messaging.context.BaseContext;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * A subcontext that carries information related to WS-Addressing processing.
  */
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/util/WSAddressingSupport.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/util/WSAddressingSupport.java
index b5ed9b3d3..e38b12e68 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/util/WSAddressingSupport.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/util/WSAddressingSupport.java
@@ -19,13 +19,13 @@ package org.opensaml.soap.wsaddressing.util;
 
 import java.util.Objects;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.schema.XSBooleanValue;
 import org.opensaml.soap.wsaddressing.IsReferenceParameterBearing;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Helper methods for working with WS-Addressing.
  */
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/util/WSSecuritySupport.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/util/WSSecuritySupport.java
index 2817152e6..dc3545815 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/util/WSSecuritySupport.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wssecurity/util/WSSecuritySupport.java
@@ -20,8 +20,8 @@ package org.opensaml.soap.wssecurity.util;
 import java.util.List;
 
 import net.shibboleth.shared.collection.LazyList;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.XMLObject;
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java
index f3b382e2e..5905b5e5e 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/messaging/impl/SOAP11FaultContextDecoratingErrorHandler.java
@@ -21,8 +21,8 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.error.TypedMessageErrorHandler;
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
index 37ad87b61..46774f138 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
@@ -44,8 +44,8 @@ import com.google.common.base.Predicates;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Action that resolves or builds a SOAP 1.1 {@link Fault} object, and stores it in the outbound message context.
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java
index bae5cb31a..094360af8 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToMarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.soap.wsaddressing.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.soap.wsaddressing.RelatesTo;
 import org.w3c.dom.Element;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Marshaller for instances of {@link RelatesTo}.
  */
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java
index c62409904..a31a2ccd0 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/impl/RelatesToUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.soap.wsaddressing.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.soap.wsaddressing.RelatesTo;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  *  Unmarshaller for instances of {@link RelatesTo}.
  */
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
index c8d4f17cb..3c981235f 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
@@ -33,7 +33,7 @@ import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Handler implementation that adds a wsa:Action header to the outbound SOAP envelope.
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
index d6fb9ea3b..daa1ac2bd 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
@@ -30,7 +30,7 @@ import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Handler implementation that adds a wsa:RelatesTo header to the outbound SOAP envelope.
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java
index dbb740f3e..3e79258ec 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ExtractMessageIDHandler.java
@@ -21,8 +21,6 @@ import java.util.List;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.handler.AbstractMessageHandler;
@@ -33,6 +31,8 @@ import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Handler implementation that handles wsa:MessageID header on the inbound SOAP envelope.
  * 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
index 8282c1663..ea1f17aaa 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
@@ -34,7 +34,7 @@ import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Handler implementation that checks a wsa:Action header against an expected value.
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java
index 1599c9b0e..7b7f84605 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wstrust/impl/BinaryExchangeMarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.soap.wstrust.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.soap.wstrust.BinaryExchange;
 import org.w3c.dom.Element;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Marshaller for the BinaryExchange element.
  * 
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/credential/AbstractBasicCredentialFactoryBean.java b/opensaml-spring/src/main/java/org/opensaml/spring/credential/AbstractBasicCredentialFactoryBean.java
index dd7ffe6a8..100115f24 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/credential/AbstractBasicCredentialFactoryBean.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/credential/AbstractBasicCredentialFactoryBean.java
@@ -25,8 +25,8 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.crypto.SecretKey;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.util.encoders.Hex;
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java b/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java
index d64df06f3..801df53d1 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java
@@ -48,8 +48,8 @@ import org.springframework.beans.FatalBeanException;
 import org.springframework.core.io.Resource;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.spring.factory.AbstractComponentAwareFactoryBean;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * File system specific bean for PKIXX509CredentialTrustEngine.
diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
index 5d45830b0..665debd2d 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
@@ -31,8 +31,8 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.Positive;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.TimerSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 
 /**
  * Abstract base class for {@link StorageService} implementations.
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
index 6e55ae645..bc477a4d8 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
@@ -53,13 +53,13 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.CookieManager;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.security.DataExpiredException;
 import net.shibboleth.shared.security.DataSealer;
 import net.shibboleth.shared.security.DataSealerException;
 import net.shibboleth.shared.security.DataSealerKeyStrategy;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Implementation of {@link org.opensaml.storage.StorageService} that stores data in-memory in a
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
index 02ec846cf..0d9cc441e 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
@@ -21,8 +21,8 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.Positive;
 import net.shibboleth.shared.collection.Pair;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.spy.memcached.CASResponse;
 import net.spy.memcached.CASValue;
 import net.spy.memcached.MemcachedClient;
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java
index 4a28d1275..47a969bf3 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeValueTypeUnmarshaller.java
@@ -17,14 +17,14 @@
 
 package org.opensaml.xacml.ctx.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.ctx.AttributeValueType;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** Unmarshaller for {@link AttributeValueType} objects. */
 public class AttributeValueTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
     
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java
index 0a20acf5c..3d68209de 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/ResourceContentTypeUnmarshaller.java
@@ -17,14 +17,14 @@
 
 package org.opensaml.xacml.ctx.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.ctx.ResourceContentType;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** Unmarshaller for {@link ResourceContentType} objects. */
 public class ResourceContentTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java
index b6e8ad01f..11fb1b071 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandler.java
@@ -19,10 +19,10 @@ package org.opensaml.xacml.ctx.provider.impl;
 
 import java.util.Objects;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.xacml.policy.ObligationType;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Base class for all obligation handlers.
  * 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java
index 91673e9e1..d83ebe47e 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ActionMatchTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -28,6 +26,8 @@ import org.opensaml.xacml.policy.AttributeSelectorType;
 import org.opensaml.xacml.policy.AttributeValueType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** Unmarshaller of {@link ActionMatchType} objects. */
 public class ActionMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java
index ff1bf2e26..cee565884 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ApplyTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.policy.ApplyType;
 import org.opensaml.xacml.policy.ExpressionType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link ApplyType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java
index 3f3f63fa8..e2586b184 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeUnmarshaller.java
@@ -17,13 +17,13 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.policy.AttributeAssignmentType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** UnMarshaller for {@link AttributeAssignmentType}. */
 public class AttributeAssignmentTypeUnmarshaller extends AttributeValueTypeUnmarshaller {
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java
index 53d0ef6a5..f08ae05f5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeDesignatorTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.schema.XSBooleanValue;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
 import org.opensaml.xacml.policy.AttributeDesignatorType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link AttributeDesignatorType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java
index a15b08505..dfe9063c6 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeSelectorTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.schema.XSBooleanValue;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
 import org.opensaml.xacml.policy.AttributeSelectorType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  *Unmarshaller for {@link AttributeSelectorType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java
index 13b826590..df37ba5f7 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeValueTypeUnmarshaller.java
@@ -19,8 +19,8 @@ package org.opensaml.xacml.policy.impl;
 
 import javax.xml.namespace.QName;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.QNameSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java
index 4622ff54d..79f3ff359 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParameterTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.policy.AttributeValueType;
 import org.opensaml.xacml.policy.CombinerParameterType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link CombinerParameterType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java
index 483424058..1ebd32865 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/EnvironmentMatchTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -28,6 +26,8 @@ import org.opensaml.xacml.policy.AttributeValueType;
 import org.opensaml.xacml.policy.EnvironmentMatchType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** Unmarshaller of {@link EnvironmentMatchType} objects. */
 public class EnvironmentMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java
index 2ee9e381d..685f0de91 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/FunctionTypeUnmarshaller.java
@@ -17,14 +17,14 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
 import org.opensaml.xacml.policy.FunctionType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  *Unmarshaller for {@link FunctionType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java
index b973847e4..074327252 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeUnmarshaller.java
@@ -17,14 +17,14 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
 import org.opensaml.xacml.policy.IdReferenceType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link IdReferenceType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java
index 93df111c4..0638c7c8f 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeUnmarshaller.java
@@ -17,13 +17,13 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.policy.PolicyCombinerParametersType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link PolicyCombinerParametersType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java
index 231714943..f5d28597b 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicySetCombinerParametersTypeUnmarshaller.java
@@ -17,13 +17,13 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.policy.PolicySetCombinerParametersType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link PolicySetCombinerParametersType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java
index 27697a57e..0b0025523 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/ResourceMatchTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -28,6 +26,8 @@ import org.opensaml.xacml.policy.AttributeValueType;
 import org.opensaml.xacml.policy.ResourceMatchType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** Unmarshaller of {@link ResourceMatchType} objects. */
 public class ResourceMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java
index 6e7410dae..a165c8fc5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.policy.CombinerParameterType;
 import org.opensaml.xacml.policy.RuleCombinerParametersType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link RuleCombinerParametersType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java
index d4e8ad31b..0695cf8a5 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -29,6 +27,8 @@ import org.opensaml.xacml.policy.RuleType;
 import org.opensaml.xacml.policy.TargetType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link RuleType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
index 13be74d6e..8d623ab41 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
@@ -17,12 +17,12 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.policy.SubjectAttributeDesignatorType;
 import org.w3c.dom.Attr;
+
+import net.shibboleth.shared.primitive.StringSupport;
 /**
  * Unmarshaller for {@link SubjectAttributeDesignatorType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java
index 337d3bac6..29d422dec 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/SubjectMatchTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -28,6 +26,8 @@ import org.opensaml.xacml.policy.AttributeValueType;
 import org.opensaml.xacml.policy.SubjectMatchType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /** Unmarshaller of {@link SubjectMatchType} objects. */
 public class SubjectMatchTypeUnmarshaller extends AbstractXACMLObjectUnmarshaller {
 
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
index 1e22e9d3c..e7e10e46b 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.policy.ExpressionType;
 import org.opensaml.xacml.policy.VariableDefinitionType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link org.opensaml.xacml.policy.VariableDefinitionType}.
  */
diff --git a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java
index 9e491358e..ac9c33c23 100644
--- a/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java
+++ b/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableReferenceTypeUnmarshaller.java
@@ -17,8 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
@@ -26,6 +24,8 @@ import org.opensaml.xacml.policy.ExpressionType;
 import org.opensaml.xacml.policy.VariableReferenceType;
 import org.w3c.dom.Attr;
 
+import net.shibboleth.shared.primitive.StringSupport;
+
 /**
  * Unmarshaller for {@link VariableReferenceType}.
  */
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/AlgorithmPolicyParameters.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/AlgorithmPolicyParameters.java
index 01576fd81..d99349aea 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/AlgorithmPolicyParameters.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/AlgorithmPolicyParameters.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * The algorithm policy parameters.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/WhitelistBlacklistParameters.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/WhitelistBlacklistParameters.java
index 5e3e55e20..6da9704f8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/WhitelistBlacklistParameters.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/WhitelistBlacklistParameters.java
@@ -25,8 +25,8 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * The whitelist and blacklist algorithm parameters.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/agreement/KeyAgreementProcessorRegistry.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/agreement/KeyAgreementProcessorRegistry.java
index 8418b0040..bdb34aa9e 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/agreement/KeyAgreementProcessorRegistry.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/agreement/KeyAgreementProcessorRegistry.java
@@ -24,8 +24,8 @@ import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A component which provides access to registered instances of {@link KeyAgreementProcessor}.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
index 549d76987..916215652 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
@@ -38,8 +38,8 @@ import javax.crypto.NoSuchPaddingException;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java
index 7a7d53691..a2ae594ae 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java
@@ -20,9 +20,9 @@ package org.opensaml.xmlsec.criterion;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * {@link Criterion} representing an a KeyInfo generation "profile" name used
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
index c6be152f5..f7c6620f5 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.xmlsec.encryption.DataReference;
 import org.opensaml.xmlsec.encryption.EncryptedData;
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
index 62f86ad61..d4c327d3b 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
@@ -29,6 +29,7 @@ import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.resolver.Criterion;
 import net.shibboleth.shared.resolver.ResolverException;
@@ -36,7 +37,6 @@ import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.QNameSupport;
 import net.shibboleth.shared.xml.XMLParserException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.xml.security.Init;
 import org.apache.xml.security.encryption.XMLCipher;
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyAgreementEncryptionConfiguration.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyAgreementEncryptionConfiguration.java
index 35b8d7a91..d4442f265 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyAgreementEncryptionConfiguration.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyAgreementEncryptionConfiguration.java
@@ -28,7 +28,7 @@ import org.opensaml.xmlsec.agreement.KeyAgreementParameter;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * A component representing the specific configuration for a key agreement encryption operation.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/RSAOAEPParameters.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/RSAOAEPParameters.java
index cd80da380..4b03cc8c9 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/RSAOAEPParameters.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/RSAOAEPParameters.java
@@ -17,7 +17,7 @@
 
 package org.opensaml.xmlsec.encryption.support;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 /**
  * Class for representing parameter inputs to the RSA-OAEP key transport algorithm.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
index bf18f5e42..e7a622196 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
@@ -38,8 +38,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Helper methods for working with XML Signature.
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
index cc2964d59..6ae0b4e3a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
@@ -30,8 +30,8 @@ import org.apache.xml.security.transforms.Transforms;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A generic content reference that uses a URI to reference the content to be signed.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/BasicKeyAgreementCredential.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/BasicKeyAgreementCredential.java
index 3cfa74132..a74b75c9e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/BasicKeyAgreementCredential.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/BasicKeyAgreementCredential.java
@@ -25,8 +25,8 @@ import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.agreement.KeyAgreementCredential;
 import org.opensaml.xmlsec.agreement.KeyAgreementParameters;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Basic implementation of {@link KeyAgreementCredential}.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java
index 3936a9498..37dafb15b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java
@@ -29,8 +29,8 @@ import org.opensaml.xmlsec.agreement.XMLExpressableKeyAgreementParameter;
 
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Key agreement parameter to support use of {@link org.opensaml.xmlsec.signature.DigestMethod} values.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java
index 65a4f4c9c..946b3a553 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java
@@ -36,8 +36,8 @@ import net.shibboleth.shared.codec.DecodingException;
 import net.shibboleth.shared.codec.EncodingException;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Key agreement parameter to support use of {@link org.opensaml.xmlsec.encryption.KANonce} values.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
index b3f571919..3bbdded39 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
@@ -57,8 +57,8 @@ import com.google.common.primitives.Bytes;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Implementation of ConcatKDF key derivation as defined in XML Encryption 1.1.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDF.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDF.java
index f4438a1f0..31fc98803 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDF.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/DHLegacyKDF.java
@@ -38,8 +38,8 @@ import com.google.common.primitives.Bytes;
 
 import net.shibboleth.shared.codec.Base64Support;
 import net.shibboleth.shared.codec.DecodingException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Implementation of the key derivation function used with Diffie-Hellman Key Agreement With Legacy Key Derivation
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java
index af7f29be2..68c2c4a0d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java
@@ -59,8 +59,8 @@ import net.shibboleth.shared.codec.DecodingException;
 import net.shibboleth.shared.codec.EncodingException;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Implementation of PBKDF2 key derivation as defined in XML Encryption 1.1.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfiguration.java
index 1c210392a..9162a27f8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicAlgorithmPolicyConfiguration.java
@@ -29,8 +29,8 @@ import org.opensaml.xmlsec.AlgorithmPolicyConfiguration;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Basic implementation of {@link AlgorithmPolicyConfiguration}.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
index da551339c..a9b042e9f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.EncryptionConfiguration;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
index 8299d2551..50d0a3f76 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.SignatureSigningConfiguration;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
index 41761f9d0..2b958ca9b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
@@ -28,9 +28,9 @@ import org.opensaml.xmlsec.WhitelistBlacklistConfiguration;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
 /**
  * Basic implementation of {@link WhitelistBlacklistConfiguration}.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
index 64ef97466..11783273a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
@@ -19,8 +19,8 @@ package org.opensaml.xmlsec.signature.impl;
 
 import java.util.List;
 
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.xml.security.Init;
 import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
index 5bf8eb6f3..0a1442d99 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.collection.IndexingObjectStore;
-import net.shibboleth.utilities.java.support.primitive.CleanerSupport;
+import net.shibboleth.shared.primitive.CleanerSupport;
 
 import org.opensaml.core.xml.AbstractXMLObject;
 import org.opensaml.core.xml.XMLObject;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
index dc98d9871..5c75dc0e4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
@@ -30,7 +30,7 @@ import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.signature.X509Certificate;
 
 import net.shibboleth.shared.collection.IndexingObjectStore;
-import net.shibboleth.utilities.java.support.primitive.CleanerSupport;
+import net.shibboleth.shared.primitive.CleanerSupport;
 
 /** Concrete implementation of {@link X509Certificate}. */
 public class X509CertificateImpl extends AbstractXMLObject implements X509Certificate {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
index 54d476628..5b93fb181 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
@@ -26,10 +26,10 @@ import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.AttributeSupport;
 import net.shibboleth.shared.xml.ElementSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.xmlsec.SignatureValidationParameters;
 import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
index 65f057db6..3a33ad207 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
@@ -37,7 +37,7 @@ import javax.security.auth.x500.X500Principal;
 
 import net.shibboleth.shared.codec.Base64Support;
 import net.shibboleth.shared.codec.DecodingException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.shared.primitive.StringSupport;
 
 import org.opensaml.core.testing.XMLObjectBaseTestCase;
 import org.opensaml.security.SecurityException;
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java
index 9602a9442..6f4a933c7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/HMACSignatureTest.java
@@ -55,10 +55,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import jakarta.xml.bind.ValidationException;
+import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.xml.ElementSupport;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.shared.xml.XMLParserException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * Test to verify {@link org.opensaml.xmlsec.signature.Signature} and its marshallers and unmarshallers.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.