[java-identity-provider] branch dev/thymeleaf updated: Use chaining view resolver for Thymeleaf.

[Marvin S. Addison]

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

serac pushed a commit to branch dev/thymeleaf
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/dev/thymeleaf by this push:
     new b8e013da0 Use chaining view resolver for Thymeleaf.
b8e013da0 is described below

commit b8e013da0679e78e1a9baadcaf2f495c8fabf25d
Author: Marvin S. Addison <serac at vt.edu>
AuthorDate: Tue Jan 16 07:39:18 2024 -0500

    Use chaining view resolver for Thymeleaf.
    
    Supports progressive adoption of Thymeleaf views in the IdP with graceful
    fallback to Velocity when a Thymeleaf template for a particular view does
    not exist.
---
 idp-conf-impl/pom.xml                                              | 6 ++++++
 .../src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml       | 3 +--
 pom.xml                                                            | 7 +++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/idp-conf-impl/pom.xml b/idp-conf-impl/pom.xml
index f500cb88f..2e99de2e7 100644
--- a/idp-conf-impl/pom.xml
+++ b/idp-conf-impl/pom.xml
@@ -157,6 +157,12 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-thymeleaf-spring</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-velocity-spring</artifactId>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml
index 30fb5a6f0..b7ade04c1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml
@@ -80,10 +80,9 @@
         <property name="order" value="1" />
     </bean>
 
-    <bean id="shibboleth.ThymeleafViewResolver" class="org.thymeleaf.spring6.view.ThymeleafViewResolver">
+    <bean id="shibboleth.ThymeleafViewResolver" class="net.shibboleth.shared.spring.thymeleaf.ChainingThymeleafViewResolver">
         <property name="templateEngine" ref="thymeleafTemplateEngine" />
         <property name="order" value="2" />
-        <property name="viewNames" value="login" />
         <property name="contentType" value="text/html;charset=utf-8" />
     </bean>
             
diff --git a/pom.xml b/pom.xml
index 8c887893b..216ee9e42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@
         <shib-attribute.version>5.1.0-SNAPSHOT</shib-attribute.version>
         <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
         <shib-profile.version>5.1.0-SNAPSHOT</shib-profile.version>
-        <thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
         <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
     </properties>
 
@@ -338,9 +337,9 @@
                 <version>${shib-shared.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.thymeleaf</groupId>
-                <artifactId>thymeleaf-spring6</artifactId>
-                <version>${thymeleaf.version}</version>
+                <groupId>${shib-shared.groupId}</groupId>
+                <artifactId>shib-thymeleaf-spring</artifactId>
+                <version>${shib-shared.version}</version>
             </dependency>
 
             <!-- Provided Dependencies -->

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