Merge branch 'opensaml_4.x' into nightlyBuild

# Conflicts:
#	eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
#	eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/SamlVerificationEngine.java
#	eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
#	eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyMetadataProvider.java
#	eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
#	eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
#	pom.xml

2 files changed, 7 insertions, 7 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java b/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
index c6ca8d04..c48a0fd4 100644
--- a/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
@@ -20,12 +20,12 @@
 package at.gv.egiz.eaaf.modules.pvp2.sp.impl;
 
 import java.security.NoSuchAlgorithmException;
+import java.time.Instant;
 import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.opensaml.messaging.encoder.MessageEncodingException;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.core.AuthnContextClassRef;
@@ -60,7 +60,7 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr.EaafRequestExtensionBui
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
 import at.gv.egiz.eaaf.modules.pvp2.sp.api.IPvpAuthnRequestBuilderConfiguruation;
 import at.gv.egiz.eaaf.modules.pvp2.sp.exception.AuthnRequestBuildException;
-import net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy;
+import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
 
 /**
  * PVP2 S-Profil Authentication-Request builder-implementation.
@@ -150,7 +150,7 @@ public class PvpAuthnRequestBuilder {
 
     }
 
-    authReq.setIssueInstant(new DateTime());
+    authReq.setIssueInstant(Instant.now());
 
     // set isPassive flag
     if (config.isPassivRequest() == null) {
diff --git a/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java b/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java
index cfa4c3d3..d59012a5 100644
--- a/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java
+++ b/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java
@@ -295,13 +295,13 @@ public class AssertionAttributeExtractor {
         && getFullAssertion().getAuthnStatements().size() > 0) {
       for (final AuthnStatement el : getFullAssertion().getAuthnStatements()) {
         if (el.getSessionNotOnOrAfter() != null) {
-          return el.getSessionNotOnOrAfter().toDate();
+          return Date.from(el.getSessionNotOnOrAfter());
         }
       }
 
     }
 
-    return getFullAssertion().getConditions().getNotOnOrAfter().toDate();
+    return Date.from(getFullAssertion().getConditions().getNotOnOrAfter());
 
   }
 
@@ -316,7 +316,7 @@ public class AssertionAttributeExtractor {
    */
   public Date getAssertionIssuingDate() {
     try {
-      return getFullAssertion().getIssueInstant().toDate();
+      return Date.from(getFullAssertion().getIssueInstant());
 
     } catch (final NullPointerException e) {
       return null;
@@ -335,7 +335,7 @@ public class AssertionAttributeExtractor {
    */
   public Date getAssertionNotBefore() {
     try {
-      return getFullAssertion().getConditions().getNotBefore().toDate();
+      return Date.from(getFullAssertion().getConditions().getNotBefore());
 
     } catch (final NullPointerException e) {
       return null;