[java-identity-provider] 01/02: Fix a couple of erroneous imports in test classes, related to OSJ-212.

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=4574ff4ae0816695fb524c3aea9e6cf1756af923

commit 4574ff4ae0816695fb524c3aea9e6cf1756af923
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Sep 7 19:23:29 2018 -0400

    Fix a couple of erroneous imports in test classes, related to OSJ-212.
    
    Somehow these were missed in the OSJ-124 refactoring to add .impl to pkg names,
    in c1737601c795db2b58fae2cd17cadf4a13863d33.  Mysteriously they were somehow still
    working, probably because of the idwsfconsumer dep on the older OpenSAML version,
    so Maven was still somehow pulling in the pre-refactor jar with the non-impl
    package name.
    
    Also explicitly add the opensaml-xmlsec-impl test scope dependency so overrides the
    transitive one from idwsfconsumer.
---
 idp-saml-impl/pom.xml                                                | 5 +++++
 .../profile/delegation/impl/DecorateDelegatedAssertionTest.java      | 2 +-
 .../saml2/profile/delegation/impl/PopulateDelegationContextTest.java | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index 4acdfdc..0482158 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -155,6 +155,11 @@
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-xmlsec-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-saml-impl</artifactId>
             <version>${opensaml.version}</version>
             <scope>test</scope>
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
index d84d761..76b2798 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
@@ -68,7 +68,7 @@ import org.opensaml.security.credential.Credential;
 import org.opensaml.security.credential.CredentialSupport;
 import org.opensaml.security.crypto.KeySupport;
 import org.opensaml.soap.wsaddressing.EndpointReference;
-import org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap;
+import org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap;
 import org.opensaml.xmlsec.signature.KeyInfo;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockServletContext;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
index 111c01a..c2ac2e7 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
@@ -57,7 +57,7 @@ import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.saml.security.impl.MetadataCredentialResolver;
 import org.opensaml.security.credential.UsageType;
 import org.opensaml.security.crypto.KeySupport;
-import org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap;
+import org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap;
 import org.opensaml.xmlsec.keyinfo.KeyInfoSupport;
 import org.opensaml.xmlsec.signature.KeyInfo;
 import org.springframework.mock.web.MockHttpServletRequest;

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