Skip to content

Commit 4855287

Browse files
Merge branch '6.3.x'
Closes gh-15768
2 parents 9f0cbe6 + aeae740 commit 4855287

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public final class SecurityJackson2Modules {
7575

7676
private static final List<String> securityJackson2ModuleClasses = Arrays.asList(
7777
"org.springframework.security.jackson2.CoreJackson2Module",
78-
"org.springframework.security.cas.jackson2.CasJackson2Module",
7978
"org.springframework.security.web.jackson2.WebJackson2Module",
8079
"org.springframework.security.web.server.jackson2.WebServerJackson2Module");
8180

@@ -89,6 +88,8 @@ public final class SecurityJackson2Modules {
8988

9089
private static final String saml2Jackson2ModuleClass = "org.springframework.security.saml2.jackson2.Saml2Jackson2Module";
9190

91+
private static final String casJackson2ModuleClass = "org.springframework.security.cas.jackson2.CasJackson2Module";
92+
9293
private static final boolean webServletPresent;
9394

9495
private static final boolean oauth2ClientPresent;
@@ -99,6 +100,8 @@ public final class SecurityJackson2Modules {
99100

100101
private static final boolean saml2JacksonPresent;
101102

103+
private static final boolean casJacksonPresent;
104+
102105
static {
103106
ClassLoader classLoader = SecurityJackson2Modules.class.getClassLoader();
104107
webServletPresent = ClassUtils.isPresent("jakarta.servlet.http.Cookie", classLoader);
@@ -107,6 +110,7 @@ public final class SecurityJackson2Modules {
107110
javaTimeJacksonPresent = ClassUtils.isPresent(javaTimeJackson2ModuleClass, classLoader);
108111
ldapJacksonPresent = ClassUtils.isPresent(ldapJackson2ModuleClass, classLoader);
109112
saml2JacksonPresent = ClassUtils.isPresent(saml2Jackson2ModuleClass, classLoader);
113+
casJacksonPresent = ClassUtils.isPresent(casJackson2ModuleClass, classLoader);
110114
}
111115

112116
private SecurityJackson2Modules() {
@@ -160,6 +164,9 @@ public static List<Module> getModules(ClassLoader loader) {
160164
if (saml2JacksonPresent) {
161165
addToModulesList(loader, modules, saml2Jackson2ModuleClass);
162166
}
167+
if (casJacksonPresent) {
168+
addToModulesList(loader, modules, casJackson2ModuleClass);
169+
}
163170
return modules;
164171
}
165172

0 commit comments

Comments
 (0)