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

1 files changed, 9 insertions, 8 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java
index 72d6ebb8..8af53e23 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java
@@ -8,6 +8,8 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -15,7 +17,6 @@ import javax.xml.transform.TransformerException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -295,7 +296,7 @@ public class MetadataResolverTest {
     final EntityDescriptor metadata = (EntityDescriptor) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         MetadataResolverTest.class.getResourceAsStream("/data/pvp_metadata_moaid_test.xml"));
-    metadata.setValidUntil(DateTime.now().plusDays(1));
+    metadata.setValidUntil(Instant.now().plus(Duration.ofDays(1)));
     metadata.setSignature(null);
     metadata.setEntityID(RandomStringUtils.randomAlphabetic(10));
     final EntityDescriptor signedMatadata =
@@ -344,7 +345,7 @@ public class MetadataResolverTest {
     final EntityDescriptor metadata = (EntityDescriptor) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         MetadataResolverTest.class.getResourceAsStream("/data/pvp_metadata_valid_with_entityCategory.xml"));
-    metadata.setValidUntil(DateTime.now().plusDays(1));
+    metadata.setValidUntil(Instant.now().plus(Duration.ofDays(1)));
     metadata.setSignature(null);
     metadata.setEntityID(RandomStringUtils.randomAlphabetic(10));
     final EntityDescriptor signedMatadata =
@@ -382,7 +383,7 @@ public class MetadataResolverTest {
     Assert.assertNotNull("No EntityDescripter", descr);
 
     final List<RequestedAttribute> reqAttr = descr.getSPSSODescriptor(SAMLConstants.SAML20P_NS)
-        .getAttributeConsumingServices().get(0).getRequestAttributes();
+        .getAttributeConsumingServices().get(0).getRequestedAttributes();
     Assert.assertNotNull("Req. attributes are null", reqAttr);
     Assert.assertEquals("# of req. attributes", 20, reqAttr.size());
 
@@ -398,7 +399,7 @@ public class MetadataResolverTest {
         XMLObjectProviderRegistrySupport.getParserPool(),
         MetadataResolverTest.class.getResourceAsStream(
             "/data/pvp_metadata_valid_with_entityCategory_egov.xml"));
-    metadata.setValidUntil(DateTime.now().plusDays(1));
+    metadata.setValidUntil(Instant.now().plus(Duration.ofDays(1)));
     metadata.setSignature(null);
     metadata.setEntityID(RandomStringUtils.randomAlphabetic(10));
     final EntityDescriptor signedMatadata =
@@ -436,7 +437,7 @@ public class MetadataResolverTest {
     Assert.assertNotNull("No EntityDescripter", descr);
 
     final List<RequestedAttribute> reqAttr = descr.getSPSSODescriptor(SAMLConstants.SAML20P_NS)
-        .getAttributeConsumingServices().get(0).getRequestAttributes();
+        .getAttributeConsumingServices().get(0).getRequestedAttributes();
     Assert.assertNotNull("Req. attributes are null", reqAttr);
     Assert.assertEquals("# of req. attributes", 9, reqAttr.size());
 
@@ -451,7 +452,7 @@ public class MetadataResolverTest {
     final EntityDescriptor metadata = (EntityDescriptor) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         MetadataResolverTest.class.getResourceAsStream("/data/pvp_metadata_valid.xml"));
-    metadata.setValidUntil(DateTime.now().minusDays(2));
+    metadata.setValidUntil(Instant.now().minus(Duration.ofDays(2)));
     metadata.setSignature(null);
     Saml2Utils.signSamlObject(metadata, credentialProvider.getMetaDataSigningCredential(), true);
     final Element metadataElement = XMLObjectSupport.marshall(metadata);
@@ -607,7 +608,7 @@ public class MetadataResolverTest {
     final EntityDescriptor entityId = mdResolver.getEntityDescriptor(entityIdToResolve);
     Assert.assertNotNull("No EntityDescripter", entityId);
 
-    final DateTime lastRefreshSucess = mdResolver.getLastSuccessfulRefresh();
+    final Instant lastRefreshSucess = mdResolver.getLastSuccessfulRefresh();
 
     try {
       mdResolver.refresh();