[java-identity-provider] branch master updated: IDP-1646 - Remove remaining joda-time dependencies

[Scott Cantor]

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

scantor 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=7ffe39b307b96c681ae9784c002d11d2628c8344

The following commit(s) were added to refs/heads/master by this push:
       new  7ffe39b30 IDP-1646 - Remove remaining joda-time dependencies
7ffe39b30 is described below

commit 7ffe39b307b96c681ae9784c002d11d2628c8344
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 23 15:47:00 2020 -0400

    IDP-1646 - Remove remaining joda-time dependencies
    
    https://issues.shibboleth.net/jira/browse/IDP-1646
    
    Replace joda-time in CAS logout propagation flow.
---
 .../idp/cas/flows/logout/cas-logoutprop-beans.xml      | 18 ------------------
 .../idp/cas/flows/logout/cas-logoutprop-flow.xml       |  4 +---
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-beans.xml
deleted file mode 100644
index 159b5fab9..000000000
--- a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-beans.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <bean id="DateFormatter"
-          class="org.joda.time.format.ISODateTimeFormat"
-          factory-method="dateHourMinuteSecond" />
-
-</beans>
\ No newline at end of file
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
index dc18567fa..027517cdf 100644
--- a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
+++ b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
@@ -8,7 +8,7 @@
             <set name="viewScope.logoutPropCtx"
                  value="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.session.context.LogoutPropagationContext))" />
             <set name="viewScope.messageID" value="T(java.util.UUID).randomUUID()" />
-            <set name="viewScope.issueInstant" value="DateFormatter.print(T(org.joda.time.DateTime).now())" />
+            <set name="viewScope.issueInstant" value="T(net.shibboleth.utilities.java.support.xml.DOMTypeSupport).instantToString(T(java.time.Instant).now())" />
         </on-render>
         <transition on="proceed" to="proceed" />
     </view-state>
@@ -21,6 +21,4 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="cas-logoutprop-beans.xml" />
-
 </flow>

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