Browse Source

Merge branch '6.0.x'

Closes gh-12621
pull/12638/head
Marcus Da Coregio 3 years ago
parent
commit
b237d7ee38
  1. 3
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/HttpMessageConverters.java

3
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/HttpMessageConverters.java

@ -27,6 +27,7 @@ import org.springframework.util.ClassUtils; @@ -27,6 +27,7 @@ import org.springframework.util.ClassUtils;
* Utility methods for {@link HttpMessageConverter}'s.
*
* @author Joe Grandja
* @author luamas
* @since 5.1
*/
final class HttpMessageConverters {
@ -42,7 +43,7 @@ final class HttpMessageConverters { @@ -42,7 +43,7 @@ final class HttpMessageConverters {
jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader)
&& ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader);
jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
}
private HttpMessageConverters() {

Loading…
Cancel
Save