[java-shib-metadata] branch main updated: Rename Spring util package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 21:04:07 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=5a6503a70e71191bea7a935bfd475bf9e8b023f7
The following commit(s) were added to refs/heads/main by this push:
new 5a6503a70 Rename Spring util package.
5a6503a70 is described below
commit 5a6503a70e71191bea7a935bfd475bf9e8b023f7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 17:04:05 2022 -0400
Rename Spring util package.
---
.../spring/metadata/AbstractDynamicMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/AbstractMetadataProviderParser.java | 2 +-
.../spring/metadata/AbstractReloadingMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/ChainingMetadataProviderParser.java | 2 +-
.../spring/metadata/FileBackedHTTPMetadataProviderParser.java | 2 +-
.../spring/metadata/HTTPMetadataProvidersParserSupport.java | 2 +-
.../net/shibboleth/spring/metadata/InlineMetadataProviderParser.java | 2 +-
.../java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java | 2 +-
.../shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/NodeProcessingParser.java | 2 +-
.../net/shibboleth/spring/metadata/filter/PredicateFilterParser.java | 2 +-
.../shibboleth/spring/metadata/filter/SignatureValidationParser.java | 2 +-
.../spring/security/credential/AbstractCredentialParser.java | 2 +-
.../spring/security/credential/AbstractX509CredentialParser.java | 2 +-
.../net/shibboleth/spring/security/trust/AbstractChainingParser.java | 2 +-
.../shibboleth/spring/security/trust/AbstractStaticPKIXParser.java | 2 +-
.../net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java | 2 +-
.../spring/security/trust/StaticExplicitKeySignatureParser.java | 2 +-
.../net/shibboleth/spring/metadata/AbstractMetadataParserTest.java | 4 ++--
.../java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java | 2 +-
.../net/shibboleth/spring/security/AbstractSecurityParserTest.java | 4 ++--
.../test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java | 4 ++--
23 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
index 7b41cd7ad..26be26fa2 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
@@ -17,7 +17,7 @@
package net.shibboleth.spring.metadata;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.opensaml.core.xml.persist.FilesystemLoadSaveManager;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index 07c387075..cf1a0abdc 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -32,9 +32,9 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
index a5ad76f46..39fa4ff6d 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
@@ -17,7 +17,7 @@
package net.shibboleth.spring.metadata;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java
index 0c7f8d0d8..0e856a531 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ChainingMetadataProviderParser.java
@@ -19,7 +19,7 @@ package net.shibboleth.spring.metadata;
import java.util.List;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java
index 74d7bcdbb..b29e0e84a 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParser.java
@@ -19,7 +19,7 @@ package net.shibboleth.spring.metadata;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.opensaml.saml.metadata.resolver.impl.FileBackedHTTPMetadataResolver;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
index 13b0c51aa..b6b20920b 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.http.HttpClientFactoryBean;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
index 682bb782c..d5209d0ef 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java
index d55247d3f..d0946f419 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/ByReferenceParser.java
@@ -32,8 +32,8 @@ import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java
index 7a6b67371..46dd49a40 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityRoleFilterParser.java
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java
index 06a122473..7ecfd78bf 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NameIDFormatFilterParser.java
@@ -35,8 +35,8 @@ import org.springframework.beans.factory.support.ManagedSet;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java
index fa54c89cd..2472fb560 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/NodeProcessingParser.java
@@ -27,8 +27,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.spring.metadata.MetadataNamespaceHandler;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
index 749caec49..8a38649f6 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
@@ -38,8 +38,8 @@ import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
index 6085d9cb0..bb1d10026 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
@@ -43,8 +43,8 @@ import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
index cebb9b338..113e75294 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
index 726b44ca8..b5ce17927 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java
index 00230b92b..c96b27ce0 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractChainingParser.java
@@ -19,8 +19,8 @@ package net.shibboleth.spring.security.trust;
import java.util.List;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java
index a59ae56ce..3c76e60cd 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractStaticPKIXParser.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java
index 1f845babc..8c74725de 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeyParser.java
@@ -21,7 +21,7 @@ import java.util.List;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java
index d7c10ed36..70cee3ae8 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/StaticExplicitKeySignatureParser.java
@@ -21,7 +21,7 @@ import java.util.List;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.security.SecurityNamespaceHandler;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java
index e03969e05..9ea3571fa 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/AbstractMetadataParserTest.java
@@ -38,9 +38,9 @@ import org.springframework.mock.env.MockPropertySource;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
index 01f7d06fe..337d5a255 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.stream.Collectors;
import net.shibboleth.ext.spring.service.ReloadableSpringService;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/AbstractSecurityParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/AbstractSecurityParserTest.java
index 667fc32f1..d67065b32 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/AbstractSecurityParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/security/AbstractSecurityParserTest.java
@@ -22,8 +22,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
-
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -31,6 +29,8 @@ import org.springframework.mock.env.MockPropertySource;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeSuite;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
+
/**
* Base mechanics for Security parser tests
*/
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
index 68306102f..42bbbc79e 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
@@ -36,8 +36,8 @@ import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.service.ReloadableService;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list