HttpMessageConverters uses jakarta.json.bind.Jsonb

Closes gh-1054
spring-projects · Feb 15, 2023 · 32022c1 · 32022c1
1 parent db5416c
commit 32022c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...gframework/security/oauth2/server/authorization/http/converter/HttpMessageConverters.java b/...gframework/security/oauth2/server/authorization/http/converter/HttpMessageConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
  * Utility methods for {@link HttpMessageConverter}'s.
  *
  * @author Joe Grandja
+ * @author luamas
  * @since 0.1.1
  */
 final class HttpMessageConverters {
@@ -41,7 +42,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() {

diff --git a/...ework/security/oauth2/server/authorization/oidc/http/converter/HttpMessageConverters.java b/...ework/security/oauth2/server/authorization/oidc/http/converter/HttpMessageConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
  * Utility methods for {@link HttpMessageConverter}'s.
  *
  * @author Joe Grandja
+ * @author luamas
  * @since 0.1.0
  */
 final class HttpMessageConverters {
@@ -41,7 +42,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() {